From 6217393d6a713aada02961e10e3824bb1ccfe035 Mon Sep 17 00:00:00 2001 From: Patrick Paysant Date: Wed, 7 Dec 2016 10:38:54 +0100 Subject: [PATCH] Adding computerFileSize in OC.Util Signed-off-by: Lukas Reschke --- core/js/js.js | 46 +++++++++++++++++++++++++++++++++ core/js/tests/specs/coreSpec.js | 20 ++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/core/js/js.js b/core/js/js.js index 972f0e6314..2b14ded87d 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1625,6 +1625,51 @@ function humanFileSize(size, skipSmallSizes) { return relativeSize + ' ' + readableFormat; } +/** + * Returns a file size in bytes from a humanly readable string + * @param {string} string file size in human readable format + * @return {number} + * + * Makes 2kB to 2048. + * + * Inspired by computerFileSize in helper.php + */ +function computerFileSize(string) { + var s = string.toLowerCase(); + + if (!isNaN(parseFloat(s)) && isFinite(s)) { + return parseFloat(s); + } + + var bytes_array = { + 'b' : 1, + 'k' : 1024, + 'kb': 1024, + 'mb': 1024 * 1024, + 'm' : 1024 * 1024, + 'gb': 1024 * 1024 * 1024, + 'g' : 1024 * 1024 * 1024, + 'tb': 1024 * 1024 * 1024 * 1024, + 't' : 1024 * 1024 * 1024 * 1024, + 'pb': 1024 * 1024 * 1024 * 1024 * 1024, + 'p' : 1024 * 1024 * 1024 * 1024 * 1024 + }; + + var bytes = parseFloat(s); + + var matches = s.match(/([kmgtp]?b?)$/i); + if (matches[1]) { + bytes = bytes * bytes_array[matches[1]]; + } + else { + return false; + } + + bytes = Math.round(bytes); + console.log(bytes); + return bytes; +} + /** * Format an UNIX timestamp to a human understandable format * @param {number} timestamp UNIX timestamp @@ -1667,6 +1712,7 @@ function relative_modified_date(timestamp) { OC.Util = { // TODO: remove original functions from global namespace humanFileSize: humanFileSize, + computerFileSize: computerFileSize, /** * @param timestamp diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index d1734a9f3d..8ece9344b5 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -590,6 +590,26 @@ describe('Core base tests', function() { } }); }); + describe('computerFileSize', function() { + it('correctly parses file sizes from a human readable formated string', function() { + var data = [ + ['0 B', 0], + ['125 B', 125], + ['125b', 125], + ['125 KB', 128000], + ['125kb', 128000], + ['122.1 MB', 128031130, ], + ['122.1mb', 128031130, ], + ['119.2 GB', 127990025421], + ['119.2gb', 127990025421], + ['116.4 TB', 127983153473126], + ['116.4tb', 127983153473126] + ]; + for (var i = 0; i < data.length; i++) { + expect(OC.Util.computerFileSize(data[i][0])).toEqual(data[i][1]); + } + }); + }); describe('stripTime', function() { it('strips time from dates', function() { expect(OC.Util.stripTime(new Date(2014, 2, 24, 15, 4, 45, 24)))