diff --git a/package-lock.json b/package-lock.json index fa8a2c628..5a25709c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,6 @@ "nodemailer": "^6.7.3", "nodemailer-smtp-transport": "^2.7.4", "once": "^1.4.0", - "pretty-bytes": "^6.0.0", "progress-stream": "^2.0.0", "proxy-middleware": "^0.15.0", "qrcode": "^1.5.0", @@ -5880,17 +5879,6 @@ "node": ">= 0.6" } }, - "node_modules/pretty-bytes": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz", - "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==", - "engines": { - "node": "^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -12525,11 +12513,6 @@ "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz", "integrity": "sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw=" }, - "pretty-bytes": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz", - "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==" - }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", diff --git a/package.json b/package.json index 25a26bc12..bcbcb3c69 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "nodemailer": "^6.7.3", "nodemailer-smtp-transport": "^2.7.4", "once": "^1.4.0", - "pretty-bytes": "^6.0.0", "progress-stream": "^2.0.0", "proxy-middleware": "^0.15.0", "qrcode": "^1.5.0", diff --git a/src/pretty-bytes.js b/src/pretty-bytes.js new file mode 100644 index 000000000..b96e99ea0 --- /dev/null +++ b/src/pretty-bytes.js @@ -0,0 +1,15 @@ +'use strict'; + +exports = module.exports = prettyByteSize; + +const assert = require('assert'); + +// binary units (non SI) 1024 based +function prettyByteSize(size) { + assert.strictEqual(typeof size, 'number'); + + if (!size) return 0; + + const i = Math.floor(Math.log(size) / Math.log(1024)); + return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i]; +} diff --git a/src/storage/filesystem.js b/src/storage/filesystem.js index 2244efe9f..9c3bc50d7 100644 --- a/src/storage/filesystem.js +++ b/src/storage/filesystem.js @@ -40,7 +40,7 @@ const assert = require('assert'), mounts = require('../mounts.js'), path = require('path'), paths = require('../paths.js'), - prettyBytes = require('pretty-bytes'), + prettyBytes = require('../pretty-bytes.js'), readdirp = require('readdirp'), safe = require('safetydance'), shell = require('../shell.js');