From 9837f893f12417fe1a3b381d53137442b30abfa3 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Thu, 16 Nov 2017 14:35:40 -0500 Subject: [PATCH] pichunter now supports all album types --- .../rarchives/ripme/ripper/rippers/PichunterRipper.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/PichunterRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/PichunterRipper.java index 70ec151a..06656698 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/PichunterRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/PichunterRipper.java @@ -32,7 +32,7 @@ public class PichunterRipper extends AbstractHTMLRipper { @Override public String getGID(URL url) throws MalformedURLException { - Pattern p = Pattern.compile("https?://www.pichunter.com/(tags|models|sites)/([a-zA-Z0-9_-]+)/?"); + Pattern p = Pattern.compile("https?://www.pichunter.com/(|tags|models|sites)/([a-zA-Z0-9_-]+)/?"); Matcher m = p.matcher(url.toExternalForm()); if (m.matches()) { return m.group(2); @@ -42,6 +42,11 @@ public class PichunterRipper extends AbstractHTMLRipper { if (m.matches()) { return m.group(2); } + p = Pattern.compile("https?://www.pichunter.com/tags/all/([a-zA-Z0-9_-]+)/\\d+/?"); + m = p.matcher(url.toExternalForm()); + if (m.matches()) { + return m.group(1); + } throw new MalformedURLException("Expected pichunter URL format: " + "pichunter.com/(tags|models|sites)/Name/ - got " + url + " instead"); }