1
0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-19 12:11:40 +02:00

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

Fixes RipMeApp/ripme#57
This commit is contained in:
cyian-1756
2017-10-26 10:30:56 -04:00
committed by GitHub

View File

@@ -27,7 +27,7 @@ public class XhamsterRipper extends VideoRipper {
@Override
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());
return m.matches();
}
@@ -39,7 +39,7 @@ public class XhamsterRipper extends VideoRipper {
@Override
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());
if (m.matches()) {
return m.group(1);
@@ -47,7 +47,8 @@ public class XhamsterRipper extends VideoRipper {
throw new MalformedURLException(
"Expected xhamster format:"
+ "xhamster.com/movies/####"
+ "xhamster.com/movies/#### or"
+ "xhamster.com/videos/####"
+ " Got: " + url);
}
@@ -63,4 +64,4 @@ public class XhamsterRipper extends VideoRipper {
addURLToDownload(new URL(vidUrl), HOST + "_" + getGID(this.url));
waitForThreads();
}
}
}