From 6fa72d6bf275ba11a005fd757553be35dee7ce4f Mon Sep 17 00:00:00 2001 From: blth Date: Sun, 17 Apr 2016 12:50:40 -0600 Subject: [PATCH 1/3] Create EroShareRipper.java --- .../ripme/ripper/rippers/EroShareRipper.java | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 src/main/java/com/rarchives/ripme/ripper/rippers/EroShareRipper.java diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EroShareRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EroShareRipper.java new file mode 100644 index 00000000..058a368c --- /dev/null +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EroShareRipper.java @@ -0,0 +1,128 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +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.Arrays; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.jsoup.Connection.Response; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; +import org.jsoup.Connection.Method; + +import com.rarchives.ripme.ripper.AbstractHTMLRipper; +import com.rarchives.ripme.ui.RipStatusMessage.STATUS; +import com.rarchives.ripme.utils.Http; + +/** + * + * @author losipher + */ +public class EroShareRipper extends AbstractHTMLRipper { + + public EroShareRipper (URL url) throws IOException { + super(url); + } + + @Override + public String getDomain() { + return "eroshare.com"; + } + + @Override + public String getHost() { + return "eroshare"; + } + + @Override + public void downloadURL(URL url, int index){ + addURLToDownload(url); + } + + @Override + public List getURLsFromPage(Document doc){ + List URLs = new ArrayList(); + //Pictures + Elements imgs = doc.getElementsByTag("img"); + for (Element img : imgs){ + if (img.hasClass("album-image")){ + String imageURL = img.attr("src"); + imageURL = "https:" + imageURL; + URLs.add(imageURL); + } + } + //Videos + Elements vids = doc.getElementsByTag("video"); + for (Element vid : vids){ + if (vid.hasClass("album-video")){ + Elements source = vid.getElementsByTag("source"); + String videoURL = source.first().attr("src"); + URLs.add(videoURL); + } + } + + return URLs; + } + + @Override + public Document getFirstPage() throws IOException { + Response resp = Http.url(this.url) + .ignoreContentType() + .response(); + + Document doc = resp.parse(); + + return doc; + } + + @Override + public String getGID(URL url) throws MalformedURLException { + Pattern p = Pattern.compile("^https?://[w.]*eroshare.com/([a-zA-Z0-9\\-_]+)/?$"); + Matcher m = p.matcher(url.toExternalForm()); + if (m.matches()) { + return m.group(1); + } + throw new MalformedURLException("eroshare album not found in " + url + ", expected https://eroshare.com/album"); + } + + public static List getURLs(URL url) throws IOException{ + + Response resp = Http.url(url) + .ignoreContentType() + .response(); + + Document doc = resp.parse(); + + List URLs = new ArrayList(); + //Pictures + Elements imgs = doc.getElementsByTag("img"); + for (Element img : imgs){ + if (img.hasClass("album-image")){ + String imageURL = img.attr("src"); + imageURL = "https:" + imageURL; + URLs.add(new URL(imageURL)); + } + } + //Videos + Elements vids = doc.getElementsByTag("video"); + for (Element vid : vids){ + if (vid.hasClass("album-video")){ + Elements source = vid.getElementsByTag("source"); + String videoURL = source.first().attr("src"); + URLs.add(new URL(videoURL)); + } + } + + return URLs; + } +} From 2f7e5989a83739a666558a59b1adf862be075553 Mon Sep 17 00:00:00 2001 From: blth Date: Sun, 17 Apr 2016 12:52:57 -0600 Subject: [PATCH 2/3] Update VidbleRipper.java --- .../ripme/ripper/rippers/VidbleRipper.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/VidbleRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/VidbleRipper.java index 9b735ebb..7b0c8bbb 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/VidbleRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/VidbleRipper.java @@ -9,6 +9,7 @@ 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.AbstractHTMLRipper; @@ -56,17 +57,18 @@ public class VidbleRipper extends AbstractHTMLRipper { private static List getURLsFromPageStatic(Document doc) { List imageURLs = new ArrayList(); - Elements els = doc.select("#ContentPlaceHolder1_thumbs"); - String thumbs = els.first().attr("value"); - for (String thumb : thumbs.split(",")) { - if (thumb.trim().equals("") || thumb.contains("reddit.com")) { - continue; + Elements els = doc.select("#ContentPlaceHolder1_divContent"); + Elements imgs = els.select("img"); + for (Element img : imgs) { + String src = img.absUrl("src"); + src = src.replaceAll("_[a-zA-Z]{3,5}", ""); + + if (!src.equals("")) { + imageURLs.add(src); } - thumb = thumb.replaceAll("_[a-zA-Z]{3,5}", ""); - imageURLs.add("http://vidble.com/" + thumb); } return imageURLs; - } + } @Override public void downloadURL(URL url, int index) { @@ -81,4 +83,4 @@ public class VidbleRipper extends AbstractHTMLRipper { } return urls; } -} \ No newline at end of file +} From 1d31903cdc094cab73c81d73c19af467feac96e3 Mon Sep 17 00:00:00 2001 From: blth Date: Sun, 17 Apr 2016 12:55:16 -0600 Subject: [PATCH 3/3] Update RipUtils.java --- .../java/com/rarchives/ripme/utils/RipUtils.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/utils/RipUtils.java b/src/main/java/com/rarchives/ripme/utils/RipUtils.java index f21fb6cd..073d4717 100644 --- a/src/main/java/com/rarchives/ripme/utils/RipUtils.java +++ b/src/main/java/com/rarchives/ripme/utils/RipUtils.java @@ -21,6 +21,8 @@ import com.rarchives.ripme.ripper.rippers.ImgurRipper.ImgurAlbum; import com.rarchives.ripme.ripper.rippers.ImgurRipper.ImgurImage; import com.rarchives.ripme.ripper.rippers.VidbleRipper; import com.rarchives.ripme.ripper.rippers.video.GfycatRipper; +import com.rarchives.ripme.ripper.rippers.EroShareRipper; + public class RipUtils { private static final Logger logger = Logger.getLogger(RipUtils.class); @@ -69,7 +71,7 @@ public class RipUtils { } return result; } - else if (url.toExternalForm().contains("vidble.com/album/")) { + else if (url.toExternalForm().contains("vidble.com/album/") || url.toExternalForm().contains("vidble.com/show/")) { try { logger.info("Getting vidble album " + url); result.addAll(VidbleRipper.getURLsFromPage(url)); @@ -79,6 +81,16 @@ public class RipUtils { } return result; } + else if (url.toExternalForm().contains("eroshare.com")) { + try { + logger.info("Getting eroshare album " + url); + result.addAll(EroShareRipper.getURLs(url)); + } catch (IOException e) { + // Do nothing + logger.warn("Exception while retrieving eroshare page:", e); + } + return result; + } Pattern p = Pattern.compile("https?://i.reddituploads.com/([a-zA-Z0-9]+)\\?.*"); Matcher m = p.matcher(url.toExternalForm());