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

Merge pull request #58 from rephormat/hotfix/xhamster-videos-subdir

Browse Source 
Fixes RipMeApp/ripme#57
This commit is contained in:
cyian-1756 2017-10-26 10:30:56 -04:00 committed by GitHub
commit d93aaf8652
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ public class XhamsterRipper extends VideoRipper {
@Override @Override
public boolean canRip(URL url) { public boolean canRip(URL url) {
Pattern p = Pattern.compile("^https?://.*xhamster\\.com/movies/[0-9]+.*$"); Pattern p = Pattern.compile("^https?://.*xhamster\\.com/(movies|videos)/.*$");
Matcher m = p.matcher(url.toExternalForm()); Matcher m = p.matcher(url.toExternalForm());
return m.matches(); return m.matches();
} }
@ -39,7 +39,7 @@ public class XhamsterRipper extends VideoRipper {
@Override @Override
public String getGID(URL url) throws MalformedURLException { public String getGID(URL url) throws MalformedURLException {
Pattern p = Pattern.compile("^https?://.*xhamster\\.com/movies/([0-9]+).*$"); Pattern p = Pattern.compile("^https?://.*xhamster\\.com/(movies|videos)/.*$");
Matcher m = p.matcher(url.toExternalForm()); Matcher m = p.matcher(url.toExternalForm());
if (m.matches()) { if (m.matches()) {
return m.group(1); return m.group(1);
@ -47,7 +47,8 @@ public class XhamsterRipper extends VideoRipper {
throw new MalformedURLException( throw new MalformedURLException(
"Expected xhamster format:" "Expected xhamster format:"
+ "xhamster.com/movies/####" + "xhamster.com/movies/#### or"
+ "xhamster.com/videos/####"
+ " Got: " + url); + " Got: " + url);
} }
@ -63,4 +64,4 @@ public class XhamsterRipper extends VideoRipper {
addURLToDownload(new URL(vidUrl), HOST + "_" + getGID(this.url)); addURLToDownload(new URL(vidUrl), HOST + "_" + getGID(this.url));
waitForThreads(); waitForThreads();
} }
} }