mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-27 20:19:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Share/Pool size calculation: show and allow percentage values

Browse Source
This commit is contained in:
bergware
2023-04-25 09:37:38 +02:00
parent 327e04e882
commit 5cedfe7dcd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/dynamix/DeviceInfo.page
View File

@@ -39,14 +39,14 @@ function presetSpace($val) {
[$dot,$comma] = str_split(_var($display,'number','.,'));
$size = _var($disk,'fsSize',0);
$size = $size>0 ? round(100*$val/$size,1) : 0;
$unit = '%';
if ($size < 1) {
$units = ['KB','MB','GB','TB','PB','EB','ZB','YB'];
$base = $val>0 ? floor(log($val,1000)) : 0;
$size = round($val/pow(1000,$base),1);
return number_format($size,$size-floor($size)?1:0,$dot,$comma).' '._var($units,$base);
} else {
return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' %' : '';
$unit = ._var($units,$base);
}
return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' '.$unit : '';
}
function fsSize() {
global $disks,$pools;

6
plugins/dynamix/ShareEdit.page
View File

@@ -67,14 +67,14 @@ function presetSpace($val) {
$pool = _var($shares[$name],'cachePool');
$size = _var($fsSize,$pool,0);
$size = $size>0 ? round(100*$val/$size,1) : 0;
$unit = '%';
if ($size < 1) {
$units = ['KB','MB','GB','TB','PB','EB','ZB','YB'];
$base = $val>0 ? floor(log($val,1000)) : 0;
$size = round($val/pow(1000,$base),1);
return number_format($size,$size-floor($size)?1:0,$dot,$comma).' '._var($units,$base);
} else {
return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' %' : '';
$unit = ._var($units,$base);
}
return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' '.$unit : '';
}
function fsSize() {
global $disks,$pools;