From 0db4cd22d0e31deb2f28cbd3e371cf4a962c0da9 Mon Sep 17 00:00:00 2001 From: Brian Wiegand Date: Sat, 12 Jan 2019 21:15:04 -0800 Subject: [PATCH 1/2] [Bugfix] Handle a resource with a proper Try with Resources. Trim the line input to avoid problems with whitespace on each line. --- src/main/java/com/rarchives/ripme/ui/MainWindow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ui/MainWindow.java b/src/main/java/com/rarchives/ripme/ui/MainWindow.java index 76d66ef8..e97e915a 100644 --- a/src/main/java/com/rarchives/ripme/ui/MainWindow.java +++ b/src/main/java/com/rarchives/ripme/ui/MainWindow.java @@ -872,9 +872,9 @@ public final class MainWindow implements Runnable, RipStatusHandler { LOGGER.error("Error while getting selected path: ", e); return; } - try { - BufferedReader br = new BufferedReader(new FileReader(chosenPath)); + try (BufferedReader br = new BufferedReader(new FileReader(chosenPath))) { for (String line = br.readLine(); line != null; line = br.readLine()) { + line = line.trim(); if (line.startsWith("http")) { MainWindow.addUrlToQueue(line); } else { From 324ef7def6a9e4b7d99798ec8ffbc5b83176771c Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Tue, 15 Jan 2019 23:13:04 -0500 Subject: [PATCH 2/2] DA ripper now takes fav urls again --- .../com/rarchives/ripme/ripper/rippers/DeviantartRipper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java index 724fc74e..ad7d79fa 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java @@ -65,6 +65,10 @@ public class DeviantartRipper extends AbstractJSONRipper { String u = url.toExternalForm(); if (u.contains("/gallery/")) { return url; + } else if (u.contains("/favourites")) { + return url; + } else if (u.contains("/favorites")) { + return url; } if (!u.endsWith("/gallery/") && !u.endsWith("/gallery")) {