From 75908f4b0fe7fc3c99aa2106cb76bce3cfea1681 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Thu, 16 Aug 2018 09:50:01 -0400 Subject: [PATCH] Ripme no longer downloads whole files during unittests if the file is over 10mb --- .../java/com/rarchives/ripme/ripper/AbstractRipper.java | 4 ++-- .../com/rarchives/ripme/ripper/DownloadFileThread.java | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index eeaf8fd1..e210e183 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -47,7 +47,7 @@ public abstract class AbstractRipper // Everytime addUrlToDownload skips a already downloaded url this increases by 1 public int alreadyDownloadedUrls = 0; private boolean shouldStop = false; - private boolean thisIsATest = false; + private static boolean thisIsATest = false; public void stop() { shouldStop = true; @@ -611,7 +611,7 @@ public abstract class AbstractRipper LOGGER.debug("THIS IS A TEST RIP"); thisIsATest = true; } - protected boolean isThisATest() { + protected static boolean isThisATest() { return thisIsATest; } diff --git a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java index f481919a..ae28ee6e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java +++ b/src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java @@ -23,6 +23,7 @@ import org.jsoup.HttpStatusException; import com.rarchives.ripme.ui.RipStatusMessage.STATUS; import com.rarchives.ripme.utils.Utils; +import com.rarchives.ripme.ripper.AbstractRipper; /** * Thread for downloading files. @@ -222,6 +223,14 @@ class DownloadFileThread extends Thread { observer.setBytesCompleted(bytesDownloaded); observer.sendUpdate(STATUS.COMPLETED_BYTES, bytesDownloaded); } + // If this is a test and we're downloading a large file + if (AbstractRipper.isThisATest() && bytesTotal / 10000000 >= 10) { + logger.debug("Not downloading whole file because it is over 10mb and this is a test"); + bis.close(); + fos.close(); + break; + + } } bis.close(); fos.close();