new URI instead of new URL, mangadex.

ripmeapp2 · Dec 9, 2023 · 7aa7989 · 7aa7989
1 parent 879c322
commit 7aa7989
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractJSONRipper.java
@@ -37,7 +37,7 @@ protected AbstractJSONRipper(URL url) throws IOException {
     @Override
     public abstract String getHost();
 
-    protected abstract JSONObject getFirstPage() throws IOException;
+    protected abstract JSONObject getFirstPage() throws IOException, URISyntaxException;
     protected JSONObject getNextPage(JSONObject doc) throws IOException, URISyntaxException {
         throw new IOException("getNextPage not implemented");
     }
@@ -62,7 +62,7 @@ public URL sanitizeURL(URL url) throws MalformedURLException, URISyntaxException
     }
 
     @Override
-    public void rip() throws IOException {
+    public void rip() throws IOException, URISyntaxException {
         int index = 0;
         LOGGER.info("Retrieving " + this.url);
         sendUpdate(STATUS.LOADING_RESOURCE, this.url.toExternalForm());

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java
@@ -8,6 +8,8 @@
 
 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;
@@ -79,14 +81,14 @@ private String getMangaID(String url) {
 
 
     @Override
-    public JSONObject getFirstPage() throws IOException {
+    public JSONObject getFirstPage() throws IOException, URISyntaxException {
         // Get the chapter ID
         String chapterID = getChapterID(url.toExternalForm());
         String mangaID = getMangaID(url.toExternalForm());
         if (mangaID != null) {
-            return Http.url(new URL(mangaApiEndPoint + mangaID)).getJSON();
+            return Http.url(new URI(mangaApiEndPoint + mangaID).toURL()).getJSON();
         } else
-            return Http.url(new URL(chapterApiEndPoint + chapterID)).getJSON();
+            return Http.url(new URI(chapterApiEndPoint + chapterID).toURL()).getJSON();
     }
 
     @Override
@@ -129,8 +131,8 @@ protected List<String> getURLsFromJSON(JSONObject json) {
         for (Double aDouble : treeMap.keySet()) {
             double key = (double) aDouble;
             try {
-                chapterJSON = Http.url(new URL(chapterApiEndPoint + treeMap.get(key))).getJSON();
-            } catch (IOException e) {
+                chapterJSON = Http.url(new URI(chapterApiEndPoint + treeMap.get(key)).toURL()).getJSON();
+            } catch (IOException | URISyntaxException e) {
                 e.printStackTrace();
             }
             sendUpdate(RipStatusMessage.STATUS.LOADING_RESOURCE, "chapter " + key);

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -137,7 +138,7 @@ public URL sanitizeURL(URL url) throws MalformedURLException {
     }
 
     @Override
-    public void rip() throws IOException {
+    public void rip() throws IOException, URISyntaxException {
         if (this.url.toExternalForm().contains("/videos")) {
             RIP_TYPE = RipType.VIDEO;
             JSONObject json = getFirstPage();