global-functions: $HumanReadableNum: indicate binary base...

... and update scripts to match the change.
This commit is contained in:
Christian Hesse 2024-04-07 21:11:03 +02:00
parent 36cf4d028b
commit 3015743b19
4 changed files with 11 additions and 7 deletions

View file

@ -578,11 +578,13 @@
:local Base [ :tonum $2 ];
:global EitherOr;
:global IfThenElse;
:local Prefix "kMGTPE";
:local Pow 1;
:set Base [ $EitherOr $Base 1024 ];
:local Bin [ $IfThenElse ($Base = 1024) "i" "" ];
:if ($Input < $Base) do={
:return $Input;
@ -595,9 +597,11 @@
:local Tmp1 ($Input * 100 / $Pow);
:local Tmp2 ($Tmp1 / 100);
:if ($Tmp2 >= 100) do={
:return ($Tmp2 . $Prefix);
:return ($Tmp2 . $Prefix . $Bin);
}
:return ($Tmp2 . "." . [ :pick $Tmp1 [ :len $Tmp2 ] ([ :len $Tmp1 ] - [ :len $Tmp2 ] + 1) ] . $Prefix);
:return ($Tmp2 . "." . \
[ :pick $Tmp1 [ :len $Tmp2 ] ([ :len $Tmp1 ] - [ :len $Tmp2 ] + 1) ] . \
$Prefix . $Bin);
}
}
}