improve progress UI

joehand · Feb 2, 2017 · 31b8947 · 31b8947
1 parent a7502f5
commit 31b8947
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/share.js b/lib/share.js
@@ -73,7 +73,7 @@ module.exports = function sync (type, opts, dat) {
     if (dat.owner && opts.import) {
       debug('Importing updated & new files into archive')
       // File Imports
-      progressOutput[2] = 'Importing new & updated files to archive...'
+      progressOutput[2] = 'Importing files...'
 
       importStatus = dat.importFiles({
         watch: opts.watch, // TODO: allow live: true. opts.live is used by archive.live though =(
@@ -125,7 +125,7 @@ module.exports = function sync (type, opts, dat) {
   }
 
   function updateImport () {
-    progressOutput[2] = importUI(importStatus)
+    progressOutput[3] = importUI(importStatus)
   }
 
   function updateNetwork () {

diff --git a/lib/ui/import-progress.js b/lib/ui/import-progress.js
@@ -1,11 +1,14 @@
 var Bar = require('./bar')
+var prettyBytes = require('pretty-bytes')
 
 module.exports = function () {
   var bar = Bar()
+  var start = Date.now()
   return function (importer) {
     if (!importer || !importer.bytesImported) return ''
     var importedBytes = importer.bytesImported
+    var speed = importer.bytesImported * 1000 / (Date.now() - start)
     var progress = Math.round(importedBytes * 100 / importer.countStats.bytes)
-    return bar(progress) + ` ${importer.fileCount} ${importer.fileCount === 1 ? 'file' : 'files'} imported`
+    return bar(progress) + ` ${importer.fileCount} of ${importer.countStats.files} ${importer.countStats.files === 1 ? 'file' : 'files'}` + ' (' + prettyBytes(speed) + '/s' + ')'
   }
 }