mirror of
https://github.com/RipMeApp/ripme.git
synced 2025-08-12 17:04:04 +02:00
Merge pull request #989 from cyian-1756/downloaderCleanUp
Moved if statement outide of loop
This commit is contained in:
@@ -228,27 +228,24 @@ class DownloadFileThread extends Thread {
|
||||
}
|
||||
byte[] data = new byte[1024 * 256];
|
||||
int bytesRead;
|
||||
boolean shouldSkipFileDownload = huc.getContentLength() / 10000000 >= 10;
|
||||
while ( (bytesRead = bis.read(data)) != -1) {
|
||||
try {
|
||||
observer.stopCheck();
|
||||
} catch (IOException e) {
|
||||
observer.downloadErrored(url, rb.getString("download.interrupted"));
|
||||
return;
|
||||
}
|
||||
fos.write(data, 0, bytesRead);
|
||||
if (observer.useByteProgessBar()) {
|
||||
bytesDownloaded += bytesRead;
|
||||
observer.setBytesCompleted(bytesDownloaded);
|
||||
observer.sendUpdate(STATUS.COMPLETED_BYTES, bytesDownloaded);
|
||||
}
|
||||
// If this is a test and we're downloading a large file
|
||||
if (AbstractRipper.isThisATest() && shouldSkipFileDownload) {
|
||||
logger.debug("Not downloading whole file because it is over 10mb and this is a test");
|
||||
bis.close();
|
||||
fos.close();
|
||||
break;
|
||||
|
||||
boolean shouldSkipFileDownload = huc.getContentLength() / 10000000 >= 10 && AbstractRipper.isThisATest();
|
||||
// If this is a test rip we skip large downloads
|
||||
if (shouldSkipFileDownload) {
|
||||
logger.debug("Not downloading whole file because it is over 10mb and this is a test");
|
||||
} else {
|
||||
while ((bytesRead = bis.read(data)) != -1) {
|
||||
try {
|
||||
observer.stopCheck();
|
||||
} catch (IOException e) {
|
||||
observer.downloadErrored(url, rb.getString("download.interrupted"));
|
||||
return;
|
||||
}
|
||||
fos.write(data, 0, bytesRead);
|
||||
if (observer.useByteProgessBar()) {
|
||||
bytesDownloaded += bytesRead;
|
||||
observer.setBytesCompleted(bytesDownloaded);
|
||||
observer.sendUpdate(STATUS.COMPLETED_BYTES, bytesDownloaded);
|
||||
}
|
||||
}
|
||||
}
|
||||
bis.close();
|
||||
|
Reference in New Issue
Block a user