From d18cd5df2ec6fb6de59042cc2f510ba99799fece Mon Sep 17 00:00:00 2001 From: rephormat Date: Tue, 14 May 2019 13:23:08 -0500 Subject: [PATCH] Fixes #1276 Fixes issue with page number in photos URL. --- .../rarchives/ripme/ripper/rippers/XhamsterRipper.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java index d825a3cf..5f524128 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java @@ -63,7 +63,7 @@ public class XhamsterRipper extends AbstractHTMLRipper { if (m.matches()) { 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()); if (m.matches()) { return "user_" + m.group(1); @@ -98,7 +98,7 @@ public class XhamsterRipper extends AbstractHTMLRipper { @Override 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()); LOGGER.info("Checking if page has albums"); LOGGER.info(m.matches()); @@ -119,7 +119,7 @@ public class XhamsterRipper extends AbstractHTMLRipper { if (m.matches()) { 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()); if (m.matches()) { return true; @@ -202,4 +202,4 @@ public class XhamsterRipper extends AbstractHTMLRipper { } return super.getAlbumTitle(url); } -} \ No newline at end of file +}