Update CfakeRipper to new site format (Fixes #2116)

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

@@ -15,75 +15,73 @@ import com.rarchives.ripme.ripper.AbstractHTMLRipper;
 import com.rarchives.ripme.utils.Http;
 
 public class CfakeRipper extends AbstractHTMLRipper {
-
     public CfakeRipper(URL url) throws IOException {
-    super(url);
+        super(url);
     }
 
-        @Override
+    @Override
-        public String getHost() {
+    public String getHost() {
-            return "cfake";
+        return "cfake";
+    }
+
+    @Override
+    public String getDomain() {
+        return "cfake.com";
+    }
+
+    @Override
+    public String getGID(URL url) throws MalformedURLException {
+        Pattern p = Pattern.compile("https?://cfake\\.com/(?:picture|images/celebrity)/([a-zA-Z1-9_-]*)/\\d+/?$");
+        Matcher m = p.matcher(url.toExternalForm());
+        if (m.matches()) {
+            return m.group(1);
         }
+        throw new MalformedURLException("Expected cfake URL format: " +
+                "cfake.com/images/celebrity/MODEL/ID - got " + url + " instead");
+    }
 
-        @Override
+    @Override
-        public String getDomain() {
+    public Document getFirstPage() throws IOException {
-            return "cfake.com";
+        // "url" is an instance field of the superclass
+        return Http.url(url).get();
+    }
+
+    @Override
+    public Document getNextPage(Document doc) throws IOException {
+        // We use comic-nav-next to the find the next page
+        Element elem = doc.select("td > div.next > a").first();
+        if (elem == null) {
+            throw new IOException("No more pages");
         }
-
+        String nextPage = elem.attr("href");
-        @Override
+        // Some times this returns a empty string
-        public String getGID(URL url) throws MalformedURLException {
+        // This for stops that
-            Pattern p = Pattern.compile("https?://cfake\\.com/picture/([a-zA-Z1-9_-]*)/\\d+/?$");
+        if (nextPage.equals("")) {
-            Matcher m = p.matcher(url.toExternalForm());
+            return null;
-            if (m.matches()) {
+        } else {
-                return m.group(1);
+            return Http.url("http://cfake.com" + nextPage).get();
-            }
-            throw new MalformedURLException("Expected cfake URL format: " +
-                            "cfake.com/picture/MODEL/ID - got " + url + " instead");
         }
+    }
 
-        @Override
+    @Override
-        public Document getFirstPage() throws IOException {
+    public List<String> getURLsFromPage(Document doc) {
-            // "url" is an instance field of the superclass
+        List<String> result = new ArrayList<>();
-            return Http.url(url).get();
+        for (Element el : doc.select("table.display > tbody > tr > td > table > tbody > tr > td > a")) {
-        }
+            if (el.attr("href").contains("upload")) {
-
-        @Override
-        public Document getNextPage(Document doc) throws IOException {
-            // We use comic-nav-next to the find the next page
-            Element elem = doc.select("td > div.next > a").first();
-                if (elem == null) {
-                    throw new IOException("No more pages");
-                }
-                String nextPage = elem.attr("href");
-                // Some times this returns a empty string
-                // This for stops that
-                if (nextPage.equals("")) {
-                    return null;
-                }
-                else {
-                    return Http.url("http://cfake.com" + nextPage).get();
-                }
-            }
-
-        @Override
-        public List<String> getURLsFromPage(Document doc) {
-            List<String> result = new ArrayList<>();
-                for (Element el : doc.select("table.display > tbody > tr > td > table > tbody > tr > td > a")) {
-                    if (el.attr("href").contains("upload")) {
-                        return result;
-                    } else {
-                        String imageSource = el.select("img").attr("src");
-                        // We remove the .md from images so we download the full size image
-                        // not the thumbnail ones
-                        imageSource = imageSource.replace("thumbs", "photos");
-                        result.add("http://cfake.com" + imageSource);
-                    }
-                }
                 return result;
+            } else {
+                String imageSource = el.select("img").attr("src");
+                // We remove the .md from images so we download the full size image
+                // not the thumbnail ones
+                imageSource = imageSource.replace("thumbs", "photos");
+                result.add("http://cfake.com" + imageSource);
+            }
         }
-
+        return result;
-        @Override
-        public void downloadURL(URL url, int index) {
-            addURLToDownload(url, getPrefix(index));
-        }
     }
+
+    @Override
+    public void downloadURL(URL url, int index) {
+        addURLToDownload(url, getPrefix(index));
+    }
+}

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

@@ -8,7 +8,7 @@ import com.rarchives.ripme.ripper.rippers.CfakeRipper;
 
 public class CfakeRipperTest extends RippersTest {
     public void testRip() throws IOException, URISyntaxException {
-        CfakeRipper ripper = new CfakeRipper(new URI("http://cfake.com/picture/Zooey_Deschanel/1264").toURL());
+        CfakeRipper ripper = new CfakeRipper(new URI("https://cfake.com/images/celebrity/Zooey_Deschanel/1264").toURL());
         testRipper(ripper);
     }
 }