From 79fb240f91961c1f291d2bdffecb3c13bd813659 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 9 Aug 2023 19:07:33 +0200 Subject: [PATCH 1/2] Added 1024 base unit conversion --- src/app/components/fileupload/fileupload.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/fileupload/fileupload.ts b/src/app/components/fileupload/fileupload.ts index 8df13caae8b..d9ee118ed39 100755 --- a/src/app/components/fileupload/fileupload.ts +++ b/src/app/components/fileupload/fileupload.ts @@ -828,7 +828,7 @@ export class FileUpload implements AfterViewInit, AfterContentInit, OnInit, OnDe if (bytes == 0) { return '0 B'; } - let k = 1000, + let k = 1024, dm = 3, sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], i = Math.floor(Math.log(bytes) / Math.log(k)); From 35c42875327436cedb98e56e1c01dfa08b595879 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 9 Aug 2023 19:29:45 +0200 Subject: [PATCH 2/2] Refactor formatSize function --- src/app/components/fileupload/fileupload.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/app/components/fileupload/fileupload.ts b/src/app/components/fileupload/fileupload.ts index d9ee118ed39..561f1daf966 100755 --- a/src/app/components/fileupload/fileupload.ts +++ b/src/app/components/fileupload/fileupload.ts @@ -825,15 +825,18 @@ export class FileUpload implements AfterViewInit, AfterContentInit, OnInit, OnDe } formatSize(bytes: number) { - if (bytes == 0) { + const k = 1024; + const dm = 3; + const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + + if (bytes === 0) { return '0 B'; } - let k = 1024, - dm = 3, - sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], - i = Math.floor(Math.log(bytes) / Math.log(k)); - return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; + const i = Math.floor(Math.log(bytes) / Math.log(k)); + const formattedSize = (bytes / Math.pow(k, i)).toFixed(dm); + + return `${formattedSize} ${sizes[i]}`; } onBasicUploaderClick() {