Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added support for video downloading

Browse Source
This commit is contained in:
cyian-1756 2018-10-02 06:40:03 -04:00
parent 7e890bce2f
commit 2eadcd675e
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java
View File

@ -43,6 +43,9 @@ public class XhamsterRipper extends AbstractHTMLRipper {
URLToReturn = URLToReturn.replaceAll("\\w\\w.xhamster.com", "xhamster.com"); URLToReturn = URLToReturn.replaceAll("\\w\\w.xhamster.com", "xhamster.com");
URL san_url = new URL(URLToReturn.replaceAll("xhamster.com", "m.xhamster.com")); URL san_url = new URL(URLToReturn.replaceAll("xhamster.com", "m.xhamster.com"));
LOGGER.info("sanitized URL is " + san_url.toExternalForm()); LOGGER.info("sanitized URL is " + san_url.toExternalForm());
if (isVideoUrl(url)) {
return url;
}
return san_url; return san_url;
} }
@ -58,6 +61,12 @@ public class XhamsterRipper extends AbstractHTMLRipper {
if (m.matches()) { if (m.matches()) {
return "user_" + m.group(1); return "user_" + m.group(1);
} }
p = Pattern.compile("^https?://.*xhamster\\.com/(movies|videos)/(.*)$");
m = p.matcher(url.toExternalForm());
if (m.matches()) {
return m.group(2);
}
throw new MalformedURLException( throw new MalformedURLException(
"Expected xhamster.com gallery formats: " "Expected xhamster.com gallery formats: "
+ "xhamster.com/photos/gallery/xxxxx-#####" + "xhamster.com/photos/gallery/xxxxx-#####"
@ -108,9 +117,20 @@ public class XhamsterRipper extends AbstractHTMLRipper {
if (m.matches()) { if (m.matches()) {
return true; return true;
} }
p = Pattern.compile("^https?://.*xhamster\\.com/(movies|videos)/.*$");
m = p.matcher(url.toExternalForm());
if (m.matches()) {
return true;
}
return false; return false;
} }
private boolean isVideoUrl(URL url) {
Pattern p = Pattern.compile("^https?://.*xhamster\\.com/(movies|videos)/.*$");
Matcher m = p.matcher(url.toExternalForm());
return m.matches();
}
@Override @Override
public Document getNextPage(Document doc) throws IOException { public Document getNextPage(Document doc) throws IOException {
if (doc.select("a[data-page=next]").first() != null) { if (doc.select("a[data-page=next]").first() != null) {
@ -125,6 +145,7 @@ public class XhamsterRipper extends AbstractHTMLRipper {
@Override @Override
public List<String> getURLsFromPage(Document doc) { public List<String> getURLsFromPage(Document doc) {
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
if (!isVideoUrl(url)) {
for (Element thumb : doc.select("div.picture_view > div.pictures_block > div.items > div.item-container > a > div.thumb_container > div.img > img")) { for (Element thumb : doc.select("div.picture_view > div.pictures_block > div.items > div.item-container > a > div.thumb_container > div.img > img")) {
String image = thumb.attr("src"); String image = thumb.attr("src");
// replace thumbnail urls with the urls to the full sized images // replace thumbnail urls with the urls to the full sized images
@ -139,6 +160,9 @@ public class XhamsterRipper extends AbstractHTMLRipper {
image = image.replaceAll("https", "http"); image = image.replaceAll("https", "http");
result.add(image); result.add(image);
} }
} else {
result.add(doc.select("div.player-container > a").attr("href"));
}
return result; return result;
} }