upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

fix: Revert change that made OC.Util.humanFileSize return base 10 instead of base 2

Browse source 
Previously the `OC.Util.humanFileSize` was returning file sizes base 2, meaning 1024 bytes = 1 KiB, but the `@nextcloud/files` library had a regression that set the default to base 10. Meaning 1000 bytes = 1 KB.

This is fixed for current `@nextcloud/libraries` but for stable27 we need to fix this manually by wrapping the function.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2023-09-24 16:45:50 +02:00
parent e0adcc587e
commit eb73c0bafa
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/src/OC/util.js
View file

@ -64,9 +64,11 @@ export default {
History,
/**
* @deprecated use https://nextcloud.github.io/nextcloud-files/functions/formatFileSize.html
* @param {number} size Size in bytes
* @param {boolean} skipSmallSizes return '< 1 KiB' for small files
* @deprecated use `@nextcloud/files`, see https://nextcloud-libraries.github.io/nextcloud-files/functions/formatFileSize.html
*/
humanFileSize,
humanFileSize: (size, skipSmallSizes) => humanFileSize(size, skipSmallSizes, true).replace('iB', 'B'), // the replace is for backwards compatibility, where binary sizes but decimal units were used
/**
* Returns a file size in bytes from a humanly readable string
@ -87,20 +89,16 @@ export default {
let bytes = null
const bytesArray = {
'': 1,
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,
}
const matches = s.match(/^[\s+]?([0-9]*)(\.([0-9]+))?( +)?([kmgtp]?b?)$/i)
const matches = s.match(/^[\s+]?([0-9]*)(\.([0-9]+))?( +)?([kmgtp]?)i?b?$/i)
if (matches !== null) {
bytes = parseFloat(s)
if (!isFinite(bytes)) {