Merge branch 'master' into pichunter

src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java

@@ -70,12 +70,12 @@ public class ChanRipper extends AbstractHTMLRipper {
             } catch (NullPointerException e) {
                 logger.warn("Failed to get thread title from " + url);
             }
-            return doc.select("title").first().text();
         } catch (Exception e) {
             // Fall back to default album naming convention
             logger.warn("Failed to get album title from " + url, e);
         }
-        return super.getAlbumTitle(url);
+        // Fall back on the GID
+        return getHost() + "_" + getGID(url);
     }
 
     @Override
@@ -117,6 +117,12 @@ public class ChanRipper extends AbstractHTMLRipper {
             if (m.matches()) {
                 return m.group(1);
             }
+            // xchan
+            p = Pattern.compile("^.*\\.[a-z]{1,3}/board/[a-zA-Z0-9]+/thread/([0-9]+)/?.*$");
+            m = p.matcher(u);
+            if (m.matches()) {
+                return m.group(1);
+            }
         }
 
         throw new MalformedURLException(
@@ -211,6 +217,6 @@ public class ChanRipper extends AbstractHTMLRipper {
 
     @Override
     public void downloadURL(URL url, int index) {
-        addURLToDownload(url, getPrefix(index), "", this.url.toString(), null);
+        addURLToDownload(url, getPrefix(index));
     }
 }

src/main/java/com/rarchives/ripme/ripper/rippers/TheyiffgalleryRipper.java

@@ -0,0 +1,75 @@
+package com.rarchives.ripme.ripper.rippers;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+
+import com.rarchives.ripme.ripper.AbstractHTMLRipper;
+import com.rarchives.ripme.utils.Http;
+
+public class TheyiffgalleryRipper extends AbstractHTMLRipper {
+
+    public TheyiffgalleryRipper(URL url) throws IOException {
+        super(url);
+    }
+
+    @Override
+    public String getHost() {
+        return "theyiffgallery";
+    }
+
+    @Override
+    public String getDomain() {
+        return "theyiffgallery.com";
+    }
+
+    @Override
+    public String getGID(URL url) throws MalformedURLException {
+        Pattern p = Pattern.compile("https?://theyiffgallery.com/index\\?/category/(\\d+)");
+        Matcher m = p.matcher(url.toExternalForm());
+        if (m.matches()) {
+            return m.group(1);
+        }
+        throw new MalformedURLException("Expected theyiffgallery URL format: " +
+                "theyiffgallery.com/index?/category/#### - got " + url + " instead");
+    }
+
+    @Override
+    public Document getFirstPage() throws IOException {
+        // "url" is an instance field of the superclass
+        return Http.url(url).get();
+    }
+
+    @Override
+    public Document getNextPage(Document doc) throws IOException {
+        String nextPage = doc.select("span.navPrevNext > a").attr("href");
+        if (nextPage != null && !nextPage.isEmpty() && nextPage.contains("start-")) {
+            return Http.url("https://theyiffgallery.com/" + nextPage).get();
+        }
+        throw new IOException("No more pages");
+    }
+
+    @Override
+    public List<String> getURLsFromPage(Document doc) {
+        List<String> result = new ArrayList<>();
+        for (Element el : doc.select("ul.thumbnails > li.gdthumb")) {
+            String imageSource = el.select("a > img").attr("src");
+            imageSource = imageSource.replaceAll("_data/i", "");
+            imageSource = imageSource.replaceAll("-\\w\\w_\\w\\d+x\\d+", "");
+            result.add("https://theyiffgallery.com" + imageSource);
+        }
+        return result;
+    }
+
+    @Override
+    public void downloadURL(URL url, int index) {
+        addURLToDownload(url, getPrefix(index));
+    }
+}

src/test/java/com/rarchives/ripme/tst/ripper/rippers/BasicRippersTest.java

@@ -29,6 +29,8 @@ import com.rarchives.ripme.ripper.rippers.VineRipper;
 import com.rarchives.ripme.ripper.rippers.VkRipper;
 import com.rarchives.ripme.ripper.rippers.XhamsterRipper;
 import com.rarchives.ripme.ripper.rippers.PichunterRipper;
+import com.rarchives.ripme.ripper.rippers.TheyiffgalleryRipper;
+
 
 /**
  * Simple test cases for various rippers.
@@ -220,6 +222,11 @@ public class BasicRippersTest extends RippersTest {
         testRipper(ripper);
     }
 
+    public void testTheyiffgallery() throws IOException {
+        AbstractRipper ripper = new TheyiffgalleryRipper(new URL("https://theyiffgallery.com/index?/category/4303"));
+        testRipper(ripper);
+    }
+
     /*
     public void testSankakuChanRip() throws IOException {
         AbstractRipper ripper = new SankakuComplexRipper(new URL("https://chan.sankakucomplex.com/?tags=cleavage"));
@@ -278,8 +285,8 @@ public class BasicRippersTest extends RippersTest {
         testRipper(ripper);
     }
 
-    public void testXhamsterAlbums() throws IOException {
+    // public void testXhamsterAlbums() throws IOException {
-        XhamsterRipper ripper = new XhamsterRipper(new URL("https://xhamster.com/photos/gallery/sexy-preggo-girls-9026608"));
+    //     XhamsterRipper ripper = new XhamsterRipper(new URL("https://xhamster.com/photos/gallery/sexy-preggo-girls-9026608"));
-        testRipper(ripper);
+    //     testRipper(ripper);
-    }
+    // }
 }