From c42831fc63b1b6986fa55bc869053e92ba7b677b Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Wed, 22 Feb 2017 09:47:25 -0500
Subject: [PATCH] added chevereto ripper

---
 .../ripme/ripper/rippers/CheveretoRipper.java | 57 +++----------------
 1 file changed, 7 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java
index c3b0b425..269680dd 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java
@@ -25,13 +25,13 @@ public class CheveretoRipper extends AbstractHTMLRipper {
     public static List<String> explicit_domains_1 = Arrays.asList("www.ezphotoshare.com", "hushpix.com");
         @Override
         public String getHost() {
-            String host = url.toExternalForm();
+            String host = url.toExternalForm().split("/")[2];
             return host;
         }
 
         @Override
         public String getDomain() {
-            String host = url.toExternalForm();
+            String host = url.toExternalForm().split("/")[2];
             return host;
         }
 
@@ -39,7 +39,11 @@ public class CheveretoRipper extends AbstractHTMLRipper {
         public boolean canRip(URL url) {
             String url_name = url.toExternalForm();
             if (explicit_domains_1.contains(url_name.split("/")[2]) == true) {
-                return true;
+                Pattern pa = Pattern.compile("(?:https?://)?(?:www\\.)?[a-z1-9]*\\.[a-z1-9]*/album/([a-zA-Z1-9]*)/?$");
+                Matcher ma = pa.matcher(url.toExternalForm());
+                if (ma.matches()) {
+                    return true;
+                }
             }
             return false;
         }
@@ -51,13 +55,6 @@ public class CheveretoRipper extends AbstractHTMLRipper {
             if (m.matches()) {
                 return m.group(1);
             }
-            else if (m.matches() == false) {
-                Pattern pa = Pattern.compile("(?:https?://)?(?:www\\.)?[a-z1-9]*\\.[a-z1-9]*/([a-zA-Z1-9_-]*)/albums/?$");
-                Matcher ma = pa.matcher(url.toExternalForm());
-                if (ma.matches()) {
-                    return ma.group(1);
-                }
-            }
             throw new MalformedURLException("Expected chevereto URL format: " +
                             "site.domain/album/albumName or site.domain/username/albums- got " + url + " instead");
         }
@@ -67,49 +64,10 @@ public class CheveretoRipper extends AbstractHTMLRipper {
             // "url" is an instance field of the superclass
             return Http.url(url).get();
         }
-        
-        @Override
-        public Document getNextPage(Document doc) throws IOException {
-            // Find next page
-            String nextUrl = "";
-            Element elem = doc.select("li.pagination-next > a").first();
-                String nextPage = elem.attr("href");
-                if (nextUrl == "") {
-                    throw new IOException("No more pages");
-                }
-                // Sleep for half a sec to avoid getting IP banned
-                sleep(500);
-                return Http.url(nextUrl).get();
-            }
 
         @Override
         public List<String> getURLsFromPage(Document doc) {
             List<String> result = new ArrayList<String>();
-            Document userpage_doc;
-            // We check for the following string to see if this is a user page or not
-            if (doc.toString().contains("content=\"gallery\"")) {
-                for (Element elem : doc.select("a.image-container")) {
-                    String link = elem.attr("href");
-                    logger.info("Grabbing album " + link);
-                    try {
-                        userpage_doc = Http.url(link).get();
-                    } catch(IOException e){
-                        logger.warn("Failed to log link in Jsoup");
-                        userpage_doc = null;
-                        e.printStackTrace();
-                    }
-                    for (Element element : userpage_doc.select("a.image-container > img")) {
-                            String imageSource = element.attr("src");
-                            logger.info("Found image " + link);
-                            // We remove the .md from images so we download the full size image
-                            // not the medium ones
-                            imageSource = imageSource.replace(".md", "");
-                            result.add(imageSource);
-                        }
-                }
-
-            }
-            else {
                 for (Element el : doc.select("a.image-container > img")) {
                     String imageSource = el.attr("src");
                     // We remove the .md from images so we download the full size image
@@ -117,7 +75,6 @@ public class CheveretoRipper extends AbstractHTMLRipper {
                     imageSource = imageSource.replace(".md", "");
                     result.add(imageSource);
                 }
-            }
             return result;
         }