From 65f0f0e562eb9d1c7e93ed167ac82bb043a4dc77 Mon Sep 17 00:00:00 2001 From: soloturn Date: Fri, 29 Dec 2023 12:16:08 +0100 Subject: [PATCH] new URI instead of new URL, E621. --- .../com/rarchives/ripme/ripper/rippers/E621Ripper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java index 13f75f22..1d29a736 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java @@ -10,6 +10,8 @@ import com.rarchives.ripme.ui.RipStatusMessage.STATUS; import java.io.IOException; import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.HashMap; @@ -181,14 +183,14 @@ public class E621Ripper extends AbstractHTMLRipper { } @Override - public URL sanitizeURL(URL url) throws MalformedURLException { + public URL sanitizeURL(URL url) throws MalformedURLException, URISyntaxException { if (gidPattern2 == null) gidPattern2 = Pattern.compile( "^https?://(www\\.)?e621\\.net/post/search\\?tags=([a-zA-Z0-9$_.+!*'():,%-]+)(/.*)?(#.*)?$"); Matcher m = gidPattern2.matcher(url.toExternalForm()); if (m.matches()) - return new URL("https://e621.net/post/index/1/" + m.group(2).replace("+", "%20")); + return new URI("https://e621.net/post/index/1/" + m.group(2).replace("+", "%20")).toURL(); return url; } @@ -208,9 +210,9 @@ public class E621Ripper extends AbstractHTMLRipper { try { String fullSizedImage = getFullSizedImage(url); if (fullSizedImage != null && !fullSizedImage.equals("")) { - addURLToDownload(new URL(fullSizedImage), index); + addURLToDownload(new URI(fullSizedImage).toURL(), index); } - } catch (IOException e) { + } catch (IOException | URISyntaxException e) { logger.error("Unable to get full sized image from " + url); } }