From 82e263ed043b38b76b54e8eb41c0fe282798017d Mon Sep 17 00:00:00 2001 From: Bekcpear Date: Tue, 30 May 2017 20:58:24 +0800 Subject: Fix upload remaining time The upload remaining time is always 'a few second' whatever a big or a small file uploading. This commit fixes it. The `new Date().getMilliseconds()` only return a three digits number. When time arrived the next second, the millisecond start from ZERO again. So `new Date().getTime()` is the righe choice. And remaining time variables shoule be initialized when the file starts uploading, otherwise the remaining time of a new upload will always be 'Infinity years' until you refresh the page. Signed-off-by: Yaojin Qian --- apps/files/js/file-upload.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'apps') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 1c5758ca50b..87b6a76d0ec 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -956,16 +956,7 @@ 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 bufferIndex2 = 0; - var bufferTotal = 0; - for(var i = 0; i < bufferSize;i++){ - buffer[i] = 0; - } + var lastUpdate, lastSize, bufferSize, buffer, bufferIndex, bufferIndex2, bufferTotal; // add progress handlers fileupload.on('fileuploadadd', function(e, data) { @@ -986,6 +977,17 @@ OC.Uploader.prototype = _.extend({ + ''); $('#uploadprogressbar').tooltip({placement: 'bottom'}); self._showProgressBar(); + // initial remaining time variables + lastUpdate = new Date().getTime(); + lastSize = 0; + bufferSize = 20; + buffer = []; + bufferIndex = 0; + bufferIndex2 = 0; + bufferTotal = 0; + for(var i = 0; i < bufferSize; i++){ + buffer[i] = 0; + } self.trigger('start', e, data); }); fileupload.on('fileuploadprogress', function(e, data) { @@ -996,12 +998,12 @@ 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 thisUpdate = new Date().getTime(); 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 + diffSize = diffSize / diffUpdate; // apply timing factor, eg. 1MiB/2s = 0.5MiB/s, unit is byte per second var remainingSeconds = ((data.total - data.loaded) / diffSize); if(remainingSeconds >= 0) { bufferTotal = bufferTotal - (buffer[bufferIndex]) + remainingSeconds; -- cgit v1.2.3 From 8267e5e007109e979311784e62502012b1e0d4fd Mon Sep 17 00:00:00 2001 From: Bekcpear Date: Tue, 30 May 2017 22:04:59 +0800 Subject: Fix uploadrate value of 'original-title' attribute The unit of `data.bitrate` is bit, but the argument unit of `humanFileSize` function is byte, so it should be divided by 8. Signed-off-by: Yaojin Qian --- apps/files/js/file-upload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 87b6a76d0ec..2fa3122a008 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -1027,7 +1027,7 @@ OC.Uploader.prototype = _.extend({ t('files', '{loadedSize} of {totalSize} ({bitrate})' , { loadedSize: humanFileSize(data.loaded), totalSize: humanFileSize(data.total), - bitrate: humanFileSize(data.bitrate) + '/s' + bitrate: humanFileSize(data.bitrate / 8) + '/s' }) ); $('#uploadprogressbar').progressbar('value', progress); -- cgit v1.2.3