From e89b27dc1485fb43ea19a42eb4a0ad8c78dc28a5 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sat, 2 Dec 2017 04:49:53 -0500
Subject: [PATCH 01/35] Added hasASAPRipping(), which if returns true allows a
 ripper to not return anything from getURLsFromPage()

---
 .../ripme/ripper/AbstractHTMLRipper.java      | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
index 3b7496a0..80bdcb34 100644
--- a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
@@ -53,6 +53,7 @@ public abstract class AbstractHTMLRipper extends AlbumRipper {
     protected boolean hasDescriptionSupport() {
         return false;
     }
+    public boolean hasASAPRipping() {return false;}
     protected String[] getDescription(String url, Document page) throws IOException {
         throw new IOException("getDescription not implemented"); // Do I do this or make an abstract function?
     }
@@ -68,24 +69,27 @@ public abstract class AbstractHTMLRipper extends AlbumRipper {
         Document doc = getFirstPage();
 
         while (doc != null) {
-            List<String> imageURLs = getURLsFromPage(doc);
-            // Remove all but 1 image
-            if (isThisATest()) {
-                while (imageURLs.size() > 1) {
-                    imageURLs.remove(1);
+            List<String> imageURLs;
+            if (!hasASAPRipping()) {
+                imageURLs = getURLsFromPage(doc);
+                // Remove all but 1 image
+                if (isThisATest()) {
+                    while (imageURLs.size() > 1) {
+                        imageURLs.remove(1);
+                    }
                 }
-            }
 
-            if (imageURLs.size() == 0) {
-                throw new IOException("No images found at " + doc.location());
-            }
+                if (imageURLs.size() == 0) {
+                    throw new IOException("No images found at " + doc.location());
+                }
 
-            for (String imageURL : imageURLs) {
-                index += 1;
-                logger.debug("Found image url #" + index + ": " + imageURL);
-                downloadURL(new URL(imageURL), index);
-                if (isStopped()) {
-                    break;
+                for (String imageURL : imageURLs) {
+                    index += 1;
+                    logger.debug("Found image url #" + index + ": " + imageURL);
+                    downloadURL(new URL(imageURL), index);
+                    if (isStopped()) {
+                        break;
+                    }
                 }
             }
             if (hasDescriptionSupport() && Utils.getConfigBoolean("descriptions.save", false)) {

From 761f1e29879c3d6a5a1313a3387874a75062c057 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sat, 2 Dec 2017 05:09:22 -0500
Subject: [PATCH 02/35] Fixed bug that caused no images to be downloaded

---
 .../java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
index 80bdcb34..4646df31 100644
--- a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
@@ -53,7 +53,7 @@ public abstract class AbstractHTMLRipper extends AlbumRipper {
     protected boolean hasDescriptionSupport() {
         return false;
     }
-    public boolean hasASAPRipping() {return false;}
+    public boolean hasASAPRipping() { return false; }
     protected String[] getDescription(String url, Document page) throws IOException {
         throw new IOException("getDescription not implemented"); // Do I do this or make an abstract function?
     }
@@ -69,9 +69,8 @@ public abstract class AbstractHTMLRipper extends AlbumRipper {
         Document doc = getFirstPage();
 
         while (doc != null) {
-            List<String> imageURLs;
+            List<String> imageURLs = getURLsFromPage(doc);
             if (!hasASAPRipping()) {
-                imageURLs = getURLsFromPage(doc);
                 // Remove all but 1 image
                 if (isThisATest()) {
                     while (imageURLs.size() > 1) {

From 61169352cbfecf92cb37b3450e9847b274e0764b Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sat, 2 Dec 2017 19:20:09 -0500
Subject: [PATCH 03/35] Moved hasASAPRipping() from AbstractHTMLRipper to
 AbstractRipper

---
 src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java | 1 -
 src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
index 4646df31..3e74912a 100644
--- a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java
@@ -53,7 +53,6 @@ public abstract class AbstractHTMLRipper extends AlbumRipper {
     protected boolean hasDescriptionSupport() {
         return false;
     }
-    public boolean hasASAPRipping() { return false; }
     protected String[] getDescription(String url, Document page) throws IOException {
         throw new IOException("getDescription not implemented"); // Do I do this or make an abstract function?
     }
diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java
index a852e177..090b4e42 100644
--- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java
@@ -43,6 +43,7 @@ public abstract class AbstractRipper
     public abstract void rip() throws IOException;
     public abstract String getHost();
     public abstract String getGID(URL url) throws MalformedURLException;
+    public boolean hasASAPRipping() { return false; }
 
     private boolean shouldStop = false;
     private boolean thisIsATest = false;

From 970c181ca51e681c4b32a210e6b2e00a28c498fe Mon Sep 17 00:00:00 2001
From: cyian-1756 <cyian-1756@users.noreply.github.com>
Date: Mon, 11 Dec 2017 09:28:21 -0500
Subject: [PATCH 04/35] Revert "Added basic docs for some of ripmes options"

---
 docs/options.md | 40 ----------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 docs/options.md

diff --git a/docs/options.md b/docs/options.md
deleted file mode 100644
index d972561b..00000000
--- a/docs/options.md
+++ /dev/null
@@ -1,40 +0,0 @@
-file.overwrite     | bool | If true ripme will overwrite existing files rather than skip them
-
-clipboard.autorip  | bool | If true ripme will try to download any links in the clip board
-
-error.skip404      | bool | Don't retry on 404 errors
-
-download.save_order| bool | If true ripme will prefix each downloaded file with a number in the order the file was download
-
-auto.update        | bool | If true ripme will auto-update every time it's started
-
-play.sound         | bool | If true ripme will play a sound every time a rip finishes
-
-download.show_popup| bool | TODO figure out what this is for
-
-log.save           | bool | If true ripme will save it's logs
-
-urls_only.save     | bool | If true ripme will save all urls to a text file and download no files
-
-album_titles.save  | bool | Currently does nothing
-
-prefer.mp4         | bool | Prefer mp4 when downloading a video that has more than 1 format
-
-download.timeout   | int  | File download timeout (in milliseconds)
-
-page.timeout       | int  | Page download timeout (in milliseconds)
-
-download.max_size  | int  | Maximum size of downloaded files in bytes
-
-threads.size       | int  | The number of threads to use
-
-twitter.auth       | String | Twitter API key (Base64'd)
-
-tumblr.auth        | String | Tumblr API key
-
-log.level          | String | The debug log level (Example: Log level: Debug)
-
-gw.api             | String | TODO figure out what this is for
-
-twitter.max_requests | int | TODO figure out what this is for
-

From f7ae0e8d96c2e8f537b7138e6b674fa67a2bbae2 Mon Sep 17 00:00:00 2001
From: rephormat <rephormat@users.noreply.github.com>
Date: Fri, 12 Jan 2018 19:24:40 -0600
Subject: [PATCH 05/35] Add yuvutu.com ripper.

---
 .../ripme/ripper/rippers/YuvutuRipper.java    | 70 ++++++++++++++++
 .../ripper/rippers/video/YuvutuRipper.java    | 82 +++++++++++++++++++
 2 files changed, 152 insertions(+)
 create mode 100644 src/main/java/com/rarchives/ripme/ripper/rippers/YuvutuRipper.java
 create mode 100644 src/main/java/com/rarchives/ripme/ripper/rippers/video/YuvutuRipper.java

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/YuvutuRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/YuvutuRipper.java
new file mode 100644
index 00000000..97365aa8
--- /dev/null
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/YuvutuRipper.java
@@ -0,0 +1,70 @@
+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 YuvutuRipper extends AbstractHTMLRipper {
+    
+    private static final String DOMAIN = "yuvutu.com",
+                                HOST   = "yuvutu";
+
+    public YuvutuRipper(URL url) throws IOException {
+        super(url);
+    }
+
+    @Override
+    public String getHost() {
+        return HOST;
+    }
+    @Override
+    public String getDomain() {
+        return DOMAIN;
+    }
+
+    @Override
+    public boolean canRip(URL url) {
+        Pattern p = Pattern.compile("^http://www\\.yuvutu\\.com/modules\\.php\\?name=YuGallery&action=view&set_id=([0-9]+)$");
+        Matcher m = p.matcher(url.toExternalForm());
+        return m.matches();
+    }
+    
+    @Override
+    public String getGID(URL url) throws MalformedURLException {
+        Pattern p = Pattern.compile("^http://www\\.yuvutu\\.com/modules\\.php\\?name=YuGallery&action=view&set_id=([0-9]+)$");
+        Matcher m = p.matcher(url.toExternalForm());
+        if (m.matches()) {
+            return m.group(1);
+        }
+        throw new MalformedURLException("Expected yuvutu.com URL format: " +
+                        "yuvutu.com/modules.php?name=YuGallery&action=view&set_id=albumid - got " + url + "instead");
+    }
+
+    @Override
+    public Document getFirstPage() throws IOException {
+        return Http.url(url).get();
+    }
+    @Override
+    public List<String> getURLsFromPage(Document doc) {
+        List<String> imageURLs = new ArrayList<>();
+        for (Element thumb : doc.select("div#galleria > a > img")) {
+            String image = thumb.attr("src");
+            imageURLs.add(image);
+        }
+        return imageURLs;
+    }
+    @Override
+    public void downloadURL(URL url, int index) {
+        addURLToDownload(url, getPrefix(index));
+    }
+}
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/YuvutuRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/YuvutuRipper.java
new file mode 100644
index 00000000..f455abe2
--- /dev/null
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/YuvutuRipper.java
@@ -0,0 +1,82 @@
+package com.rarchives.ripme.ripper.rippers.video;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
+
+import com.rarchives.ripme.ripper.VideoRipper;
+import com.rarchives.ripme.utils.Http;
+
+public class YuvutuRipper extends VideoRipper {
+
+    private static final String HOST = "yuvutu";
+
+    public YuvutuRipper(URL url) throws IOException {
+        super(url);
+    }
+
+    @Override
+    public String getHost() {
+        return HOST;
+    }
+
+    @Override
+    public boolean canRip(URL url) {
+        Pattern p = Pattern.compile("^http://www\\.yuvutu\\.com/video/[0-9]+/(.*)$");
+        Matcher m = p.matcher(url.toExternalForm());
+        return m.matches();
+    }
+
+    @Override
+    public URL sanitizeURL(URL url) throws MalformedURLException {
+        return url;
+    }
+
+    @Override
+    public String getGID(URL url) throws MalformedURLException {
+        Pattern p = Pattern.compile("^http://www\\.yuvutu\\.com/video/[0-9]+/(.*)$");
+        Matcher m = p.matcher(url.toExternalForm());
+        if (m.matches()) {
+            return m.group(1);
+        }
+
+        throw new MalformedURLException(
+                "Expected yuvutu format:"
+                        + "yuvutu.com/video/####"
+                        + " Got: " + url);
+    }
+
+    @Override
+    public void rip() throws IOException {
+        logger.info("Retrieving " + this.url);
+        Document doc = Http.url(url).get();
+        Element iframe = doc.select("iframe").first();
+        String iframeSrc = iframe.attr("src");
+        if (iframeSrc != null) {
+            doc = Http.url("http://www.yuvutu.com" + iframeSrc).get();
+        } else {
+            throw new IOException("Could not find iframe code at " + url);
+        }
+        Elements script = doc.select("script");
+        if (script.size() == 0) {
+            throw new IOException("Could not find script code at " + url);
+        }
+        Pattern p = Pattern.compile("file: \"(.*?)\"");
+        
+        for (Element element : script) {
+            Matcher m = p.matcher(element.data());
+            if (m.find()){
+                String vidUrl = m.group(1);
+                addURLToDownload(new URL(vidUrl), HOST + "_" + getGID(this.url));
+            }
+        }
+        waitForThreads();
+    }
+}

From 4464fa873aa9d7c6159a072f4bf99f0fdc02b43c Mon Sep 17 00:00:00 2001
From: rephormat <rephormat@users.noreply.github.com>
Date: Sat, 13 Jan 2018 09:31:35 -0600
Subject: [PATCH 06/35] Add yuvutu.com ripper test.

---
 .../tst/ripper/rippers/YuvutuRipperTest.java  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/test/java/com/rarchives/ripme/tst/ripper/rippers/YuvutuRipperTest.java

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/YuvutuRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/YuvutuRipperTest.java
new file mode 100644
index 00000000..a74b76e9
--- /dev/null
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/YuvutuRipperTest.java
@@ -0,0 +1,19 @@
+package com.rarchives.ripme.tst.ripper.rippers;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.rarchives.ripme.ripper.rippers.YuvutuRipper;
+
+public class YuvutuRipperTest extends RippersTest {
+
+    public void testYuvutuAlbum1() throws IOException {
+        YuvutuRipper ripper = new YuvutuRipper(new URL("http://www.yuvutu.com/modules.php?name=YuGallery&action=view&set_id=127013"));
+        testRipper(ripper);
+    }
+
+    public void testYuvutuAlbum2() throws IOException {
+        YuvutuRipper ripper = new YuvutuRipper(new URL("http://www.yuvutu.com/modules.php?name=YuGallery&action=view&set_id=420333"));
+        testRipper(ripper);
+    }
+}

From 38231c82de85b25e9418b0582f862b3cbe9ed25b Mon Sep 17 00:00:00 2001
From: reph <rephormat@users.noreply.github.com>
Date: Sat, 13 Jan 2018 18:40:15 -0600
Subject: [PATCH 07/35] Add yuvutu.com video ripper test.

---
 .../ripme/tst/ripper/rippers/VideoRippersTest.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
index 73c818d0..80abe56e 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
@@ -10,6 +10,7 @@ import com.rarchives.ripme.ripper.rippers.video.PornhubRipper;
 import com.rarchives.ripme.ripper.rippers.video.VineRipper;
 import com.rarchives.ripme.ripper.rippers.video.XvideosRipper;
 import com.rarchives.ripme.ripper.rippers.video.YoupornRipper;
+import com.rarchives.ripme.ripper.rippers.video.YuvutuRipper;
 
 public class VideoRippersTest extends RippersTest {
 
@@ -77,5 +78,14 @@ public class VideoRippersTest extends RippersTest {
             videoTestHelper(ripper);
         }
     }
+    
+    public void testYuvutuRipper() throws IOException {
+        List<URL> contentURLs = new ArrayList<>();
+        contentURLs.add(new URL("http://www.yuvutu.com/video/828499/female-reader-armpit-job/"));
+        for (URL url : contentURLs) {
+            YuvutuRipper ripper = new YuvutuRipper(url);
+            videoTestHelper(ripper);
+        }
+    }
 
 }

From 81f804e61f7c7b58c7d26adbdbb168f7462fad2f Mon Sep 17 00:00:00 2001
From: reph <rephormat@users.noreply.github.com>
Date: Sat, 13 Jan 2018 21:23:44 -0600
Subject: [PATCH 08/35] Fixes xhamster.com video ripper.

---
 .../ripme/ripper/rippers/video/XhamsterRipper.java     |  6 +++---
 .../ripme/tst/ripper/rippers/VideoRippersTest.java     | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/XhamsterRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/XhamsterRipper.java
index e559ebec..b30f5a1a 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/XhamsterRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/XhamsterRipper.java
@@ -39,10 +39,10 @@ public class XhamsterRipper extends VideoRipper {
 
     @Override
     public String getGID(URL url) throws MalformedURLException {
-        Pattern p = Pattern.compile("^https?://.*xhamster\\.com/(movies|videos)/.*$");
+        Pattern p = Pattern.compile("^https?://.*xhamster\\.com/(movies|videos)/(.*)$");
         Matcher m = p.matcher(url.toExternalForm());
         if (m.matches()) {
-            return m.group(1);
+            return m.group(2);
         }
 
         throw new MalformedURLException(
@@ -56,7 +56,7 @@ public class XhamsterRipper extends VideoRipper {
     public void rip() throws IOException {
         logger.info("Retrieving " + this.url);
         Document doc = Http.url(url).get();
-        Elements videos = doc.select("a.mp4Thumb");
+        Elements videos = doc.select("div.player-container > a");
         if (videos.size() == 0) {
             throw new IOException("Could not find Embed code at " + url);
         }
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
index 73c818d0..f4566c11 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
@@ -8,6 +8,7 @@ import java.util.List;
 import com.rarchives.ripme.ripper.VideoRipper;
 import com.rarchives.ripme.ripper.rippers.video.PornhubRipper;
 import com.rarchives.ripme.ripper.rippers.video.VineRipper;
+import com.rarchives.ripme.ripper.rippers.video.XhamsterRipper;
 import com.rarchives.ripme.ripper.rippers.video.XvideosRipper;
 import com.rarchives.ripme.ripper.rippers.video.YoupornRipper;
 
@@ -35,6 +36,15 @@ public class VideoRippersTest extends RippersTest {
         }
     }
 
+    public void testXhamsterRipper() throws IOException {
+        List<URL> contentURLs = new ArrayList<>();
+        contentURLs.add(new URL("https://xhamster.com/videos/brazzers-busty-big-booty-milf-lisa-ann-fucks-her-masseur-1492828"));
+        for (URL url : contentURLs) {
+            XhamsterRipper ripper = new XhamsterRipper(url);
+            videoTestHelper(ripper);
+        }
+    }
+
     public void testXvideosRipper() throws IOException {
         List<URL> contentURLs = new ArrayList<>();
         contentURLs.add(new URL("https://www.xvideos.com/video19719109/ziggy_star_ultra_hard_anal_pounding"));

From 93785e5e9ba09a09b9a578f28a08a7984dcad24b Mon Sep 17 00:00:00 2001
From: slauzon <rephormat@gmail.com>
Date: Sun, 14 Jan 2018 16:10:22 -0600
Subject: [PATCH 09/35] User friendly filenames

---
 .../rippers/video/TwitchVideoRipper.java      | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 src/main/java/com/rarchives/ripme/ripper/rippers/video/TwitchVideoRipper.java

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/TwitchVideoRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/TwitchVideoRipper.java
new file mode 100644
index 00000000..9cca50aa
--- /dev/null
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/TwitchVideoRipper.java
@@ -0,0 +1,80 @@
+package com.rarchives.ripme.ripper.rippers.video;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
+
+import com.rarchives.ripme.ripper.VideoRipper;
+import com.rarchives.ripme.utils.Http;
+
+public class TwitchVideoRipper extends VideoRipper {
+
+    private static final String HOST = "twitch";
+
+    public TwitchVideoRipper(URL url) throws IOException {
+        super(url);
+    }
+
+    @Override
+    public String getHost() {
+        return HOST;
+    }
+
+    @Override
+    public boolean canRip(URL url) {
+        Pattern p = Pattern.compile("^https://clips\\.twitch\\.tv/.*$");
+        Matcher m = p.matcher(url.toExternalForm());
+        return m.matches();
+    }
+
+    @Override
+    public URL sanitizeURL(URL url) throws MalformedURLException {
+        return url;
+    }
+
+    @Override
+    public String getGID(URL url) throws MalformedURLException {
+        Pattern p = Pattern.compile("^https://clips\\.twitch\\.tv/(.*)$");
+        Matcher m = p.matcher(url.toExternalForm());
+        if (m.matches()) {
+            return m.group(m.groupCount());
+        }
+
+        throw new MalformedURLException(
+                "Expected Twitch.tv format:"
+                        + "https://clips.twitch.tv/####"
+                        + " Got: " + url);
+    }
+
+    @Override
+    public void rip() throws IOException {
+        logger.info("Retrieving " + this.url);
+        Document doc = Http.url(url).get();
+        
+        //Get user friendly filename from page title
+        String title = doc.title();
+        
+        Elements script = doc.select("script");
+        if (script.size() == 0) {
+            throw new IOException("Could not find script code at " + url);
+        }
+        //Regex assumes highest quality source is listed first
+        Pattern p = Pattern.compile("\"source\":\"(.*?)\"");
+        
+        for (Element element : script) {
+            Matcher m = p.matcher(element.data());
+            if (m.find()){
+                String vidUrl = m.group(1);
+                addURLToDownload(new URL(vidUrl), HOST + "_" + title);
+            }
+        }
+        waitForThreads();
+    }
+}
\ No newline at end of file

From 0f7700320298e6ef691641970fdba15c899655a4 Mon Sep 17 00:00:00 2001
From: slauzon <rephormat@gmail.com>
Date: Sun, 14 Jan 2018 16:15:35 -0600
Subject: [PATCH 10/35] Added Twitch video rippper test

---
 .../ripme/tst/ripper/rippers/VideoRippersTest.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
index 73c818d0..534b237e 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
@@ -7,6 +7,7 @@ import java.util.List;
 
 import com.rarchives.ripme.ripper.VideoRipper;
 import com.rarchives.ripme.ripper.rippers.video.PornhubRipper;
+import com.rarchives.ripme.ripper.rippers.video.TwitchVideoRipper;
 import com.rarchives.ripme.ripper.rippers.video.VineRipper;
 import com.rarchives.ripme.ripper.rippers.video.XvideosRipper;
 import com.rarchives.ripme.ripper.rippers.video.YoupornRipper;
@@ -35,6 +36,15 @@ public class VideoRippersTest extends RippersTest {
         }
     }
 
+    public void testTwitchVideoRipper() throws IOException {
+        List<URL> contentURLs = new ArrayList<>();
+        contentURLs.add(new URL("https://clips.twitch.tv/FaithfulIncredulousPotTBCheesePull"));
+        for (URL url : contentURLs) {
+            TwitchVideoRipper ripper = new TwitchVideoRipper(url);
+            videoTestHelper(ripper);
+        }
+    }
+    
     public void testXvideosRipper() throws IOException {
         List<URL> contentURLs = new ArrayList<>();
         contentURLs.add(new URL("https://www.xvideos.com/video19719109/ziggy_star_ultra_hard_anal_pounding"));

From c1e2edd82d84b4f39248c27c20945324b89a1720 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Mon, 15 Jan 2018 00:29:11 -0500
Subject: [PATCH 11/35] disabled FuskatorRipperTest

---
 .../ripper/rippers/FuskatorRipperTest.java    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuskatorRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuskatorRipperTest.java
index f5bc6f0d..20c8473d 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuskatorRipperTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/FuskatorRipperTest.java
@@ -1,13 +1,15 @@
-package com.rarchives.ripme.tst.ripper.rippers;
+//package com.rarchives.ripme.tst.ripper.rippers;
+//
+//import java.io.IOException;
+//import java.net.URL;
+//
+//import com.rarchives.ripme.ripper.rippers.FuskatorRipper;
+//
+//public class FuskatorRipperTest extends RippersTest {
+//    public void testFuskatorAlbum() throws IOException {
+//        FuskatorRipper ripper = new FuskatorRipper(new URL("https://fuskator.com/thumbs/hqt6pPXAf9z/Shaved-Blonde-Babe-Katerina-Ambre.html"));
+//        testRipper(ripper);
+//    }
+//}
 
-import java.io.IOException;
-import java.net.URL;
-
-import com.rarchives.ripme.ripper.rippers.FuskatorRipper;
-
-public class FuskatorRipperTest extends RippersTest {
-    public void testFuskatorAlbum() throws IOException {
-        FuskatorRipper ripper = new FuskatorRipper(new URL("https://fuskator.com/thumbs/hqt6pPXAf9z/Shaved-Blonde-Babe-Katerina-Ambre.html"));
-        testRipper(ripper);
-    }
-}
+// Disabled because of https://github.com/RipMeApp/ripme/issues/393
\ No newline at end of file

From 20e59499bc806cd4d55a61ff85214c43d0cc9ab8 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Tue, 16 Jan 2018 06:03:10 -0500
Subject: [PATCH 12/35] 1.7.13: disabled FuskatorRipperTest; Fixes xhamster.com
 video ripper; Add yuvutu.com ripper

---
 pom.xml                                               | 2 +-
 ripme.json                                            | 3 ++-
 src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe587fb9..c9310063 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.12</version>
+  <version>1.7.13</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>
diff --git a/ripme.json b/ripme.json
index 55b96a97..5051e28b 100644
--- a/ripme.json
+++ b/ripme.json
@@ -1,6 +1,7 @@
 {
-    "latestVersion": "1.7.12",
+    "latestVersion": "1.7.13",
     "changeList": [
+        "1.7.13: disabled FuskatorRipperTest; Fixes xhamster.com video ripper; Add yuvutu.com ripper",
         "1.7.12: Instagram ripper no longer 403s on certain images",
         "1.7.11: Added gwarchives support to the cheveretoRipper; Gfycat Tests & Fix for bad reddit submissions; instagram ripper can now be made to skip videos",
         "1.7.10: Added basic pornpics.com ripper; Fixed hentai.cafe regex",
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index 15654f5a..e6e9ab52 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
 public class UpdateUtils {
 
     private static final Logger logger = Logger.getLogger(UpdateUtils.class);
-    private static final String DEFAULT_VERSION = "1.7.12";
+    private static final String DEFAULT_VERSION = "1.7.13";
     private static final String REPO_NAME = "ripmeapp/ripme";
     private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
     private static final String mainFileName = "ripme.jar";

From d72ef86b928ff7314554bfdfcb499841e7052629 Mon Sep 17 00:00:00 2001
From: Aman <a3@yorha.nier>
Date: Wed, 17 Jan 2018 10:09:21 -0500
Subject: [PATCH 13/35] Make webtoons ripper download maximum quality images

---
 .../com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java   | 4 +++-
 .../ripme/tst/ripper/rippers/WebtoonsRipperTest.java         | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java
index f7b74133..df373689 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/WebtoonsRipper.java
@@ -71,7 +71,9 @@ public class WebtoonsRipper extends AbstractHTMLRipper {
     public List<String> getURLsFromPage(Document doc) {
         List<String> result = new ArrayList<String>();
         for (Element elem : doc.select("div.viewer_img > img")) {
-            result.add(elem.attr("data-url"));
+            String origUrl = elem.attr("data-url");
+            String[] finalUrl = origUrl.split("\\?type");
+            result.add(finalUrl[0]);
         }
         return result;
     }
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/WebtoonsRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/WebtoonsRipperTest.java
index 20cf17b8..4aa50d0a 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/WebtoonsRipperTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/WebtoonsRipperTest.java
@@ -10,4 +10,9 @@ public class WebtoonsRipperTest extends RippersTest {
         WebtoonsRipper ripper = new WebtoonsRipper(new URL("http://www.webtoons.com/en/drama/my-boo/ep-33/viewer?title_no=1185&episode_no=33"));
         testRipper(ripper);
     }
+
+    public void testWebtoonsType() throws IOException {
+    	WebtoonsRipper ripper = new WebtoonsRipper(new URL("http://www.webtoons.com/en/drama/lookism/ep-145/viewer?title_no=1049&episode_no=145"));
+    	testRipper(ripper);
+    }
 }

From 961faa9b63ae6bc9fb2ccd09082770ea19441ef3 Mon Sep 17 00:00:00 2001
From: rephormat <rephormat@users.noreply.github.com>
Date: Wed, 17 Jan 2018 19:17:07 -0600
Subject: [PATCH 14/35] Fixes RipMeApp/ripme#289 and RipMeApp/ripme#187

---
 .../ripme/ripper/rippers/video/PornhubRipper.java         | 8 ++++----
 .../ripme/tst/ripper/rippers/VideoRippersTest.java        | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java
index 7f10323d..88207123 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java
@@ -68,11 +68,11 @@ public class PornhubRipper extends VideoRipper {
                 title = title.replaceAll("\\+", " ");
 
                 vidUrl = null;
-                for (String quality : new String[] {"quality_1080p", "quality_720p", "quality_480p", "quality_240p"}) {
-                    Pattern pv = Pattern.compile("^.*var player_" + quality + " = '([^']*)'.*$", Pattern.DOTALL);
+                for (String quality : new String[] {"1080", "720", "480", "240"}) {
+                    Pattern pv = Pattern.compile("\"quality\":\"" + quality + "\",\"videoUrl\":\"(.*?)\"");
                     Matcher mv = pv.matcher(html);
-                    if (mv.matches()) {
-                        vidUrl = mv.group(1);
+                    if (mv.find()) {
+                        vidUrl = mv.group(1).replace("\\/", "/");
                         break;
                     }
                 }
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
index 74d206e1..a6b990ad 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
@@ -56,8 +56,6 @@ public class VideoRippersTest extends RippersTest {
         }
     }
 
-    // https://github.com/RipMeApp/ripme/issues/187
-    /*
     public void testPornhubRipper() throws IOException {
         List<URL> contentURLs = new ArrayList<>();
         contentURLs.add(new URL("http://www.pornhub.com/view_video.php?viewkey=993166542"));
@@ -66,7 +64,6 @@ public class VideoRippersTest extends RippersTest {
             videoTestHelper(ripper);
         }
     }
-    */
 
     // https://github.com/RipMeApp/ripme/issues/186
     /*

From 554d91f0eabddb19e5a29223a1fee2e03bb11e49 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Thu, 18 Jan 2018 12:04:58 -0500
Subject: [PATCH 15/35] 1.7.14: Tumblr API Key Choosing Fix; Make webtoons
 ripper download maximum quality images; Added twitch ripper; Added VSCO
 ripper; Fixed pornhub video ripper

---
 pom.xml                                               | 2 +-
 ripme.json                                            | 3 ++-
 src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c9310063..3899ee5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.13</version>
+  <version>1.7.14</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>
diff --git a/ripme.json b/ripme.json
index 5051e28b..ee7c9499 100644
--- a/ripme.json
+++ b/ripme.json
@@ -1,6 +1,7 @@
 {
-    "latestVersion": "1.7.13",
+    "latestVersion": "1.7.14",
     "changeList": [
+        "1.7.14: Tumblr API Key Choosing Fix; Make webtoons ripper download maximum quality images; Added twitch ripper; Added VSCO ripper; Fixed pornhub video ripper",
         "1.7.13: disabled FuskatorRipperTest; Fixes xhamster.com video ripper; Add yuvutu.com ripper",
         "1.7.12: Instagram ripper no longer 403s on certain images",
         "1.7.11: Added gwarchives support to the cheveretoRipper; Gfycat Tests & Fix for bad reddit submissions; instagram ripper can now be made to skip videos",
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index e6e9ab52..83185be1 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
 public class UpdateUtils {
 
     private static final Logger logger = Logger.getLogger(UpdateUtils.class);
-    private static final String DEFAULT_VERSION = "1.7.13";
+    private static final String DEFAULT_VERSION = "1.7.14";
     private static final String REPO_NAME = "ripmeapp/ripme";
     private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
     private static final String mainFileName = "ripme.jar";

From 26a52809da1b6795b95e02aa39947c3158a048df Mon Sep 17 00:00:00 2001
From: mszkb <martin.szalay.kb@gmail.com>
Date: Sat, 20 Jan 2018 15:13:46 +0100
Subject: [PATCH 16/35] make method to check if directory exists

---
 .../rarchives/ripme/ripper/AlbumRipper.java   |  5 ++-
 .../java/com/rarchives/ripme/utils/Utils.java | 36 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
index a92f3870..124ef163 100644
--- a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
@@ -197,8 +197,11 @@ public abstract class AlbumRipper extends AbstractRipper {
             title = super.getAlbumTitle(this.url);
         }
         logger.debug("Using album title '" + title + "'");
+
         title = Utils.filesystemSafe(title);
-        path += title + File.separator;
+        path += title;
+        path = Utils.getOriginalDirectory(path) + File.separator;   // check for case sensitive (unix only)
+
         this.workingDir = new File(path);
         if (!this.workingDir.exists()) {
             logger.info("[+] Creating directory: " + Utils.removeCWD(this.workingDir));
diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java
index d9f8bf9e..61acc81f 100644
--- a/src/main/java/com/rarchives/ripme/utils/Utils.java
+++ b/src/main/java/com/rarchives/ripme/utils/Utils.java
@@ -370,6 +370,42 @@ public class Utils {
         return text;
     }
 
+    /**
+     * Checks if given path already exists as lowercase
+     *
+     * @param path - original path entered to be ripped
+     * @return path of existing folder or the original path if not present
+     */
+    public static String getOriginalDirectory(String path) {
+
+        int index;
+        if(isUnix() || isMacOS()) {
+            index = path.lastIndexOf('/');
+        } else {
+            // current OS is windows - nothing to do here
+            return path;
+        }
+
+        String original = path;                                         // needs to be checked if lowercase exists
+        String lastPart = original.substring(index+1).toLowerCase();    // setting lowercase to check if it exists
+        String lowerCaseOriginal = path.substring(0, index)
+                + File.separator
+                + lastPart;
+
+        if(original.equals(lowerCaseOriginal)) {
+            // same name, nothing to do
+            return original;
+        }
+
+        // At last, check if the File with the original exists
+        File f = new File(original);
+        if(f.exists()) {
+            return original;
+        } else {
+            return lowerCaseOriginal;
+        }
+    }
+
     public static String bytesToHumanReadable(int bytes) {
         float fbytes = (float) bytes;
         String[] mags = new String[] {"", "K", "M", "G", "T"};

From cec606c4f04e602f04538c8152e7969dab261825 Mon Sep 17 00:00:00 2001
From: mszkb <martin.szalay.kb@gmail.com>
Date: Sat, 20 Jan 2018 18:05:54 +0100
Subject: [PATCH 17/35] change file check

---
 src/main/java/com/rarchives/ripme/utils/Utils.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java
index 61acc81f..6418a164 100644
--- a/src/main/java/com/rarchives/ripme/utils/Utils.java
+++ b/src/main/java/com/rarchives/ripme/utils/Utils.java
@@ -398,11 +398,11 @@ public class Utils {
         }
 
         // At last, check if the File with the original exists
-        File f = new File(original);
+        File f = new File(lowerCaseOriginal);
         if(f.exists()) {
-            return original;
-        } else {
             return lowerCaseOriginal;
+        } else {
+            return original;
         }
     }
 

From d515ffd9b47d05d59d8b012494af211a8f29c0da Mon Sep 17 00:00:00 2001
From: mszkb <martin.szalay.kb@gmail.com>
Date: Sat, 20 Jan 2018 18:50:49 +0100
Subject: [PATCH 18/35] Checking directories and its lowercase names

---
 .../java/com/rarchives/ripme/utils/Utils.java | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java
index 6418a164..9517c528 100644
--- a/src/main/java/com/rarchives/ripme/utils/Utils.java
+++ b/src/main/java/com/rarchives/ripme/utils/Utils.java
@@ -8,11 +8,7 @@ import java.lang.reflect.Constructor;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
@@ -388,22 +384,20 @@ public class Utils {
 
         String original = path;                                         // needs to be checked if lowercase exists
         String lastPart = original.substring(index+1).toLowerCase();    // setting lowercase to check if it exists
-        String lowerCaseOriginal = path.substring(0, index)
-                + File.separator
-                + lastPart;
 
-        if(original.equals(lowerCaseOriginal)) {
-            // same name, nothing to do
-            return original;
+        // Get a List of all Directories and check its lowercase
+        // if file exists return it
+        File f = new File(path.substring(0, index));
+        ArrayList<String> names = new ArrayList<String>(Arrays.asList(f.list()));
+
+        for (String s : names) {
+            if(s.toLowerCase().equals(lastPart)) {
+                // Building Path of existing file
+                return path.substring(0, index) + File.separator + s;
+            }
         }
 
-        // At last, check if the File with the original exists
-        File f = new File(lowerCaseOriginal);
-        if(f.exists()) {
-            return lowerCaseOriginal;
-        } else {
-            return original;
-        }
+        return original;
     }
 
     public static String bytesToHumanReadable(int bytes) {

From 52099926ccc9c962fac5634d5f0743d1f219ea4d Mon Sep 17 00:00:00 2001
From: rephormat <>
Date: Wed, 7 Feb 2018 13:59:37 -0600
Subject: [PATCH 19/35] Fix regex and skip quality with upsell designation.

---
 .../rarchives/ripme/ripper/rippers/video/PornhubRipper.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java
index 88207123..ea98bcfd 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java
@@ -28,7 +28,7 @@ public class PornhubRipper extends VideoRipper {
 
     @Override
     public boolean canRip(URL url) {
-        Pattern p = Pattern.compile("^https?://[wm.]*pornhub\\.com/view_video.php\\?viewkey=[0-9]+.*$");
+        Pattern p = Pattern.compile("^https?://[wm.]*pornhub\\.com/view_video.php\\?viewkey=[a-z0-9]+$");
         Matcher m = p.matcher(url.toExternalForm());
         return m.matches();
     }
@@ -40,7 +40,7 @@ public class PornhubRipper extends VideoRipper {
 
     @Override
     public String getGID(URL url) throws MalformedURLException {
-        Pattern p = Pattern.compile("^https?://[wm.]*pornhub\\.com/view_video.php\\?viewkey=([0-9]+).*$");
+        Pattern p = Pattern.compile("^https?://[wm.]*pornhub\\.com/view_video.php\\?viewkey=([a-z0-9]+)$");
         Matcher m = p.matcher(url.toExternalForm());
         if (m.matches()) {
             return m.group(1);
@@ -69,7 +69,7 @@ public class PornhubRipper extends VideoRipper {
 
                 vidUrl = null;
                 for (String quality : new String[] {"1080", "720", "480", "240"}) {
-                    Pattern pv = Pattern.compile("\"quality\":\"" + quality + "\",\"videoUrl\":\"(.*?)\"");
+                    Pattern pv = Pattern.compile("\"format\":\"\",\"quality\":\"" + quality + "\",\"videoUrl\":\"(.*?)\"");
                     Matcher mv = pv.matcher(html);
                     if (mv.find()) {
                         vidUrl = mv.group(1).replace("\\/", "/");

From 2facf680597822c4dd5e26187ad45acb47fd9767 Mon Sep 17 00:00:00 2001
From: rephormat <>
Date: Wed, 7 Feb 2018 14:02:34 -0600
Subject: [PATCH 20/35] Add new Pornhub video test.

---
 .../rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
index 5883e20f..ae31192b 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VideoRippersTest.java
@@ -68,7 +68,7 @@ public class VideoRippersTest extends RippersTest {
 
     public void testPornhubRipper() throws IOException {
         List<URL> contentURLs = new ArrayList<>();
-        contentURLs.add(new URL("http://www.pornhub.com/view_video.php?viewkey=993166542"));
+        contentURLs.add(new URL("https://www.pornhub.com/view_video.php?viewkey=ph5a329fa707269"));
         for (URL url : contentURLs) {
             PornhubRipper ripper = new PornhubRipper(url);
             videoTestHelper(ripper);

From d36d3bc31115d3e05c7197687a4cb50fb8b726ae Mon Sep 17 00:00:00 2001
From: rephormat <>
Date: Wed, 7 Feb 2018 16:46:51 -0600
Subject: [PATCH 21/35] Remove ripper and tests for gwarchives.com and
 hushpix.com

---
 .../ripme/ripper/rippers/CheveretoRipper.java          |  2 +-
 .../ripme/tst/ripper/rippers/CheveretoRipperTest.java  | 10 ----------
 2 files changed, 1 insertion(+), 11 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 4b5fb9e6..160febfc 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java
@@ -28,7 +28,7 @@ public class CheveretoRipper extends AbstractHTMLRipper {
         super(url);
     }
 
-    private static List<String> explicit_domains_1 = Arrays.asList("hushpix.com", "tag-fox.com", "gwarchives.com");
+    private static List<String> explicit_domains_1 = Arrays.asList("tag-fox.com");
 
     @Override
     public String getHost() {
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java
index 0c6344ea..4f456b8d 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java
@@ -6,18 +6,8 @@ import java.net.URL;
 import com.rarchives.ripme.ripper.rippers.CheveretoRipper;
 
 public class CheveretoRipperTest extends RippersTest {
-    public void testHushpix() throws IOException {
-        CheveretoRipper ripper = new CheveretoRipper(new URL("https://hushpix.com/album/gKcu"));
-        testRipper(ripper);
-    }
-
     public void testTagFox() throws IOException {
         CheveretoRipper ripper = new CheveretoRipper(new URL("http://tag-fox.com/album/Thjb"));
         testRipper(ripper);
     }
-
-    public void testgwarchives() throws IOException {
-        CheveretoRipper ripper = new CheveretoRipper(new URL("https://gwarchives.com/album/ns4q"));
-        testRipper(ripper);
-    }
 }

From 3ed1ed6afca1a89ee0525f6d840e89a19e9c5f4c Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Thu, 8 Feb 2018 02:04:38 -0500
Subject: [PATCH 22/35] Eigthmuses ripper now uses ASAP ripping

---
 .../ripper/rippers/EightmusesRipper.java      | 56 +++++++++++--------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java
index 59fd63ba..ef0c69cb 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java
@@ -34,10 +34,16 @@ public class EightmusesRipper extends AbstractHTMLRipper {
         super(url);
     }
 
+    @Override
+    public boolean hasASAPRipping() {
+        return true;
+    }
+
     @Override
     public String getHost() {
         return "8muses";
     }
+
     @Override
     public String getDomain() {
         return "8muses.com";
@@ -109,31 +115,9 @@ public class EightmusesRipper extends AbstractHTMLRipper {
                         logger.info("Retrieving " + subUrl);
                         sendUpdate(STATUS.LOADING_RESOURCE, subUrl);
                         Document subPage = Http.url(subUrl).get();
-                        // Get all images in subalbum, add to list.
+                        // If the page below this one has images this line will download them
                         List<String> subalbumImages = getURLsFromPage(subPage);
-                        String albumTitle = subPage.select("meta[name=description]").attr("content");
-                        albumTitle = albumTitle.replace("A huge collection of free porn comics for adults. Read ", "");
-                        albumTitle = albumTitle.replace(" online for free at 8muses.com", "");
-                        albumTitle = albumTitle.replace(" ", "_");
-                        // albumTitle = albumTitle.replace("Sex and Porn Comics", "");
-                        // albumTitle = albumTitle.replace("|", "");
-                        // albumTitle = albumTitle.replace("8muses", "");
-                        // albumTitle = albumTitle.replaceAll("-", "_");
-                        // albumTitle = albumTitle.replaceAll(" ", "_");
-                        // albumTitle = albumTitle.replaceAll("___", "_");
-                        // albumTitle = albumTitle.replaceAll("__", "_");
-                        // // This is here to remove the trailing __ from folder names
-                        // albumTitle = albumTitle.replaceAll("__", "");
                         logger.info("Found " + subalbumImages.size() + " images in subalbum");
-                        int prefix = 1;
-                        for (String image : subalbumImages) {
-                            URL imageUrl = new URL(image);
-                            // urlTitles.put(imageUrl, albumTitle);
-                            addURLToDownload(imageUrl, getPrefix(prefix), albumTitle, this.url.toExternalForm(), cookies);
-                            prefix = prefix + 1;
-                        }
-                        rippingSubalbums = true;
-                        imageURLs.addAll(subalbumImages);
                     } catch (IOException e) {
                         logger.warn("Error while loading subalbum " + subUrl, e);
                     }
@@ -142,6 +126,8 @@ public class EightmusesRipper extends AbstractHTMLRipper {
         }
         else {
             // Page contains images
+            // X is our page index
+            int x = 1;
             for (Element thumb : page.select(".image")) {
                 if (super.isStopped()) break;
                 // Find thumbnail image source
@@ -158,6 +144,11 @@ public class EightmusesRipper extends AbstractHTMLRipper {
                     try {
                         logger.info("Retrieving full-size image location from " + parentHref);
                         image = getFullSizeImage(parentHref);
+                        URL imageUrl = new URL(image);
+                        addURLToDownload(imageUrl, getPrefix(x), getSubdir(page.select("title").text()), this.url.toExternalForm(), cookies);
+                        // X is our page index
+                        x++;
+
                     } catch (IOException e) {
                         logger.error("Failed to get full-size image from " + parentHref);
                         continue;
@@ -182,6 +173,25 @@ public class EightmusesRipper extends AbstractHTMLRipper {
         return "https://www.8muses.com/image/fm/" + imageName;
     }
 
+    private String getTitle(String albumTitle) {
+        albumTitle = albumTitle.replace("A huge collection of free porn comics for adults. Read ", "");
+        albumTitle = albumTitle.replace(" online for free at 8muses.com", "");
+        albumTitle = albumTitle.replace(" ", "_");
+        return albumTitle;
+    }
+
+    private String getSubdir(String rawHref) {
+        logger.info("Raw title: " + rawHref);
+        String title = rawHref;
+        title = title.replaceAll("8muses - Sex and Porn Comics", "");
+        title = title.replaceAll("\t\t", "");
+        title = title.replaceAll("\n", "");
+        title = title.replaceAll("\\| ", "");
+        title = title.replace(" ", "-");
+        logger.info(title);
+        return title;
+    }
+
     @Override
     public void downloadURL(URL url, int index) {
         addURLToDownload(url, getPrefix(index), "", this.url.toExternalForm(), cookies);

From ce972af4cced77d1ec5cb2f1eee1eb198ddcf02b Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Fri, 9 Feb 2018 11:51:52 -0500
Subject: [PATCH 23/35] Removed ripper and tests for imagearn as the site is
 only only returning 403 errors

---
 .../ripme/ripper/rippers/ImagearnRipper.java  | 112 ------------------
 .../ripper/rippers/ImagearnRipperTest.java    |  13 --
 2 files changed, 125 deletions(-)
 delete mode 100644 src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java
 delete mode 100644 src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagearnRipperTest.java

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java
deleted file mode 100644
index 39fdaeba..00000000
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java
+++ /dev/null
@@ -1,112 +0,0 @@
-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 ImagearnRipper extends AbstractHTMLRipper {
-
-    public ImagearnRipper(URL url) throws IOException {
-        super(url);
-    }
-
-    @Override
-    public String getHost() {
-        return "imagearn";
-    }
-    @Override
-    public String getDomain() {
-        return "imagearn.com";
-    }
-
-    @Override
-    public String getGID(URL url) throws MalformedURLException {
-        Pattern p = Pattern.compile("^.*imagearn.com/+gallery.php\\?id=([0-9]+).*$");
-        Matcher m = p.matcher(url.toExternalForm());
-        if (m.matches()) {
-            return m.group(1);
-        }
-        throw new MalformedURLException(
-                "Expected imagearn.com gallery formats: "
-                        + "imagearn.com/gallery.php?id=####..."
-                        + " Got: " + url);
-    }
-
-    public URL sanitizeURL(URL url) throws MalformedURLException {
-        Pattern p = Pattern.compile("^.*imagearn.com/+image.php\\?id=[0-9]+.*$");
-        Matcher m = p.matcher(url.toExternalForm());
-        if (m.matches()) {
-            // URL points to imagearn *image*, not gallery
-            try {
-                url = getGalleryFromImage(url);
-            } catch (Exception e) {
-                logger.error("[!] " + e.getMessage(), e);
-            }
-        }
-        return url;
-    }
-
-    private URL getGalleryFromImage(URL url) throws IOException {
-        Document doc = Http.url(url).get();
-        for (Element link : doc.select("a[href~=^gallery\\.php.*$]")) {
-            logger.info("LINK: " + link.toString());
-            if (link.hasAttr("href")
-                    && link.attr("href").contains("gallery.php")) {
-                url = new URL("http://imagearn.com/" + link.attr("href"));
-                logger.info("[!] Found gallery from given link: " + url);
-                return url;
-            }
-        }
-        throw new IOException("Failed to find gallery at URL " + url);
-    }
-
-    @Override
-    public Document getFirstPage() throws IOException {
-        return Http.url(url).get();
-    }
-
-    @Override
-    public String getAlbumTitle(URL url) throws MalformedURLException {
-        try {
-            Document doc = getFirstPage();
-            String title = doc.select("h3 > strong").first().text(); // profile name
-            return getHost() + "_" + title + "_" + getGID(url);
-        } catch (Exception e) {
-            // Fall back to default album naming convention
-            logger.warn("Failed to get album title from " + url, e);
-        }
-        return super.getAlbumTitle(url);
-    }
-
-    @Override
-    public List<String> getURLsFromPage(Document doc) {
-        List<String> imageURLs = new ArrayList<>();
-        for (Element thumb : doc.select("div#gallery > div > a")) {
-            String imageURL = thumb.attr("href");
-            try {
-                Document imagedoc = new Http("http://imagearn.com/" + imageURL).get();
-                String image = imagedoc.select("a.thickbox").first().attr("href");
-                imageURLs.add(image);
-            } catch (IOException e) {
-                logger.warn("Was unable to download page: " + imageURL);
-            }
-        }
-        return imageURLs;
-    }
-
-    @Override
-    public void downloadURL(URL url, int index) {
-        addURLToDownload(url, getPrefix(index));
-        sleep(1000);
-    }
-}
diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagearnRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagearnRipperTest.java
deleted file mode 100644
index b9710635..00000000
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/ImagearnRipperTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.rarchives.ripme.tst.ripper.rippers;
-
-import java.io.IOException;
-import java.net.URL;
-
-import com.rarchives.ripme.ripper.rippers.ImagearnRipper;
-
-public class ImagearnRipperTest extends RippersTest {
-    public void testImagearnRip() throws IOException {
-        ImagearnRipper ripper = new ImagearnRipper(new URL("http://imagearn.com//gallery.php?id=578682"));
-        testRipper(ripper);
-    }
-}

From c496678874a32fd5df769861491acd002032684b Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Fri, 9 Feb 2018 12:50:44 -0500
Subject: [PATCH 24/35] 1.7.15: Eigthmuses ripper now uses ASAP ripping; Remove
 ripper and tests for gwarchives.com and hushpix.com; Remove ripper and tests
 for imagearn.com; Fixed pornhub video downloader

---
 pom.xml                                               | 2 +-
 ripme.json                                            | 3 ++-
 src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3899ee5f..c65ace28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.14</version>
+  <version>1.7.15</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>
diff --git a/ripme.json b/ripme.json
index ee7c9499..e4246111 100644
--- a/ripme.json
+++ b/ripme.json
@@ -1,6 +1,7 @@
 {
-    "latestVersion": "1.7.14",
+    "latestVersion": "1.7.15",
     "changeList": [
+        "1.7.15: Eigthmuses ripper now uses ASAP ripping; Remove ripper and tests for gwarchives.com and hushpix.com; Remove ripper and tests for imagearn.com; Fixed pornhub video downloader",
         "1.7.14: Tumblr API Key Choosing Fix; Make webtoons ripper download maximum quality images; Added twitch ripper; Added VSCO ripper; Fixed pornhub video ripper",
         "1.7.13: disabled FuskatorRipperTest; Fixes xhamster.com video ripper; Add yuvutu.com ripper",
         "1.7.12: Instagram ripper no longer 403s on certain images",
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index 83185be1..81556581 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
 public class UpdateUtils {
 
     private static final Logger logger = Logger.getLogger(UpdateUtils.class);
-    private static final String DEFAULT_VERSION = "1.7.14";
+    private static final String DEFAULT_VERSION = "1.7.15";
     private static final String REPO_NAME = "ripmeapp/ripme";
     private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
     private static final String mainFileName = "ripme.jar";

From 9afa1a93161d9f3b5bfbd40167a9fd4244acc358 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sat, 10 Feb 2018 02:36:28 -0500
Subject: [PATCH 25/35] 8Muses ripper now supports ripping from pages
 containing both images and subalbums

---
 .../ripper/rippers/EightmusesRipper.java      | 74 +++++++------------
 1 file changed, 27 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java
index ef0c69cb..b7b5658f 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java
@@ -88,47 +88,26 @@ public class EightmusesRipper extends AbstractHTMLRipper {
     @Override
     public List<String> getURLsFromPage(Document page) {
         List<String> imageURLs = new ArrayList<>();
-        // get the first image link on the page and check if the last char in it is a number
-        // if it is a number then we're ripping a comic if not it's a subalbum
-        String firstImageLink = page.select("div.gallery > a.t-hover").first().attr("href");
-        Pattern p = Pattern.compile("/comix/picture/([a-zA-Z0-9\\-_/]*/)?\\d+");
-        Matcher m = p.matcher(firstImageLink);
-        if (!m.matches()) {
-            logger.info("Ripping subalbums");
-            // Page contains subalbums (not images)
-            Elements albumElements = page.select("div.gallery > a.t-hover");
-            List<Element> albumsList = albumElements.subList(0, albumElements.size());
-            Collections.reverse(albumsList);
-            // Iterate over elements in reverse order
-            for (Element subalbum : albumsList) {
-                String subUrl = subalbum.attr("href");
-                // This if is to skip ads which don't have a href
-                if (subUrl != "") {
-                    subUrl = subUrl.replaceAll("\\.\\./", "");
-                    if (subUrl.startsWith("//")) {
-                        subUrl = "https:";
-                    }
-                    else if (!subUrl.startsWith("http://")) {
-                        subUrl = "https://www.8muses.com" + subUrl;
-                    }
-                    try {
-                        logger.info("Retrieving " + subUrl);
-                        sendUpdate(STATUS.LOADING_RESOURCE, subUrl);
-                        Document subPage = Http.url(subUrl).get();
-                        // If the page below this one has images this line will download them
-                        List<String> subalbumImages = getURLsFromPage(subPage);
-                        logger.info("Found " + subalbumImages.size() + " images in subalbum");
-                    } catch (IOException e) {
-                        logger.warn("Error while loading subalbum " + subUrl, e);
-                    }
+        int x = 1;
+        // This contains the thumbnails of all images on the page
+        Elements pageImages = page.getElementsByClass("c-tile");
+        for (Element thumb : pageImages) {
+            // If true this link is a sub album
+            if (thumb.attr("href").contains("/comix/album/")) {
+                String subUrl = "https://www.8muses.com" + thumb.attr("href");
+                try {
+                    logger.info("Retrieving " + subUrl);
+                    sendUpdate(STATUS.LOADING_RESOURCE, subUrl);
+                    Document subPage = Http.url(subUrl).get();
+                    // If the page below this one has images this line will download them
+                    List<String> subalbumImages = getURLsFromPage(subPage);
+                    logger.info("Found " + subalbumImages.size() + " images in subalbum");
+                } catch (IOException e) {
+                    logger.warn("Error while loading subalbum " + subUrl, e);
                 }
-            }
-        }
-        else {
-            // Page contains images
-            // X is our page index
-            int x = 1;
-            for (Element thumb : page.select(".image")) {
+
+            } else if (thumb.attr("href").contains("/comix/picture/")) {
+                logger.info("Ripping image");
                 if (super.isStopped()) break;
                 // Find thumbnail image source
                 String image = null;
@@ -136,21 +115,21 @@ public class EightmusesRipper extends AbstractHTMLRipper {
                     image = thumb.attr("data-cfsrc");
                 }
                 else {
-                    String parentHref = thumb.parent().attr("href");
-                    if (parentHref.equals("")) continue;
-                    if (parentHref.startsWith("/")) {
-                        parentHref = "https://www.8muses.com" + parentHref;
+                    String imageHref = thumb.attr("href");
+                    if (imageHref.equals("")) continue;
+                    if (imageHref.startsWith("/")) {
+                        imageHref = "https://www.8muses.com" + imageHref;
                     }
                     try {
-                        logger.info("Retrieving full-size image location from " + parentHref);
-                        image = getFullSizeImage(parentHref);
+                        logger.info("Retrieving full-size image location from " + imageHref);
+                        image = getFullSizeImage(imageHref);
                         URL imageUrl = new URL(image);
                         addURLToDownload(imageUrl, getPrefix(x), getSubdir(page.select("title").text()), this.url.toExternalForm(), cookies);
                         // X is our page index
                         x++;
 
                     } catch (IOException e) {
-                        logger.error("Failed to get full-size image from " + parentHref);
+                        logger.error("Failed to get full-size image from " + imageHref);
                         continue;
                     }
                 }
@@ -161,6 +140,7 @@ public class EightmusesRipper extends AbstractHTMLRipper {
                 imageURLs.add(image);
                 if (isThisATest()) break;
             }
+
         }
         return imageURLs;
     }

From b914e486d9cf73cb4df7c6f6630dccc90aed2fbe Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sat, 10 Feb 2018 02:36:42 -0500
Subject: [PATCH 26/35] Added new tests

---
 .../ripme/tst/ripper/rippers/EightmusesRipperTest.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java
index 068f9a81..469c330a 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/EightmusesRipperTest.java
@@ -7,7 +7,11 @@ import com.rarchives.ripme.ripper.rippers.EightmusesRipper;
 
 public class EightmusesRipperTest extends RippersTest {
     public void testEightmusesAlbum() throws IOException {
-        EightmusesRipper ripper = new EightmusesRipper(new URL("https://www.8muses.com/album/jab-comics/a-model-life"));
+        // A simple image album
+        EightmusesRipper ripper = new EightmusesRipper(new URL("https://www.8muses.com/comix/album/Affect3D-Comics/TheDude3DX/Lust-Unleashed-The-Urge-To-Explore"));
+        testRipper(ripper);
+        // Test pages with subalbums
+        ripper = new EightmusesRipper(new URL("https://www.8muses.com/comix/album/Blacknwhitecomics_com-Comix/BlacknWhiteComics/The-Mayor"));
         testRipper(ripper);
     }
-}
+}
\ No newline at end of file

From ffc004beae6cdec7b3bc2c69e1463476403dc1d6 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sat, 10 Feb 2018 03:38:50 -0500
Subject: [PATCH 27/35] 1.7.16: Eightmuses now supports pages containing both
 images and subpages

---
 pom.xml                                               | 2 +-
 ripme.json                                            | 3 ++-
 src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c65ace28..0a17175b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.15</version>
+  <version>1.7.16</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>
diff --git a/ripme.json b/ripme.json
index e4246111..3d343b62 100644
--- a/ripme.json
+++ b/ripme.json
@@ -1,6 +1,7 @@
 {
-    "latestVersion": "1.7.15",
+    "latestVersion": "1.7.16",
     "changeList": [
+        "1.7.16: Eightmuses now supports pages containing both images and subpages",
         "1.7.15: Eigthmuses ripper now uses ASAP ripping; Remove ripper and tests for gwarchives.com and hushpix.com; Remove ripper and tests for imagearn.com; Fixed pornhub video downloader",
         "1.7.14: Tumblr API Key Choosing Fix; Make webtoons ripper download maximum quality images; Added twitch ripper; Added VSCO ripper; Fixed pornhub video ripper",
         "1.7.13: disabled FuskatorRipperTest; Fixes xhamster.com video ripper; Add yuvutu.com ripper",
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index 81556581..883c9afa 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
 public class UpdateUtils {
 
     private static final Logger logger = Logger.getLogger(UpdateUtils.class);
-    private static final String DEFAULT_VERSION = "1.7.15";
+    private static final String DEFAULT_VERSION = "1.7.16";
     private static final String REPO_NAME = "ripmeapp/ripme";
     private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
     private static final String mainFileName = "ripme.jar";

From 13a73d586507191e91330028e2a99d056fc6e84f Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sat, 10 Feb 2018 11:05:17 -0500
Subject: [PATCH 28/35] Ripme now supports clipboard ripping for .cafe domains

---
 src/main/java/com/rarchives/ripme/ui/ClipboardUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/rarchives/ripme/ui/ClipboardUtils.java b/src/main/java/com/rarchives/ripme/ui/ClipboardUtils.java
index 34915146..24c46cd4 100644
--- a/src/main/java/com/rarchives/ripme/ui/ClipboardUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/ClipboardUtils.java
@@ -57,10 +57,11 @@ class AutoripThread extends Thread {
                 String clipboard = ClipboardUtils.getClipboardString();
                 if (clipboard != null) {
                     Pattern p = Pattern.compile(
+                            // TODO: This regex is a monster and doesn't match all links; It needs to be rewritten
                             "\\b(((ht|f)tp(s?)://|~/|/)|www.)" +
                             "(\\w+:\\w+@)?(([-\\w]+\\.)+(com|org|net|gov" +
                             "|mil|biz|info|mobi|name|aero|jobs|museum" +
-                            "|travel|[a-z]{2}))(:[\\d]{1,5})?" +
+                            "|travel|cafe|[a-z]{2}))(:[\\d]{1,5})?" +
                             "(((/([-\\w~!$+|.,=]|%[a-f\\d]{2})+)+|/)+|\\?|#)?" +
                             "((\\?([-\\w~!$+|.,*:]|%[a-f\\d{2}])+=?" +
                             "([-\\w~!$+|.,*:=]|%[a-f\\d]{2})*)" +

From a7a4e727fa2bb4a5d9f195464ebc2b13d805e857 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sat, 10 Feb 2018 12:30:57 -0500
Subject: [PATCH 29/35] 1.7.17: Fixed hentai.cafe autorip from clipboard

---
 pom.xml                                               | 2 +-
 ripme.json                                            | 3 ++-
 src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a17175b..2347cae5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.16</version>
+  <version>1.7.17</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>
diff --git a/ripme.json b/ripme.json
index 3d343b62..0fbd854b 100644
--- a/ripme.json
+++ b/ripme.json
@@ -1,6 +1,7 @@
 {
-    "latestVersion": "1.7.16",
+    "latestVersion": "1.7.17",
     "changeList": [
+        "1.7.17: Fixed hentai.cafe autorip from clipboard",
         "1.7.16: Eightmuses now supports pages containing both images and subpages",
         "1.7.15: Eigthmuses ripper now uses ASAP ripping; Remove ripper and tests for gwarchives.com and hushpix.com; Remove ripper and tests for imagearn.com; Fixed pornhub video downloader",
         "1.7.14: Tumblr API Key Choosing Fix; Make webtoons ripper download maximum quality images; Added twitch ripper; Added VSCO ripper; Fixed pornhub video ripper",
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index 883c9afa..55918354 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
 public class UpdateUtils {
 
     private static final Logger logger = Logger.getLogger(UpdateUtils.class);
-    private static final String DEFAULT_VERSION = "1.7.16";
+    private static final String DEFAULT_VERSION = "1.7.17";
     private static final String REPO_NAME = "ripmeapp/ripme";
     private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
     private static final String mainFileName = "ripme.jar";

From 678b8108286693e7804d800053e580ae182ab2d2 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sun, 11 Feb 2018 08:24:14 -0500
Subject: [PATCH 30/35] AlbumRipper.java now removes bad chars from file names

---
 .../java/com/rarchives/ripme/ripper/AlbumRipper.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
index 124ef163..c06cb4d3 100644
--- a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
@@ -13,6 +13,7 @@ import com.rarchives.ripme.ui.RipStatusMessage;
 import com.rarchives.ripme.ui.RipStatusMessage.STATUS;
 import com.rarchives.ripme.utils.Utils;
 
+// Should this file even exist? It does the same thing as abstractHTML ripper
 
 /**'
  * For ripping delicious albums off the interwebz.
@@ -50,6 +51,14 @@ public abstract class AlbumRipper extends AbstractRipper {
      * Queues multiple URLs of single images to download from a single Album URL
      */
     public boolean addURLToDownload(URL url, File saveAs, String referrer, Map<String,String> cookies) {
+        // TODO fix this hack
+        // Sanitize the saveAs file
+        String fileName = saveAs.getPath();
+        if (fileName.indexOf('?') >= 0) { fileName = fileName.substring(0, fileName.indexOf('?')); }
+        if (fileName.indexOf('&') >= 0) { fileName = fileName.substring(0, fileName.indexOf('&')); }
+        if (fileName.indexOf(':') >= 0) { fileName = fileName.substring(0, fileName.indexOf(':')); }
+        if (fileName.indexOf('#') >= 0) { fileName = fileName.substring(0, fileName.indexOf('#')); }
+        saveAs = new File(fileName);
         // Only download one file if this is a test.
         if (super.isThisATest() &&
                 (itemsPending.size() > 0 || itemsCompleted.size() > 0 || itemsErrored.size() > 0)) {

From 8e777c5eb0f3f4dcd85bdece200fcddc01a59465 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sun, 11 Feb 2018 09:00:12 -0500
Subject: [PATCH 31/35] 1.7.18: AlbumRipper now removes bad chars from file
 names

---
 pom.xml                                               | 2 +-
 ripme.json                                            | 3 ++-
 src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2347cae5..64040070 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.17</version>
+  <version>1.7.18</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>
diff --git a/ripme.json b/ripme.json
index 0fbd854b..5124d1ff 100644
--- a/ripme.json
+++ b/ripme.json
@@ -1,6 +1,7 @@
 {
-    "latestVersion": "1.7.17",
+    "latestVersion": "1.7.18",
     "changeList": [
+        "1.7.18: AlbumRipper now removes bad chars from file names",
         "1.7.17: Fixed hentai.cafe autorip from clipboard",
         "1.7.16: Eightmuses now supports pages containing both images and subpages",
         "1.7.15: Eigthmuses ripper now uses ASAP ripping; Remove ripper and tests for gwarchives.com and hushpix.com; Remove ripper and tests for imagearn.com; Fixed pornhub video downloader",
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index 55918354..597a2c85 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
 public class UpdateUtils {
 
     private static final Logger logger = Logger.getLogger(UpdateUtils.class);
-    private static final String DEFAULT_VERSION = "1.7.17";
+    private static final String DEFAULT_VERSION = "1.7.18";
     private static final String REPO_NAME = "ripmeapp/ripme";
     private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
     private static final String mainFileName = "ripme.jar";

From 639a0353a68ab609c69b5f73dfb17a8f15d938fb Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sun, 11 Feb 2018 10:01:21 -0500
Subject: [PATCH 32/35] Undid saveAs sanitation in album ripper

---
 src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
index c06cb4d3..1726343a 100644
--- a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
@@ -51,14 +51,6 @@ public abstract class AlbumRipper extends AbstractRipper {
      * Queues multiple URLs of single images to download from a single Album URL
      */
     public boolean addURLToDownload(URL url, File saveAs, String referrer, Map<String,String> cookies) {
-        // TODO fix this hack
-        // Sanitize the saveAs file
-        String fileName = saveAs.getPath();
-        if (fileName.indexOf('?') >= 0) { fileName = fileName.substring(0, fileName.indexOf('?')); }
-        if (fileName.indexOf('&') >= 0) { fileName = fileName.substring(0, fileName.indexOf('&')); }
-        if (fileName.indexOf(':') >= 0) { fileName = fileName.substring(0, fileName.indexOf(':')); }
-        if (fileName.indexOf('#') >= 0) { fileName = fileName.substring(0, fileName.indexOf('#')); }
-        saveAs = new File(fileName);
         // Only download one file if this is a test.
         if (super.isThisATest() &&
                 (itemsPending.size() > 0 || itemsCompleted.size() > 0 || itemsErrored.size() > 0)) {

From 8a4e26474cc76e44777ebc534ef2695e422c3f24 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sun, 11 Feb 2018 10:04:29 -0500
Subject: [PATCH 33/35] imgurRipper no longer tries to add ?1 to file names

---
 .../java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java
index 7c271442..b595d9e2 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java
@@ -213,6 +213,7 @@ public class ImgurRipper extends AlbumRipper {
                 saveAs += String.format("%03d_", index);
             }
             saveAs += imgurImage.getSaveAs();
+            saveAs = saveAs.replaceAll("\\?\\d", "");
             addURLToDownload(imgurImage.url, new File(saveAs));
         }
     }

From 34ad64e552f2dcc9e6f73327774c6244ec6c5231 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sun, 11 Feb 2018 10:13:00 -0500
Subject: [PATCH 34/35] Fixed motherless test

---
 .../ripme/tst/ripper/rippers/MotherlessRipperTest.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MotherlessRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MotherlessRipperTest.java
index 6b00f170..44caa03b 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MotherlessRipperTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MotherlessRipperTest.java
@@ -8,7 +8,7 @@ import com.rarchives.ripme.ripper.rippers.MotherlessRipper;
 public class MotherlessRipperTest extends RippersTest {
     // https://github.com/RipMeApp/ripme/issues/238 - MotherlessRipperTest is flaky on Travis CI
     public void testMotherlessAlbumRip() throws IOException {
-        MotherlessRipper ripper = new MotherlessRipper(new URL("http://motherless.com/G4DAA18D"));
+        MotherlessRipper ripper = new MotherlessRipper(new URL("http://motherless.com/G1E5C971"));
         testRipper(ripper);
     }
 }

From 444df23e5ac22bb0c5184a163602801e425346c5 Mon Sep 17 00:00:00 2001
From: cyian-1756 <devnull64@vfemail.net>
Date: Sun, 11 Feb 2018 10:25:40 -0500
Subject: [PATCH 35/35] 1.7.19: imgurRipper no longer tries to add ?1 to file
 names

---
 pom.xml                                               | 2 +-
 ripme.json                                            | 3 ++-
 src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64040070..476068b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.7.18</version>
+  <version>1.7.19</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>
diff --git a/ripme.json b/ripme.json
index 5124d1ff..de0dc0a6 100644
--- a/ripme.json
+++ b/ripme.json
@@ -1,6 +1,7 @@
 {
-    "latestVersion": "1.7.18",
+    "latestVersion": "1.7.19",
     "changeList": [
+        "1.7.19: imgurRipper no longer tries to add ?1 to file names",
         "1.7.18: AlbumRipper now removes bad chars from file names",
         "1.7.17: Fixed hentai.cafe autorip from clipboard",
         "1.7.16: Eightmuses now supports pages containing both images and subpages",
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index 597a2c85..37ce6cfe 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
 public class UpdateUtils {
 
     private static final Logger logger = Logger.getLogger(UpdateUtils.class);
-    private static final String DEFAULT_VERSION = "1.7.18";
+    private static final String DEFAULT_VERSION = "1.7.19";
     private static final String REPO_NAME = "ripmeapp/ripme";
     private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
     private static final String mainFileName = "ripme.jar";