use jQuery-File-Upload bitrate on file upload instead of self calculating

karakayasemi · karakayasemi · commit 4c29a21503d0 · 2020-03-01T00:34:44.000+03:00
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
@@ -1269,12 +1269,11 @@ OC.Uploader.prototype = _.extend({
 
 			if (this._supportAjaxUploadWithProgress()) {
 				//remaining time
-				var lastUpdate = new Date().getMilliseconds();
-				var lastSize = 0;
 				var bufferSize = 20;
 				var buffer = [];
 				var bufferIndex = 0;
 				var bufferTotal = 0;
+				var filledBufferSize = 0;
 				for(var i = 0; i < bufferSize;i++){
 					buffer[i] = 0;
 				}
@@ -1308,19 +1307,19 @@ OC.Uploader.prototype = _.extend({
 				fileupload.on('fileuploadprogressall', function(e, data) {
 					self.log('progress handle fileuploadprogressall', e, data);
 					var progress = (data.loaded / data.total) * 100;
-					var thisUpdate = new Date().getMilliseconds();
-					var diffUpdate = (thisUpdate - lastUpdate)/1000; // eg. 2s
-					lastUpdate = thisUpdate;
-					var diffSize = data.loaded - lastSize;
-					lastSize = data.loaded;
-					diffSize = diffSize / diffUpdate; // apply timing factor, eg. 1mb/2s = 0.5mb/s
-					var remainingSeconds = ((data.total - data.loaded) / diffSize);
+					var remainingSeconds = ((data.total - data.loaded) * 8) / data.bitrate;
+
+					//Take the average remaining seconds of the last bufferSize events
+					//to prevent fluctuation and provide a smooth experience
 					if (isFinite(remainingSeconds) && remainingSeconds >= 0) {
 						bufferTotal = bufferTotal - (buffer[bufferIndex]) + remainingSeconds;
-						buffer[bufferIndex] = remainingSeconds; //buffer to make it smoother
+						buffer[bufferIndex] = remainingSeconds;
 						bufferIndex = (bufferIndex + 1) % bufferSize;
+						if (filledBufferSize < bufferSize) {
+							filledBufferSize++;
+						}
 					}
-					var smoothRemainingSeconds = (bufferTotal / bufferSize); //seconds
+					var smoothRemainingSeconds = (bufferTotal / filledBufferSize);
 					var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();
 					self.$uploadprogressbar.attr('data-loaded', data.loaded);
 					self.$uploadprogressbar.attr('data-total', data.total);
diff --git a/changelog/unreleased/37053 b/changelog/unreleased/37053
@@ -0,0 +1,7 @@
+Bugfix: Fix public link upload remaining time estimation
+
+Public link upload wrong remaining time estimation problem has been resolved.
+Also, the remaining time calculation logic has been changed for smoother performance.
+
+https://github.com/owncloud/core/pull/37053
+https://github.com/owncloud/core/issues/25053
