summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/DownloadTask.java
diff options
context:
space:
mode:
authorSimon Rettberg2016-04-20 17:10:42 +0200
committerSimon Rettberg2016-04-20 17:10:42 +0200
commitf73acba9666cbd61d1caa126103eef0f53bc5ac7 (patch)
tree77588f0ef1b0824392aa487af79c368a2e4ea103 /dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/DownloadTask.java
parent[*] Display sat->master progress in client (diff)
downloadtutor-module-f73acba9666cbd61d1caa126103eef0f53bc5ac7.tar.gz
tutor-module-f73acba9666cbd61d1caa126103eef0f53bc5ac7.tar.xz
tutor-module-f73acba9666cbd61d1caa126103eef0f53bc5ac7.zip
More imgsync stuff
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/DownloadTask.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/DownloadTask.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/DownloadTask.java b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/DownloadTask.java
index 0aa48e8c..346928de 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/DownloadTask.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/DownloadTask.java
@@ -108,7 +108,7 @@ public class DownloadTask extends TransferTask {
fileHandle.seek(chunk.range.startOffset);
fileHandle.write(buffer, 0, chunk.range.getLength());
}
- chunks.markSuccessful(chunk);
+ chunks.markCompleted(chunk, true);
} catch (Exception e) {
LOGGER.error("Could not write to file at offset " + chunk.range.startOffset, e);
fileWritable = false;
@@ -182,16 +182,16 @@ public class DownloadTask extends TransferTask {
}
}
// 0 = complete, 1 = missing, 2 = uploading, 3 = queued for copying, 4 = copying
- if (progress != null) {
- int missing = 0;
- for (byte b : progress) {
- if (b != 0) {
- missing++;
- }
- }
- final long bytesRemaining = CHUNK_SIZE * (long) missing;
- timeRemaining = (1000 * bytesRemaining) / (speed + 1);
+ if (progress != null) {
+ int missing = 0;
+ for (byte b : progress) {
+ if (b != 0) {
+ missing++;
}
+ }
+ final long bytesRemaining = CHUNK_SIZE * (long) missing;
+ timeRemaining = (1000 * bytesRemaining) / (speed + 1);
+ }
return new TransferEvent(state, progress, speed, timeRemaining, error);
}