From 69c903c3a628045f27ac3e86bebabb3fdf6fe46b Mon Sep 17 00:00:00 2001 From: metaprime Date: Sat, 19 Apr 2025 23:44:37 -0700 Subject: [PATCH] Update HentaiimageRipper for new URL (Fixes #2122) (#2123) --- .../ripme/ripper/rippers/HentaiimageRipper.java | 16 +++++++--------- .../ripper/rippers/HentaiimageRipperTest.java | 12 +++++------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/HentaiimageRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/HentaiimageRipper.java index 45628e82..b261f847 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/HentaiimageRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/HentaiimageRipper.java @@ -1,10 +1,5 @@ package com.rarchives.ripme.ripper.rippers; -import com.rarchives.ripme.ripper.AbstractHTMLRipper; -import com.rarchives.ripme.utils.Http; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; - import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; @@ -13,10 +8,13 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; + +import com.rarchives.ripme.ripper.AbstractHTMLRipper; +import com.rarchives.ripme.utils.Http; public class HentaiimageRipper extends AbstractHTMLRipper { - - public HentaiimageRipper(URL url) throws IOException { super(url); } @@ -43,13 +41,13 @@ public class HentaiimageRipper extends AbstractHTMLRipper { @Override public String getGID(URL url) throws MalformedURLException { - Pattern p = Pattern.compile("https://(?:\\w\\w\\.)?hentai-(image|comic).com/image/([a-zA-Z0-9_-]+)/?"); + Pattern p = Pattern.compile("https://(?:\\w\\w\\.)?hentai-(image|comic|img-xxx).com/image/([a-zA-Z0-9_-]+)/?"); Matcher m = p.matcher(url.toExternalForm()); if (m.matches()) { return m.group(1); } throw new MalformedURLException("Expected hitomi URL format: " + - "https://hentai-image.com/image/ID - got " + url + " instead"); + "https://hentai-img-xxx.com/image/ID - got " + url + " instead"); } @Override diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentaiimageRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentaiimageRipperTest.java index 7ccc0029..e5a8eeab 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentaiimageRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/HentaiimageRipperTest.java @@ -4,17 +4,15 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import com.rarchives.ripme.ripper.rippers.HentaiimageRipper; -import com.rarchives.ripme.utils.Utils; import org.junit.jupiter.api.Test; +import com.rarchives.ripme.ripper.rippers.HentaiimageRipper; + public class HentaiimageRipperTest extends RippersTest { @Test public void testHentaifoundryRip() throws IOException, URISyntaxException { - if (Utils.getConfigBoolean("test.run_flaky_tests", false)) { - HentaiimageRipper ripper = new HentaiimageRipper(new URI("https://hentai-image.com/image/afrobull-gerudo-ongoing-12/").toURL()); - testRipper(ripper); - } + HentaiimageRipper ripper = new HentaiimageRipper( + new URI("https://hentai-img-xxx.com/image/afrobull-gerudo-ongoing-12/").toURL()); + testRipper(ripper); } } -