Merge branch 'master' into Twitch-ripper

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>

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",

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));
+    }
+}

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);
         }

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();
+    }
+}

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";

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;
+// Disabled because of https://github.com/RipMeApp/ripme/issues/393
-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);
-    }
-}

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

@@ -9,8 +9,10 @@ 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.XhamsterRipper;
 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 {
 
@@ -45,6 +47,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"));
@@ -87,5 +98,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);
+        }
+    }
 
 }

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);
+    }
+}