| - | ' + links +
+ ' | ' + hsz];
for (var b = 0; b < tagord.length; b++) {
var k = esc(tagord[b]),
@@ -19240,7 +19259,8 @@ var treectl = (function () {
var cl = /\.PARTIAL$/.exec(fname) ? ' class="fade"' : '',
ln = ['| ' + tn.lead + ' | ' + hname + '', tn.sz];
+ top + tn.href + '" id="' + id + '">' + hname +
+ ' | ' + filesizefun(tn.sz)];
for (var b = 0; b < res.taglist.length; b++) {
var k = esc(res.taglist[b]),
@@ -20086,6 +20106,31 @@ var settheme = (function () {
})();
+var setfszf = (function () {
+ function freshen() {
+ var cb = ebi('fszfmt'),
+ fmt = sread("fszfmt", humansize_fmts) || window.dfszf;
+ if (!has(humansize_fmts, fmt))
+ fmt = '1';
+ window.filesizefun = window['humansize_' + fmt];
+ cb.onchange = onch;
+ if (cb.value != fmt)
+ cb.value = fmt;
+ }
+ function onch(e) {
+ ev(e);
+ setfmt(ebi('fszfmt').value)
+ }
+ function setfmt(fmt) {
+ swrite("fszfmt", fmt);
+ freshen();
+ treectl.gentab(get_evpath(), treectl.lsc);
+ }
+ freshen();
+ return setfmt;
+})();
+
+
(function () {
function freshen() {
lang = sread("cpp_lang", LANGS) || lang;
@@ -21245,14 +21290,6 @@ function reload_browser() {
ebi('path').appendChild(o);
}
- var oo = QSA('#files>tbody>tr>td:nth-child(3)');
- for (var a = 0, aa = oo.length; a < aa; a++) {
- var sz = oo[a].textContent.replace(/ +/g, ""),
- hsz = sz.replace(/\B(?=(\d{3})+(?!\d))/g, " ");
-
- oo[a].textContent = hsz;
- }
-
reload_mp();
try { showsort(ftab); } catch (ex) { }
makeSortable(ftab, function () {
diff --git a/copyparty/web/util.js b/copyparty/web/util.js
index 5a8769a0..95043b4a 100644
--- a/copyparty/web/util.js
+++ b/copyparty/web/util.js
@@ -960,15 +960,93 @@ function f2f(val, nd) {
}
+var HSZ_U = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
function humansize(b, terse) {
- var i = 0, u = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
- while (b >= 1000 && i < u.length - 1) {
- b /= 1024;
- i += 1;
- }
+ var i = 0;
+ while (b >= 1000 && i < 5) { b /= 1024; i += 1; }
return (f2f(b, b >= 100 ? 0 : b >= 10 ? 1 : 2) +
- ' ' + (terse ? u[i].charAt(0) : u[i]));
+ ' ' + (terse ? HSZ_U[i].charAt(0) : HSZ_U[i]));
}
+function humansize_su(b) {
+ var i = 0;
+ while (b >= 1000 && i < 5) { b /= 1024; i += 1; }
+ return [b, HSZ_U[i]];
+}
+function humansize_0(b) {
+ return '' + b;
+}
+function humansize_1(b) {
+ return ('' + b).replace(/\B(?=(\d{3})+(?!\d))/g, " ");
+}
+function humansize_2g(b) {
+ var z = humansize_su(b), u = z[1].charAt(0); b = z[0];
+ return [f2f(b, b >= 100 ? 0 : b >= 10 ? 1 : 2) + ' ' + u, u];
+}
+function humansize_3g(b) {
+ var z = humansize_su(b), u = z[1].charAt(0); b = z[0];
+ return [f2f(b, b >= 10 ? 0 : 1) + ' ' + u, u];
+}
+function humansize_4g(b) {
+ var z = humansize_su(b), u = z[1]; b = z[0];
+ return [parseFloat(b.toFixed(b >= 100 ? 0 : b >= 10 ? 1 : 2)) + ' ' + u, u.charAt(0)];
+}
+function humansize_5g(b) {
+ var z = humansize_su(b), u = z[1]; b = z[0];
+ return [parseFloat(b.toFixed(b >= 10 ? 0 : 1)) + ' ' + u, u.charAt(0)];
+}
+function humansize_2(b) {
+ return humansize_2g(b)[0];
+}
+function humansize_3(b) {
+ return humansize_3g(b)[0];
+}
+function humansize_4(b) {
+ return humansize_4g(b)[0];
+}
+function humansize_5(b) {
+ return humansize_5g(b)[0];
+}
+function humansize_2c(b) {
+ var v = humansize_2g(b);
+ return '' + v[0] + '';
+}
+function humansize_3c(b) {
+ var v = humansize_3g(b);
+ return '' + v[0] + '';
+}
+function humansize_4c(b) {
+ var v = humansize_4g(b);
+ return '' + v[0] + '';
+}
+function humansize_5c(b) {
+ var v = humansize_5g(b);
+ return '' + v[0] + '';
+}
+function humansize_fuzzy(b) {
+ if (b <= 0) return "yes";
+ if (b <= 80) return "hullkort";
+ if (b <= 368640) return "5¼ DD";
+ if (b <= 1474560) return "save icon";
+ if (b <= 2880000) return "3½ Extended";
+ if (b <= 13107200) return "C90 Tape";
+ if (b <= 21000000) return "Floptical";
+ if (b <= 33554432) return "MPMan F10";
+ if (b <= 50000000) return "creditcardCD";
+ if (b <= 100663296) return "Zipdisk";
+ if (b <= 170000000) return "MD";
+ if (b <= 220200960) return "8cm CD";
+ if (b <= 737280000) return "CD-R";
+ if (b <= 900000000) return "UMD";
+ if (b <= 1300000000) return "GD-ROM";
+ if (b <= 4700000000) return "DVD";
+ if (b <= 9400000000) return "DVD-DL";
+ return "LTO";
+}
+var humansize_fmts = ['0', '1', '2', '2c', '3', '3c', '4', '4c', '5', '5c', 'fuzzy'];
+window.filesizefun = (function () {
+ var v = sread('fszfmt', humansize_fmts);
+ return window['humansize_' + (v || window.dfszf)] || humansize_1;
+})();
function humantime(v) {
diff --git a/tests/util.py b/tests/util.py
index 7438ab23..f8448474 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -155,7 +155,7 @@ class Cfg(Namespace):
ex = "gid uid"
ka.update(**{k: -1 for k in ex.split()})
- ex = "hash_mt hsortn qdel safe_dedup scan_pr_r scan_pr_s scan_st_r srch_time tail_fd tail_rate th_spec_p u2abort u2j u2sz unp_who"
+ ex = "hash_mt hsortn qdel safe_dedup scan_pr_r scan_pr_s scan_st_r srch_time tail_fd tail_rate th_spec_p u2abort u2j u2sz ui_filesz unp_who"
ka.update(**{k: 1 for k in ex.split()})
ex = "ac_convt au_vol dl_list du_iwho mtab_age reg_cap s_thead s_tbody tail_tmax tail_who th_convt ups_who ver_iwho zip_who"
| |