ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity

refactor file size calculation

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-09-10 09:30:04 +02:00
parent 3307e282e4
commit 1fabea93ff
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js
View File

@ -9,26 +9,11 @@ let FileDragAndDropPreviewProgress = React.createClass({
files: React.PropTypes.array files: React.PropTypes.array
}, },
calcOverallProgress() {
let overallProgress = 0;
let sizeOfAllFiles = 0;
let files = this.props.files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled' && file.status !== 'online');
for(let i = 0; i < files.length; i++) {
sizeOfAllFiles += files[i].size;
}
for(let i = 0; i < files.length; i++) {
overallProgress += files[i].size / sizeOfAllFiles * files[i].progress;
}
return overallProgress;
},
calcOverallFileSize() { calcOverallFileSize() {
let overallFileSize = 0; let overallFileSize = 0;
let files = this.props.files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled' && file.status !== 'online'); let files = this.props.files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled' && file.status !== 'online');
// We just sum up all files' sizes
for(let i = 0; i < files.length; i++) { for(let i = 0; i < files.length; i++) {
overallFileSize += files[i].size; overallFileSize += files[i].size;
} }
@ -36,6 +21,20 @@ let FileDragAndDropPreviewProgress = React.createClass({
return overallFileSize; return overallFileSize;
}, },
calcOverallProgress() {
let overallProgress = 0;
let overallFileSize = this.calcOverallFileSize();
let files = this.props.files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled' && file.status !== 'online');
// We calculate the overall progress by summing the individuals
// files' progresses in relation to their size
for(let i = 0; i < files.length; i++) {
overallProgress += files[i].size / overallFileSize * files[i].progress;
}
return overallProgress;
},
render() { render() {
let overallProgress = this.calcOverallProgress(); let overallProgress = this.calcOverallProgress();
let overallFileSize = this.calcOverallFileSize(); let overallFileSize = this.calcOverallFileSize();