smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1096 from harsha-mangena/i1095-consistancy-issue 

[fixes]ZIM size being advertized inconsistently between MB and MiB
This commit is contained in:
Veloman Yunkan 2024-06-24 12:50:29 +04:00 committed by GitHub
parent beab8d7041 97832c8436
commit 964131ce47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
static/skin/index.js
View File

@ -78,15 +78,21 @@
return result; return result;
} }
function humanFriendlyNumStr(num, precision) {
const n = Math.abs(num).toFixed().length;
return num.toFixed(Math.max(0, precision - n));
}
const humanFriendlySize = (fileSize) => { const humanFriendlySize = (fileSize) => {
if (fileSize === 0) { if (fileSize === 0) {
return ''; return '';
} }
const units = ['bytes', 'kB', 'MB', 'GB', 'TB']; const units = ['bytes', 'KiB', 'MiB', 'GiB', 'TiB'];
let quotient = Math.floor(Math.log10(fileSize) / 3); let quotient = Math.floor(Math.log2(fileSize) / 10);
quotient = quotient < units.length ? quotient : units.length - 1; quotient = Math.min(quotient, units.length - 1);
fileSize /= (1000 ** quotient); fileSize /= (1024 ** quotient);
return `${+fileSize.toFixed(2)} ${units[quotient]}`; const fileSizeStr = humanFriendlyNumStr(fileSize, 3);
return `${fileSizeStr} ${units[quotient]}`;
}; };
const humanFriendlyTitle = (title) => { const humanFriendlyTitle = (title) => {

4
test/server.cpp
View File

@ -63,7 +63,7 @@ const ResourceCollection resources200Compressible{
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/index.css?cacheid=1e78e7cf" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/index.css?cacheid=1e78e7cf" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/index.js?cacheid=436e0a63" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/index.js?cacheid=f43eb0b9" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" },
@ -292,7 +292,7 @@ R"EXPECTEDRESULT( href="/ROOT%23%3F/skin/kiwix.css?cacheid=2158fad9"
<script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=ee7d95b5" defer></script> <script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=ee7d95b5" defer></script>
<script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script> <script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
<script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script> <script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
<script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=436e0a63" defer></script> <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=f43eb0b9" defer></script>
<img src="/ROOT%23%3F/skin/feed.svg?cacheid=055b333f" <img src="/ROOT%23%3F/skin/feed.svg?cacheid=055b333f"
<img src="/ROOT%23%3F/skin/langSelector.svg?cacheid=00b59961" <img src="/ROOT%23%3F/skin/langSelector.svg?cacheid=00b59961"
)EXPECTEDRESULT" )EXPECTEDRESULT"