- Fixed Motherless ripper

- increased default retries to 3 (why only 1?)
- fixed deprecation message for Motherless ripper

Author: brantspar

src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java

@@ -5,6 +5,8 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -61,14 +63,17 @@ protected Document getFirstPage() throws IOException {
         if (!notHome) {
             StringBuilder newPath = new StringBuilder(path);
             newPath.insert(2, "M");
-            firstURL = new URL(this.url, "https://" + DOMAIN + newPath);
+            firstURL = URI.create("https://" + DOMAIN + newPath).toURL();
             LOGGER.info("Changed URL to " + firstURL);
         }
         return Http.url(firstURL).referrer("https://motherless.com").get();
     }
 
     @Override
     public Document getNextPage(Document doc) throws IOException, URISyntaxException {
+
+        Files.write(Paths.get("doc-next-page.txt"), doc.outerHtml().getBytes());
+
         Elements nextPageLink = doc.head().select("link[rel=next]");
         if (nextPageLink.isEmpty()) {
             throw new IOException("Last page reached");
@@ -111,7 +116,7 @@ protected List<String> getURLsFromPage(Document page) {
     @Override
     protected void downloadURL(URL url, int index) {
         // Create thread for finding image at "url" page
-        MotherlessImageThread mit = new MotherlessImageThread(url, index);
+        MotherlessImageRunnable mit = new MotherlessImageRunnable(url, index);
         motherlessThreadPool.addThread(mit);
         try {
             Thread.sleep(IMAGE_SLEEP_TIME);
@@ -150,15 +155,19 @@ public String getGID(URL url) throws MalformedURLException {
         throw new MalformedURLException("Expected URL format: https://motherless.com/GIXXXXXXX, got: " + url);
     }
 
-
+    @Override
+    protected DownloadThreadPool getThreadPool() {
+        return motherlessThreadPool;
+    }
+    
     /**
      * Helper class to find and download images found on "image" pages
      */
-    private class MotherlessImageThread implements Runnable {
+    private class MotherlessImageRunnable implements Runnable {
         private final URL url;
         private final int index;
 
-        MotherlessImageThread(URL url, int index) {
+        MotherlessImageRunnable(URL url, int index) {
             super();
             this.url = url;
             this.index = index;

src/main/java/com/rarchives/ripme/utils/Http.java

@@ -56,7 +56,7 @@ public static Http url(URL url) {
     }
 
     private void defaultSettings() {
-        this.retries = Utils.getConfigInteger("download.retries", 1);
+        this.retries = Utils.getConfigInteger("download.retries", 3);
         this.retrySleep = Utils.getConfigInteger("download.retry.sleep", 5000);
         connection = Jsoup.connect(this.url);
         connection.userAgent(AbstractRipper.USER_AGENT);

src/main/resources/rip.properties

@@ -6,7 +6,7 @@ threads.size = 5
 file.overwrite = false
 
 # Number of retries on failed downloads
-download.retries = 1
+download.retries = 3
 
 # File download timeout (in milliseconds)
 download.timeout = 60000