From 639a0353a68ab609c69b5f73dfb17a8f15d938fb Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 11 Feb 2018 10:01:21 -0500 Subject: [PATCH 1/2] Undid saveAs sanitation in album ripper --- src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java index c06cb4d3..1726343a 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java @@ -51,14 +51,6 @@ public abstract class AlbumRipper extends AbstractRipper { * Queues multiple URLs of single images to download from a single Album URL */ public boolean addURLToDownload(URL url, File saveAs, String referrer, Map cookies) { - // TODO fix this hack - // Sanitize the saveAs file - String fileName = saveAs.getPath(); - if (fileName.indexOf('?') >= 0) { fileName = fileName.substring(0, fileName.indexOf('?')); } - if (fileName.indexOf('&') >= 0) { fileName = fileName.substring(0, fileName.indexOf('&')); } - if (fileName.indexOf(':') >= 0) { fileName = fileName.substring(0, fileName.indexOf(':')); } - if (fileName.indexOf('#') >= 0) { fileName = fileName.substring(0, fileName.indexOf('#')); } - saveAs = new File(fileName); // Only download one file if this is a test. if (super.isThisATest() && (itemsPending.size() > 0 || itemsCompleted.size() > 0 || itemsErrored.size() > 0)) { From 8a4e26474cc76e44777ebc534ef2695e422c3f24 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 11 Feb 2018 10:04:29 -0500 Subject: [PATCH 2/2] imgurRipper no longer tries to add ?1 to file names --- .../java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java index 7c271442..b595d9e2 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java @@ -213,6 +213,7 @@ public class ImgurRipper extends AlbumRipper { saveAs += String.format("%03d_", index); } saveAs += imgurImage.getSaveAs(); + saveAs = saveAs.replaceAll("\\?\\d", ""); addURLToDownload(imgurImage.url, new File(saveAs)); } }