fix(cli): add human flag to repo stat & stats repo

- Use filesize to return human readable sizes.
- handler now returns stats instead of printing them.

License: MIT
Signed-off-by: Chirag Shinde <[email protected]>

Author: chirag-shinde

package.json

@@ -109,7 +109,8 @@
     "debug": "^4.1.0",
     "dlv": "^1.1.3",
     "err-code": "^1.1.2",
-    "file-type": "^11.1.0",
+    "file-type": "^11.0.0",
+    "filesize": "^4.1.2",
     "fnv1a": "^1.0.1",
     "fsm-event": "^2.1.0",
     "get-folder-size": "^2.0.0",

src/cli/commands/repo/stat.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const print = require('../../utils').print
-const humanize = require('../../utils').humanize
+const filesize = require('filesize')
 
 module.exports = {
   command: 'stat',
@@ -20,15 +19,15 @@ module.exports = {
       const ipfs = await argv.getIpfs()
       const stats = await ipfs.repo.stat()
       if (argv.human) {
-        stats.repoSize = humanize.Bytes(stats.repoSize)
-        stats.storageMax = humanize.Bytes(stats.storageMax)
+        stats.repoSize = filesize(stats.repoSize)
+        stats.storageMax = filesize(stats.storageMax)
       }
-      print(`repo status
+      return `repo status
   number of objects: ${stats.numObjects}
   repo size: ${stats.repoSize}
   repo path: ${stats.repoPath}
   version: ${stats.version}
-  maximum storage: ${stats.storageMax}`)
+  maximum storage: ${stats.storageMax}`
     })())
   }
 }

src/cli/commands/stats/repo.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const print = require('../../utils').print
-const humanize = require('../../utils').humanize
+const filesize = require('filesize')
 
 module.exports = {
   command: 'repo',
@@ -20,15 +19,15 @@ module.exports = {
       const ipfs = await argv.getIpfs()
       const stats = await ipfs.stats.repo()
       if (argv.human) {
-        stats.repoSize = humanize.Bytes(stats.repoSize)
-        stats.storageMax = humanize.Bytes(stats.storageMax)
+        stats.repoSize = filesize(stats.repoSize)
+        stats.storageMax = filesize(stats.storageMax)
       }
-      print(`repo status
+      return `repo status
   number of objects: ${stats.numObjects}
   repo size: ${stats.repoSize}
   repo path: ${stats.repoPath}
   version: ${stats.version}
-  maximum storage: ${stats.storageMax}`)
+  maximum storage: ${stats.storageMax}`
     })())
   }
 }

src/cli/utils.js

@@ -135,18 +135,3 @@ exports.singleton = create => {
   })
   return getter
 }
-exports.humanize = {
-  Bytes: (bytes) => {
-    const thresh = 1024
-    if (Math.abs(bytes) < thresh) {
-      return bytes + ' B'
-    }
-    const units = ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
-    let unit = -1
-    do {
-      bytes /= thresh
-      ++unit
-    } while (Math.abs(bytes) >= thresh && unit < units.length - 1)
-    return bytes.toFixed(1) + ' ' + units[unit]
-  }
-}