From 0a0b6d299a334c2027c0d13697f42b98024ee6ba Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 29 Jul 2018 10:37:15 -0400 Subject: [PATCH 1/2] Added kenzato.uk to CheveretoRippers --- .../ripme/ripper/rippers/CheveretoRipper.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java index cb0b765f..005ba5c7 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java @@ -28,7 +28,7 @@ public class CheveretoRipper extends AbstractHTMLRipper { super(url); } - private static List explicit_domains_1 = Arrays.asList("tag-fox.com"); + private static List explicit_domains = Arrays.asList("tag-fox.com", "kenzato.uk"); @Override public String getHost() { @@ -43,12 +43,8 @@ public class CheveretoRipper extends AbstractHTMLRipper { @Override public boolean canRip(URL url) { String url_name = url.toExternalForm(); - if (explicit_domains_1.contains(url_name.split("/")[2])) { - Pattern pa = Pattern.compile("(?:https?://)?(?:www\\.)?[a-z1-9-]*\\.[a-z1-9]*/album/([a-zA-Z1-9]*)/?$"); - Matcher ma = pa.matcher(url.toExternalForm()); - if (ma.matches()) { + if (explicit_domains.contains(url_name.split("/")[2])) { return true; - } } return false; } @@ -70,7 +66,7 @@ public class CheveretoRipper extends AbstractHTMLRipper { @Override public String getGID(URL url) throws MalformedURLException { - Pattern p = Pattern.compile("(?:https?://)?(?:www\\.)?[a-z1-9-]*\\.[a-z1-9]*/album/([a-zA-Z1-9]*)/?$"); + Pattern p = Pattern.compile("(?:https?://)?(?:www\\.)?[a-z1-9-]*\\.[a-z1-9]*(?:[a-zA-Z1-9]*)/album/([a-zA-Z1-9]*)/?$"); Matcher m = p.matcher(url.toExternalForm()); if (m.matches()) { return m.group(1); From 7196c594535181bc113c0425c9d7b68c87d591cb Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 29 Jul 2018 10:40:22 -0400 Subject: [PATCH 2/2] Added unit test for kenzato.uk --- .../ripme/tst/ripper/rippers/CheveretoRipperTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java index 4f456b8d..6fd20060 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/CheveretoRipperTest.java @@ -10,4 +10,9 @@ public class CheveretoRipperTest extends RippersTest { CheveretoRipper ripper = new CheveretoRipper(new URL("http://tag-fox.com/album/Thjb")); testRipper(ripper); } + + public void testSubdirAlbum() throws IOException { + CheveretoRipper ripper = new CheveretoRipper(new URL("https://kenzato.uk/booru/album/TnEc")); + testRipper(ripper); + } }