From 9e099de63605d32346db57a3e3a2225204c0174a Mon Sep 17 00:00:00 2001 From: soloturn Date: Fri, 15 Apr 2022 14:12:12 +0200 Subject: [PATCH] reorder prefix parameter to be close to filename --- .../com/rarchives/ripme/ripper/AbstractRipper.java | 11 ++++++----- .../ripme/ripper/rippers/ComicextraRipper.java | 2 +- .../ripme/ripper/rippers/EightmusesRipper.java | 2 +- .../rarchives/ripme/ripper/rippers/TsuminoRipper.java | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 89344930..e97c18fd 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -244,8 +244,9 @@ public abstract class AbstractRipper 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").equalsIgnoreCase("true"); - return addURLToDownload(url, options.getOrDefault("prefix", ""), options.getOrDefault("subdirectory", ""), options.getOrDefault("referrer", null), - cookies, options.getOrDefault("fileName", null), options.getOrDefault("extension", null), useMIME); + return addURLToDownload(url, options.getOrDefault("subdirectory", ""), options.getOrDefault("referrer", null), cookies, + options.getOrDefault("prefix", ""), options.getOrDefault("fileName", null), options.getOrDefault("extension", null), + useMIME); } @@ -283,7 +284,7 @@ public abstract class AbstractRipper * True if downloaded successfully * False if failed to download */ - protected boolean addURLToDownload(URL url, String prefix, String subdirectory, String referrer, Map cookies, String fileName, String extension, Boolean getFileExtFromMIME) { + protected boolean addURLToDownload(URL url, String subdirectory, String referrer, Map cookies, String prefix, String fileName, String extension, Boolean getFileExtFromMIME) { // A common bug is rippers adding urls that are just "http:". This rejects said urls if (url.toExternalForm().equals("http:") || url.toExternalForm().equals("https:")) { LOGGER.info(url.toExternalForm() + " is a invalid url amd will be changed"); @@ -314,7 +315,7 @@ public abstract class AbstractRipper LOGGER.debug("Ripper has been stopped"); return false; } - LOGGER.debug("url: " + url + ", prefix: " + prefix + ", subdirectory" + subdirectory + ", referrer: " + referrer + ", cookies: " + cookies + ", fileName: " + fileName); + LOGGER.debug("url: " + url + ", subdirectory" + subdirectory + ", referrer: " + referrer + ", cookies: " + cookies + ", prefix: " + prefix + ", fileName: " + fileName); String saveAs = getFileName(url, fileName, extension); File saveFileAs; try { @@ -354,7 +355,7 @@ public abstract class AbstractRipper } protected boolean addURLToDownload(URL url, String prefix, String subdirectory, String referrer, Map cookies, String fileName, String extension) { - return addURLToDownload(url, prefix, subdirectory, referrer, cookies, fileName, extension, false); + return addURLToDownload(url, subdirectory, referrer, cookies, prefix, fileName, extension, false); } protected boolean addURLToDownload(URL url, String prefix, String subdirectory, String referrer, Map cookies, String fileName) { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ComicextraRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ComicextraRipper.java index 08b27a76..a2e79bc0 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ComicextraRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ComicextraRipper.java @@ -127,7 +127,7 @@ public class ComicextraRipper extends AbstractHTMLRipper { String subdirectory = getSubDirectoryName(); String prefix = getPrefix(++imageIndex); - addURLToDownload(url, prefix, subdirectory, null, null, FILE_NAME, null, Boolean.TRUE); + addURLToDownload(url, subdirectory, null, null, prefix, FILE_NAME, null, Boolean.TRUE); } /* diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java index 82150b89..26808aa0 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java @@ -124,7 +124,7 @@ public class EightmusesRipper extends AbstractHTMLRipper { for (int i = 0; i != json.getJSONArray("pictures").length(); i++) { image = "https://www.8muses.com/image/fl/" + json.getJSONArray("pictures").getJSONObject(i).getString("publicUri"); URL imageUrl = new URL(image); - addURLToDownload(imageUrl, getPrefixShort(x), getSubdir(page.select("title").text()), this.url.toExternalForm(), cookies, "", null, true); + addURLToDownload(imageUrl, getSubdir(page.select("title").text()), this.url.toExternalForm(), cookies, getPrefixShort(x), "", null, true); // X is our page index x++; if (isThisATest()) { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/TsuminoRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/TsuminoRipper.java index 846c4795..31917199 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/TsuminoRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/TsuminoRipper.java @@ -127,6 +127,6 @@ public class TsuminoRipper extends AbstractHTMLRipper { There is no way to tell if an image returned from tsumino.com is a png to jpg. The content-type header is always "image/jpeg" even when the image is a png. The file ext is not included in the url. */ - addURLToDownload(url, getPrefix(index), "", null, null, null, null, true); + addURLToDownload(url, "", null, null, getPrefix(index), null, null, true); } }