From d82197defa0a323be434dbbe62e5b759e65ef35c Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Fri, 19 Oct 2018 07:07:54 -0400 Subject: [PATCH] history.end_rip_after_already_seen now works even if remember.url_history is false --- .../java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java | 1 + src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java | 2 +- .../java/com/rarchives/ripme/ripper/DownloadFileThread.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java index b24017f76..da6b10d13 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java @@ -96,6 +96,7 @@ public void rip() throws IOException { } while (doc != null) { + LOGGER.info("AHR: alreadyDownloadedUrls = " + alreadyDownloadedUrls + " history.end_rip_after_already_seen = " + Utils.getConfigInteger("history.end_rip_after_already_seen", 1000000000)); if (alreadyDownloadedUrls >= Utils.getConfigInteger("history.end_rip_after_already_seen", 1000000000) && !isThisATest()) { sendUpdate(STATUS.DOWNLOAD_COMPLETE_HISTORY, "Already seen the last " + alreadyDownloadedUrls + " images ending rip"); break; diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 95643b4cc..fdd3f75bd 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -46,7 +46,7 @@ public abstract class AbstractRipper public abstract String getGID(URL url) throws MalformedURLException; public boolean hasASAPRipping() { return false; } // Everytime addUrlToDownload skips a already downloaded url this increases by 1 - public int alreadyDownloadedUrls = 0; + public static int alreadyDownloadedUrls = 0; private boolean shouldStop = false; private static boolean thisIsATest = false; diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java index 77a59a3ed..2dcd9c0ac 100644 --- a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java +++ b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java @@ -82,6 +82,8 @@ public void run() { } if (saveAs.exists() && !observer.tryResumeDownload() && !getFileExtFromMIME || Utils.fuzzyExists(new File(saveAs.getParent()), saveAs.getName()) && getFileExtFromMIME && !observer.tryResumeDownload()) { + AbstractRipper.alreadyDownloadedUrls += 1; + logger.info("alreadyDownloadedUrls = " + AbstractRipper.alreadyDownloadedUrls); if (Utils.getConfigBoolean("file.overwrite", false)) { logger.info("[!] " + rb.getString("deleting.existing.file") + prettySaveAs); saveAs.delete(); @@ -217,7 +219,6 @@ public void run() { String fileExt = saveAsSplit[saveAsSplit.length - 1]; // The max limit for filenames on Linux with Ext3/4 is 255 bytes, on windows it's 256 chars so rather than // bother with code with both platforms we just cut the file name down to 254 chars - logger.info(saveAs.getName().substring(0, 254 - fileExt.length()) + fileExt); String filename = saveAs.getName().substring(0, 254 - fileExt.length()) + "." + fileExt; // We can't just use the new file name as the saveAs because the file name doesn't include the // users save path, so we get the user save path from the old saveAs