diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js index 2fdb47f..41ba8ff 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/routes/api.js @@ -7,6 +7,7 @@ const webdav = new WebdavTools().getInstance(); const settingsTools = require('../tools/settingsTools'); const pathTools = require('../tools/pathTools'); const hassioApiTools = require('../tools/hassioApiTools'); +const humanFileSize = require('../tools/toolbox').humanFileSize; const cronTools = require('../tools/cronTools'); @@ -58,7 +59,7 @@ router.get('/formated-backup-manual', function(req, res, next) { else return -1; }) - res.render('backupSnaps',{backups: contents, moment: moment}); + res.render('backupSnaps',{backups: contents, moment: moment, humanFileSize: humanFileSize}); }).catch(()=>{ res.send(); }); @@ -75,7 +76,7 @@ router.get('/formated-backup-auto', function(req, res, next) { else return -1; }) - res.render('backupSnaps',{backups: contents, moment: moment}); + res.render('backupSnaps',{backups: contents, moment: moment, humanFileSize: humanFileSize}); }).catch(()=>{ res.send(); }); diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/toolbox.js b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/toolbox.js new file mode 100644 index 0000000..8ee7eb0 --- /dev/null +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/tools/toolbox.js @@ -0,0 +1,23 @@ + +// Found on Stackoverflow, perfect code :D https://stackoverflow.com/a/14919494/8654475 +function humanFileSize(bytes, si=false, dp=1) { + const thresh = si ? 1000 : 1024; + + if (Math.abs(bytes) < thresh) { + return bytes + ' B'; + } + + const units = si ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB']; + let u = -1; + const r = 10**dp; + + do { + bytes /= thresh; + ++u; + } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1); + + + return bytes.toFixed(dp) + ' ' + units[u]; +} + +exports.humanFileSize = humanFileSize \ No newline at end of file diff --git a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/backupSnaps.ejs b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/backupSnaps.ejs index f689897..ad9d65f 100644 --- a/nextcloud_backup/rootfs/opt/nextcloud_backup/views/backupSnaps.ejs +++ b/nextcloud_backup/rootfs/opt/nextcloud_backup/views/backupSnaps.ejs @@ -32,6 +32,11 @@ value="<%=moment(backups[index].lastmod).format('MMM D, YYYY HH:mm')%>" /> +
+ + +