Merge pull request #822 from pierotofy/progressfix

Fixed delta calculations in progress upload
OpenDroneMap · Feb 19, 2020 · 083690e · 083690e
2 parents 047a8de + d0b64db
commit 083690e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/app/static/app/js/components/ProjectListItem.jsx b/app/static/app/js/components/ProjectListItem.jsx
@@ -141,18 +141,22 @@ class ProjectListItem extends React.Component {
         .on("uploadprogress", (file, progress, bytesSent) => {
             const now = new Date().getTime();
 
-            if (now - this.state.upload.lastUpdated > 500){
-                file.deltaBytesSent = bytesSent - file.deltaBytesSent;
-                file.trackedBytesSent += file.deltaBytesSent;
+            if (bytesSent > file.size) bytesSent = file.size;
+
+            if (progress === 100 || now - this.state.upload.lastUpdated > 500){
+                const deltaBytesSent = bytesSent - file.deltaBytesSent;
+                file.trackedBytesSent += deltaBytesSent;
 
-                const totalBytesSent = this.state.upload.totalBytesSent + file.deltaBytesSent;
+                const totalBytesSent = this.state.upload.totalBytesSent + deltaBytesSent;
                 const progress = totalBytesSent / this.state.upload.totalBytes * 100;
 
                 this.setUploadState({
                     progress,
                     totalBytesSent,
                     lastUpdated: now
                 });
+
+                file.deltaBytesSent = bytesSent;
             }
         })
         .on("complete", (file) => {