From 88dc757655c3b235b2fbe8e12b4cf44b9a8c7a14 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Wed, 26 Sep 2018 20:22:26 -0400 Subject: [PATCH] Removed redundant xhamster ripper --- .../ripper/rippers/video/XhamsterRipper.java | 67 ------------------- .../tst/ripper/rippers/VideoRippersTest.java | 11 --- 2 files changed, 78 deletions(-) delete mode 100644 src/main/java/com/rarchives/ripme/ripper/rippers/video/XhamsterRipper.java 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 deleted file mode 100644 index 9043bfeb..00000000 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/XhamsterRipper.java +++ /dev/null @@ -1,67 +0,0 @@ -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.select.Elements; - -import com.rarchives.ripme.ripper.VideoRipper; -import com.rarchives.ripme.utils.Http; - -public class XhamsterRipper extends VideoRipper { - - private static final String HOST = "xhamster"; - - public XhamsterRipper(URL url) throws IOException { - super(url); - } - - @Override - public String getHost() { - return HOST; - } - - @Override - public boolean canRip(URL url) { - Pattern p = Pattern.compile("^https?://.*xhamster\\.com/(movies|videos)/.*$"); - 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?://.*xhamster\\.com/(movies|videos)/(.*)$"); - Matcher m = p.matcher(url.toExternalForm()); - if (m.matches()) { - return m.group(2); - } - - throw new MalformedURLException( - "Expected xhamster format:" - + "xhamster.com/movies/#### or" - + "xhamster.com/videos/####" - + " Got: " + url); - } - - @Override - public void rip() throws IOException { - LOGGER.info("Retrieving " + this.url); - Document doc = Http.url(url).get(); - Elements videos = doc.select("div.player-container > a"); - if (videos.isEmpty()) { - throw new IOException("Could not find Embed code at " + url); - } - String vidUrl = videos.attr("href"); - addURLToDownload(new URL(vidUrl), HOST + "_" + getGID(this.url)); - waitForThreads(); - } -} 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 02696755..c232a81e 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,8 +7,6 @@ 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.XhamsterRipper; -import com.rarchives.ripme.ripper.rippers.XvideosRipper; import com.rarchives.ripme.ripper.rippers.video.YoupornRipper; import com.rarchives.ripme.ripper.rippers.video.YuvutuRipper; @@ -48,15 +46,6 @@ public class VideoRippersTest extends RippersTest { // } // } - public void testXhamsterRipper() throws IOException { - List 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 testPornhubRipper() throws IOException { List contentURLs = new ArrayList<>(); contentURLs.add(new URL("https://www.pornhub.com/view_video.php?viewkey=ph5a329fa707269"));