mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-14 18:04:05 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1311 from rephormat/patch-1

Browse Source 
Fixes #1276
This commit is contained in:
cyian-1756
2019-05-22 16:00:50 -05:00
committed by GitHub
parent 10203cdadb d18cd5df2e
commit 3cf7a270de
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ public class XhamsterRipper extends AbstractHTMLRipper {
if (m.matches()) { if (m.matches()) {
return m.group(1); return m.group(1);
} }
p = Pattern.compile("^https?://[\\w\\w.]*xhamster\\.com/users/([a-zA-Z0-9_-]+)/photos"); p = Pattern.compile("^https?://[\\w\\w.]*xhamster\\.com/users/([a-zA-Z0-9_-]+)/photos(/\\d+)?");
m = p.matcher(url.toExternalForm()); m = p.matcher(url.toExternalForm());
if (m.matches()) { if (m.matches()) {
return "user_" + m.group(1); return "user_" + m.group(1);
@@ -98,7 +98,7 @@ public class XhamsterRipper extends AbstractHTMLRipper {
@Override @Override
public boolean pageContainsAlbums(URL url) { public boolean pageContainsAlbums(URL url) {
Pattern p = Pattern.compile("^https?://[\\w\\w.]*xhamster\\.com/users/([a-zA-Z0-9_-]+)/photos"); Pattern p = Pattern.compile("^https?://[\\w\\w.]*xhamster\\.com/users/([a-zA-Z0-9_-]+)/photos(/\\d+)?");
Matcher m = p.matcher(url.toExternalForm()); Matcher m = p.matcher(url.toExternalForm());
LOGGER.info("Checking if page has albums"); LOGGER.info("Checking if page has albums");
LOGGER.info(m.matches()); LOGGER.info(m.matches());
@@ -119,7 +119,7 @@ public class XhamsterRipper extends AbstractHTMLRipper {
if (m.matches()) { if (m.matches()) {
return true; return true;
} }
p = Pattern.compile("^https?://[\\w\\w.]*xhamster\\.(com|one)/users/([a-zA-Z0-9_-]+)/photos"); p = Pattern.compile("^https?://[\\w\\w.]*xhamster\\.(com|one)/users/([a-zA-Z0-9_-]+)/photos(/\\d+)?");
m = p.matcher(url.toExternalForm()); m = p.matcher(url.toExternalForm());
if (m.matches()) { if (m.matches()) {
return true; return true;
@@ -202,4 +202,4 @@ public class XhamsterRipper extends AbstractHTMLRipper {
} }
return super.getAlbumTitle(url); return super.getAlbumTitle(url);
} }
} }