jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Mbps -> MBps

Browse Source 
Fixes #682
This commit is contained in:
Girish Ramakrishnan
2020-05-23 13:31:23 -07:00
parent d113cfc0ba
commit bdcc5c0629
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backups.js
+8 -8
View File
@@ -519,8 +519,8 @@ function sync(backupConfig, backupId, dataLayout, progressCallback, callback) {
}); // ignore error if file disappears }); // ignore error if file disappears
stream.on('progress', function (progress) { stream.on('progress', function (progress) {
const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024); const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
if (!transferred && !speed) return progressCallback({ message: `Uploading ${task.path}` }); // 0M@0Mbps looks wrong if (!transferred && !speed) return progressCallback({ message: `Uploading ${task.path}` }); // 0M@0MBps looks wrong
progressCallback({ message: `Uploading ${task.path}: ${transferred}M@${speed}Mbps` }); // 0M@0Mbps looks wrong progressCallback({ message: `Uploading ${task.path}: ${transferred}M@${speed}MBps` }); // 0M@0MBps looks wrong
}); });
api(backupConfig.provider).upload(backupConfig, backupFilePath, stream, function (error) { api(backupConfig.provider).upload(backupConfig, backupFilePath, stream, function (error) {
debug(error ? `Error uploading ${task.path} try ${retryCount}: ${error.message}` : `Uploaded ${task.path}`); debug(error ? `Error uploading ${task.path} try ${retryCount}: ${error.message}` : `Uploaded ${task.path}`);
@@ -618,8 +618,8 @@ function upload(backupId, format, dataLayoutString, progressCallback, callback)
tarStream.on('progress', function (progress) { tarStream.on('progress', function (progress) {
const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024); const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
if (!transferred && !speed) return progressCallback({ message: 'Uploading backup' }); // 0M@0Mbps looks wrong if (!transferred && !speed) return progressCallback({ message: 'Uploading backup' }); // 0M@0MBps looks wrong
progressCallback({ message: `Uploading backup ${transferred}M@${speed}Mbps` }); progressCallback({ message: `Uploading backup ${transferred}M@${speed}MBps` });
}); });
tarStream.on('error', retryCallback); // already returns BoxError tarStream.on('error', retryCallback); // already returns BoxError
@@ -759,8 +759,8 @@ function downloadDir(backupConfig, backupFilePath, dataLayout, progressCallback,
destStream.on('progress', function (progress) { destStream.on('progress', function (progress) {
const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024); const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
if (!transferred && !speed) return progressCallback({ message: `Downloading ${entry.fullPath}` }); // 0M@0Mbps looks wrong if (!transferred && !speed) return progressCallback({ message: `Downloading ${entry.fullPath}` }); // 0M@0MBps looks wrong
progressCallback({ message: `Downloading ${entry.fullPath}: ${transferred}M@${speed}Mbps` }); progressCallback({ message: `Downloading ${entry.fullPath}: ${transferred}M@${speed}MBps` });
}); });
destStream.on('error', closeAndRetry); destStream.on('error', closeAndRetry);
@@ -804,8 +804,8 @@ function download(backupConfig, backupId, format, dataLayout, progressCallback,
ps.on('progress', function (progress) { ps.on('progress', function (progress) {
const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024); const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
if (!transferred && !speed) return progressCallback({ message: 'Downloading backup' }); // 0M@0Mbps looks wrong if (!transferred && !speed) return progressCallback({ message: 'Downloading backup' }); // 0M@0MBps looks wrong
progressCallback({ message: `Downloading ${transferred}M@${speed}Mbps` }); progressCallback({ message: `Downloading ${transferred}M@${speed}MBps` });
}); });
ps.on('error', retryCallback); ps.on('error', retryCallback);
ps.on('done', retryCallback); ps.on('done', retryCallback);