From ab17fa9822c15d0d90ec2daa9b368c29f1e30998 Mon Sep 17 00:00:00 2001 From: soloturn Date: Thu, 15 Jun 2023 16:21:33 +0200 Subject: [PATCH] new URL is deprecated, use new URI, AbstractHTML. --- .../java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java | 2 +- .../rarchives/ripme/ripper/rippers/ComicextraRipper.java | 3 ++- .../com/rarchives/ripme/ripper/rippers/EHentaiRipper.java | 6 ++++-- .../com/rarchives/ripme/ripper/rippers/ListalRipper.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java index e5d09b8e..6a944d8e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java @@ -51,7 +51,7 @@ public abstract class AbstractHTMLRipper extends AbstractRipper { return cachedFirstPage; } - public Document getNextPage(Document doc) throws IOException { + public Document getNextPage(Document doc) throws IOException, URISyntaxException { return null; } protected abstract List getURLsFromPage(Document page); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ComicextraRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ComicextraRipper.java index a2e79bc0..3abf749a 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ComicextraRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ComicextraRipper.java @@ -2,6 +2,7 @@ package com.rarchives.ripme.ripper.rippers; import java.io.IOException; import java.net.MalformedURLException; +import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -96,7 +97,7 @@ public class ComicextraRipper extends AbstractHTMLRipper { } @Override - public Document getNextPage(Document doc) throws IOException { + public Document getNextPage(Document doc) throws IOException, URISyntaxException { if (urlType == UrlType.COMIC) { ++chapterIndex; imageIndex = 0; // Resetting the imagesIndex so that images prefix within each chapter starts from '001_'. diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java index 97373e5e..33165c93 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java @@ -13,6 +13,8 @@ import org.jsoup.select.Elements; import java.io.IOException; import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; @@ -154,7 +156,7 @@ public class EHentaiRipper extends AbstractHTMLRipper { } @Override - public Document getNextPage(Document doc) throws IOException { + public Document getNextPage(Document doc) throws IOException, URISyntaxException { // Check if we've stopped if (isStopped()) { throw new IOException("Ripping interrupted"); @@ -174,7 +176,7 @@ public class EHentaiRipper extends AbstractHTMLRipper { // Sleep before loading next page sleep(PAGE_SLEEP_TIME); // Load next page - Document nextPage = getPageWithRetries(new URL(nextURL)); + Document nextPage = getPageWithRetries(new URI(nextURL).toURL()); this.lastURL = nextURL; return nextPage; } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ListalRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ListalRipper.java index 235da1c7..408310a7 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ListalRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ListalRipper.java @@ -96,7 +96,7 @@ public class ListalRipper extends AbstractHTMLRipper { } @Override - public Document getNextPage(Document page) throws IOException { + public Document getNextPage(Document page) throws IOException, URISyntaxException { Document nextPage = super.getNextPage(page); switch (urlType) { case LIST: