From 97de669ac2e5a69db51c3b180d8d19571fcfdf26 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Tue, 7 Mar 2017 00:04:28 -0500 Subject: [PATCH] Tweaked regex, added tag-fox.com --- .../com/rarchives/ripme/ripper/rippers/CheveretoRipper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 b021989f..64cd9af7 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/CheveretoRipper.java @@ -22,7 +22,7 @@ public class CheveretoRipper extends AbstractHTMLRipper { super(url); } - public static List explicit_domains_1 = Arrays.asList("hushpix.com"); + public static List explicit_domains_1 = Arrays.asList("hushpix.com", "tag-fox.com"); @Override public String getHost() { String host = url.toExternalForm().split("/")[2]; @@ -39,7 +39,7 @@ public class CheveretoRipper extends AbstractHTMLRipper { public boolean canRip(URL url) { String url_name = url.toExternalForm(); if (explicit_domains_1.contains(url_name.split("/")[2]) == true) { - Pattern pa = Pattern.compile("(?:https?://)?(?:www\\.)?[a-z1-9]*\\.[a-z1-9]*/album/([a-zA-Z1-9]*)/?$"); + 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()) { return true; @@ -50,7 +50,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]*/album/([a-zA-Z1-9]*)/?$"); Matcher m = p.matcher(url.toExternalForm()); if (m.matches()) { return m.group(1);