Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ripme no longer downloads whole files during unittests if the file is over 10mb

Browse Source
This commit is contained in:
cyian-1756 2018-08-16 09:50:01 -04:00
parent 5bb1e0debe
commit 75908f4b0f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java
View File

@ -47,7 +47,7 @@ public abstract class AbstractRipper
// Everytime addUrlToDownload skips a already downloaded url this increases by 1 // Everytime addUrlToDownload skips a already downloaded url this increases by 1
public int alreadyDownloadedUrls = 0; public int alreadyDownloadedUrls = 0;
private boolean shouldStop = false; private boolean shouldStop = false;
private boolean thisIsATest = false; private static boolean thisIsATest = false;
public void stop() { public void stop() {
shouldStop = true; shouldStop = true;
@ -611,7 +611,7 @@ public abstract class AbstractRipper
LOGGER.debug("THIS IS A TEST RIP"); LOGGER.debug("THIS IS A TEST RIP");
thisIsATest = true; thisIsATest = true;
} }
protected boolean isThisATest() { protected static boolean isThisATest() {
return thisIsATest; return thisIsATest;
} }

9
src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java
View File

@ -23,6 +23,7 @@ import org.jsoup.HttpStatusException;
import com.rarchives.ripme.ui.RipStatusMessage.STATUS; import com.rarchives.ripme.ui.RipStatusMessage.STATUS;
import com.rarchives.ripme.utils.Utils; import com.rarchives.ripme.utils.Utils;
import com.rarchives.ripme.ripper.AbstractRipper;
/** /**
* Thread for downloading files. * Thread for downloading files.
@ -222,6 +223,14 @@ class DownloadFileThread extends Thread {
observer.setBytesCompleted(bytesDownloaded); observer.setBytesCompleted(bytesDownloaded);
observer.sendUpdate(STATUS.COMPLETED_BYTES, 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(); bis.close();
fos.close(); fos.close();