From cfee4e518dbdceec4926a2ea749beeb47a9ba2e3 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sat, 23 Mar 2019 13:20:16 -0400 Subject: [PATCH 1/2] Can now pass a map of params to addURLToDownload --- .../java/com/rarchives/ripme/ripper/AbstractRipper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index fe8074fb..78cbc4d7 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -218,6 +218,12 @@ public abstract class AbstractRipper protected abstract boolean addURLToDownload(URL url, File saveAs, String referrer, Map cookies, Boolean getFileExtFromMIME); + + protected boolean addURLToDownload(URL url, Map options) { + return addURLToDownload(url, options.getOrDefault("prefix", ""), options.getOrDefault("subdirectory", ""), options.getOrDefault("referrer", null), + null, options.getOrDefault("fileName", ""), options.getOrDefault("extension", null), false); + } + /** * Queues image to be downloaded and saved. * @param url From ae1cffbbca5d9abe8f8c1424eda509b12b935677 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Fri, 5 Apr 2019 16:45:10 -0400 Subject: [PATCH 2/2] Can now set most args of addURLToDownload using a map --- .../ripme/ripper/AbstractRipper.java | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 78cbc4d7..6c79c63f 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -218,10 +218,42 @@ public abstract class AbstractRipper protected abstract boolean addURLToDownload(URL url, File saveAs, String referrer, Map cookies, Boolean getFileExtFromMIME); - - protected boolean addURLToDownload(URL url, Map options) { + /** + * Queues image to be downloaded and saved. + * @param url + * URL of the file + * @param options + * A map containing any changes to the default options. + * Options are getFileExtFromMIME, prefix, subdirectory, referrer, fileName, extension, getFileExtFromMIME. + * getFileExtFromMIME should be "true" or "false" + * @param cookies + * The cookies to send to the server while downloading this file. + * @return + * True if downloaded successfully + * False if failed to download + */ + protected boolean addURLToDownload(URL url, Map options, Map cookies) { + // Bit of a hack but this lets us pass a bool using a map + boolean useMIME = options.getOrDefault("getFileExtFromMIME", "false").toLowerCase().equals("true"); return addURLToDownload(url, options.getOrDefault("prefix", ""), options.getOrDefault("subdirectory", ""), options.getOrDefault("referrer", null), - null, options.getOrDefault("fileName", ""), options.getOrDefault("extension", null), false); + cookies, options.getOrDefault("fileName", ""), options.getOrDefault("extension", null), useMIME); + } + + + /** + * Queues image to be downloaded and saved. + * @param url + * URL of the file + * @param options + * A map containing any changes to the default options. + * Options are getFileExtFromMIME, prefix, subdirectory, referrer, fileName, extension, getFileExtFromMIME. + * getFileExtFromMIME should be "true" or "false" + * @return + * True if downloaded successfully + * False if failed to download + */ + protected boolean addURLToDownload(URL url, Map options) { + return addURLToDownload(url, options, null); } /**