v0.10.9

up2k: cheap progress bars
up2k: show realtime speeds
2021-04-17 01:29:27 +02:00 · 2021-04-17 00:57:35 +02:00 · 2021-04-17 00:01:03 +02:00 · 2021-04-16 23:49:57 +02:00 · 2021-04-16 21:23:53 +02:00 · 2021-04-14 16:03:15 +02:00
8 changed files with 407 additions and 97 deletions
--- a/.vscode/launch.py
+++ b/.vscode/launch.py
@@ -5,6 +5,7 @@

 import os
 import sys
+import shlex

 sys.path.insert(0, os.getcwd())

@@ -16,9 +17,16 @@ with open(".vscode/launch.json", "r") as f:

 oj = jstyleson.loads(tj)
 argv = oj["configurations"][0]["args"]
+
+try:
+    sargv = " ".join([shlex.quote(x) for x in argv])
+    print(sys.executable + " -m copyparty " + sargv + "\n")
+except:
+    pass
+
 argv = [os.path.expanduser(x) if x.startswith("~") else x for x in argv]
 try:
-    copyparty(argv)
+    copyparty(["a"] + argv)
 except SystemExit as ex:
    if ex.code:
        raise
--- a/copyparty/version.py
+++ b/copyparty/version.py
@@ -1,8 +1,8 @@
 # coding: utf-8

-VERSION = (0, 10, 8)
+VERSION = (0, 10, 9)
 CODENAME = "zip it"
-BUILD_DT = (2021, 4, 11)
+BUILD_DT = (2021, 4, 17)

 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)
--- a/copyparty/authsrv.py
+++ b/copyparty/authsrv.py
@@ -111,7 +111,27 @@ class VFS(object):
        if rem:
            rp += "/" + rem

-        return fsdec(os.path.realpath(fsenc(rp)))
+        try:
+            return fsdec(os.path.realpath(fsenc(rp)))
+        except:
+            if not WINDOWS:
+                raise
+
+            # cpython bug introduced in 3.8, still exists in 3.9.1;
+            # some win7sp1 and win10:20H2 boxes cannot realpath a
+            # networked drive letter such as b"n:" or b"n:\\"
+            #
+            # requirements to trigger:
+            #  * bytestring (not unicode str)
+            #  * just the drive letter (subfolders are ok)
+            #  * networked drive (regular disks and vmhgfs are ok)
+            #  * on an enterprise network (idk, cannot repro with samba)
+            #
+            # hits the following exceptions in succession:
+            #  * access denied at L601: "path = _getfinalpathname(path)"
+            #  * "cant concat str to bytes" at L621: "return path + tail"
+            #
+            return os.path.realpath(rp)

    def ls(self, rem, uname, scandir, lstat=False):
        """return user-readable [fsdir,real,virt] items at vpath"""
--- a/copyparty/up2k.py
+++ b/copyparty/up2k.py
@@ -1068,6 +1068,8 @@ class Up2k(object):
        with self.mutex:
            job = self.registry[ptop].get(wark, None)
            if not job:
+                known = " ".join([x for x in self.registry[ptop].keys()])
+                self.log("unknown wark [{}], known: {}".format(wark, known))
                raise Pebkac(400, "unknown wark")

            if chash not in job["need"]:
--- a/copyparty/web/browser.html
+++ b/copyparty/web/browser.html
@@ -13,8 +13,8 @@
 <body>
    <div id="ops">
        <a href="#" data-dest="" data-desc="close submenu">---</a>
-        <a href="#" data-perm="read" data-dest="search" data-desc="search for files by attributes, path/name, music tags, or any combination of those.&lt;br /&gt;&lt;br /&gt;&lt;code&gt;foo bar&lt;/code&gt; = must contain both foo and bar,&lt;br /&gt;&lt;code&gt;foo -bar&lt;/code&gt; = must contain foo but not bar,&lt;br /&gt;&lt;code&gt;^yana .opus$&lt;/code&gt; = must start with yana and have the opus extension">🔎</a>
        {%- if have_up2k_idx %}
+        <a href="#" data-perm="read" data-dest="search" data-desc="search for files by attributes, path/name, music tags, or any combination of those.&lt;br /&gt;&lt;br /&gt;&lt;code&gt;foo bar&lt;/code&gt; = must contain both foo and bar,&lt;br /&gt;&lt;code&gt;foo -bar&lt;/code&gt; = must contain foo but not bar,&lt;br /&gt;&lt;code&gt;^yana .opus$&lt;/code&gt; = must start with yana and have the opus extension">🔎</a>
        <a href="#" data-dest="up2k" data-desc="up2k: upload files (if you have write-access) or toggle into the search-mode and drag files onto the search button to see if they exist somewhere on the server">🚀</a>
        {%- else %}
        <a href="#" data-perm="write" data-dest="up2k" data-desc="up2k: upload files with resume support (close your browser and drop the same files in later)">🚀</a>
@@ -117,8 +117,8 @@
                <a href="#" id="selall">sel.<br />all</a>
                <a href="#" id="selinv">sel.<br />inv.</a>
                <a href="#" id="selzip">zip</a>
-            </span>
-            <a href="#" id="wtico">♫</a>
+            </span><a
+                href="#" id="wtico">♫</a>
        </div>
        <div id="widgeti">
            <div id="pctl"><a href="#" id="bprev">⏮</a><a href="#" id="bplay">▶</a><a href="#" id="bnext">⏭</a></div>
--- a/copyparty/web/up2k.js
+++ b/copyparty/web/up2k.js
@@ -132,6 +132,280 @@ function up2k_flagbus() {
    return flag;
 }

+
+function U2pvis(act, btns) {
+    this.act = act;
+    this.ctr = { "ok": 0, "ng": 0, "bz": 0, "q": 0 };
+    this.tab = [];
+    this.head = 0;
+    this.tail = -1;
+    this.wsz = 3;
+
+    this.addfile = function (entry) {
+        this.tab.push({
+            "hn": entry[0],
+            "ht": entry[1],
+            "hp": entry[2],
+            "in": 'q',
+            "nh": 0, //hashed
+            "nd": 0, //done
+            "pa": [], //percents
+            "pb": []  //active-list
+        });
+        this.ctr["q"]++;
+        this.drawcard("q");
+        if (this.act == "q") {
+            this.addrow(this.tab.length - 1);
+        }
+        if (this.act == "bz") {
+            this.bzw();
+        }
+    };
+
+    this.is_act = function (card) {
+        if (this.act == "done")
+            return card == "ok" || card == "ng";
+
+        return this.act == card;
+    }
+
+    this.seth = function (nfile, field, html) {
+        var fo = this.tab[nfile];
+        field = ['hn', 'ht', 'hp'][field];
+        fo[field] = html;
+        if (!this.is_act(fo.in))
+            return;
+
+        var obj = ebi('f{0}{1}'.format(nfile, field.slice(1)));
+        obj.innerHTML = html;
+        if (field == 'hp') {
+            obj.style.color = '';
+            obj.style.background = '';
+        }
+    };
+
+    this.setab = function (nfile, blocks) {
+        var t = [];
+        for (var a = 0; a < blocks; a++)
+            t.push(0);
+
+        this.tab[nfile].pa = t;
+    };
+
+    this.perc = function (n, t, e, sz, t0) {
+        var p = (n + e) * 100.0 / t,
+            td = new Date().getTime() - t0,
+            pp = (td / 1000) / p,
+            spd = (sz / 100) / pp,
+            eta = pp * (100 - p);
+
+        return [p, s2ms(eta), spd / (1024 * 1024)];
+    };
+
+    this.hashed = function (fobj) {
+        var fo = this.tab[fobj.n];
+        fo.nh++;
+        var p = this.perc(fo.nh, fo.pa.length, 0, fobj.size, fobj.t1);
+        fo.hp = '{0}%, {1}, {2} MB/s'.format(
+            p[0].toFixed(2), p[1], p[2].toFixed(2)
+        );
+        if (!this.is_act(fo.in))
+            return;
+
+        var obj = ebi('f{0}p'.format(fobj.n));
+        obj.innerHTML = fo.hp;
+        obj.style.color = '#fff';
+        var o1 = p[0] - 2, o2 = p[0] - 0.1, o3 = p[0];
+        obj.style.background = 'linear-gradient(90deg, #025, #06a ' + o1 + '%, #08d ' + o2 + '%, #333 ' + o3 + '%)';
+    };
+
+    this.prog = function (fobj, nchunk, percent) {
+        var fo = this.tab[fobj.n], pb = fo.pb;
+        var i = pb.indexOf(nchunk);
+        fo.pa[nchunk] = percent;
+        if (percent == 101) {
+            fo.nd++;
+            if (i >= 0)
+                pb.splice(i);
+        }
+        else if (i == -1) {
+            pb.push(nchunk);
+        }
+
+        var extra = 0;
+        for (var a = 0; a < pb.length; a++)
+            extra += fo.pa[a];
+
+        extra /= fo.pa.length;
+
+        var p = this.perc(fo.nd, fo.pa.length, extra, fobj.size, fobj.t3);
+        fo.hp = '{0}%, {1}, {2} MB/s'.format(
+            p[0].toFixed(2), p[1], p[2].toFixed(2)
+        );
+
+        if (!this.is_act(fo.in))
+            return;
+
+        var obj = ebi('f{0}p'.format(fobj.n));
+        obj.innerHTML = fo.hp;
+        obj.style.color = '#fff';
+        var o1 = p[0] - 2, o2 = p[0] - 0.1, o3 = p[0];
+        obj.style.background = 'linear-gradient(90deg, #050, #270 ' + o1 + '%, #4b0 ' + o2 + '%, #333 ' + o3 + '%)';
+    };
+
+    this.move = function (nfile, newcat) {
+        var fo = this.tab[nfile],
+            oldcat = fo.in,
+            bz_act = this.act == "bz";
+
+        if (oldcat == newcat) {
+            throw 42;
+        }
+
+        fo.in = newcat;
+        this.ctr[oldcat]--;
+        this.ctr[newcat]++;
+        this.drawcard(oldcat);
+        this.drawcard(newcat);
+        if (this.is_act(newcat)) {
+            this.tail++;
+            if (!ebi('f' + nfile))
+                this.addrow(nfile);
+        }
+        else if (this.is_act(oldcat)) {
+            this.head++;
+            if (!bz_act) {
+                var tr = ebi("f" + nfile);
+                tr.parentNode.removeChild(tr);
+            }
+        }
+        if (bz_act) {
+            this.bzw();
+        }
+    };
+
+    this.bzw_log = function (first, last) {
+        console.log("first %d   head %d   tail %d   last %d", first, this.head, this.tail, last);
+        var trs = document.querySelectorAll('#u2tab>tbody>tr'), msg = [];
+        for (var a = 0; a < trs.length; a++)
+            msg.push(trs[a].getAttribute('id'));
+
+        console.log(msg.join(' '));
+    }
+
+    this.bzw = function () {
+        var first = document.querySelector('#u2tab>tbody>tr:first-child');
+        if (!first)
+            return;
+
+        var last = document.querySelector('#u2tab>tbody>tr:last-child');
+        first = parseInt(first.getAttribute('id').slice(1));
+        last = parseInt(last.getAttribute('id').slice(1));
+        //this.bzw_log(first, last);
+
+        while (this.head - first > this.wsz) {
+            var obj = ebi('f' + (first++));
+            obj.parentNode.removeChild(obj);
+        }
+        while (last - this.tail < this.wsz && last < this.tab.length - 2) {
+            var obj = ebi('f' + (++last));
+            if (!obj)
+                this.addrow(last);
+        }
+        //this.bzw_log(first, last);
+        //console.log('--');
+    };
+
+    this.drawcard = function (cat) {
+        var cards = document.querySelectorAll('#u2cards>a>span');
+
+        if (cat == "q") {
+            cards[4].innerHTML = this.ctr[cat];
+            return;
+        }
+        if (cat == "bz") {
+            cards[3].innerHTML = this.ctr[cat];
+            return;
+        }
+
+        cards[2].innerHTML = this.ctr["ok"] + this.ctr["ng"];
+
+        if (cat == "ng") {
+            cards[1].innerHTML = this.ctr[cat];
+        }
+        if (cat == "ok") {
+            cards[0].innerHTML = this.ctr[cat];
+        }
+    };
+
+    this.changecard = function (card) {
+        this.act = card;
+        var html = [];
+        this.head = -1;
+        this.tail = -1;
+        for (var a = 0; a < this.tab.length; a++) {
+            var rt = this.tab[a].in;
+            if (this.is_act(rt)) {
+                html.push(this.genrow(a, true));
+
+                this.tail = a;
+                if (this.head == -1)
+                    this.head = a;
+            }
+        }
+        if (this.head == -1) {
+            this.head = this.tab.length;
+            this.tail = this.head - 1;
+        }
+        if (card == "bz") {
+            for (var a = this.head - 1; a >= this.head - this.wsz && a >= 0; a--) {
+                html.unshift(this.genrow(a, true).replace(/><td>/, "><td>a "));
+            }
+            for (var a = this.tail + 1; a <= this.tail + this.wsz && a < this.tab.length; a++) {
+                html.push(this.genrow(a, true).replace(/><td>/, "><td>b "));
+            }
+        }
+        ebi('u2tab').tBodies[0].innerHTML = html.join('\n');
+    };
+
+    this.genrow = function (nfile, as_html) {
+        var r = this.tab[nfile],
+            td1 = '<td id="f' + nfile,
+            td = '</td>' + td1,
+            ret = td1 + 'n">' + r.hn +
+                td + 't">' + r.ht +
+                td + 'p" class="prog">' + r.hp + '</td>';
+
+        if (as_html)
+            return '<tr id="f' + nfile + '">' + ret + '</tr>';
+
+        var obj = document.createElement('tr');
+        obj.setAttribute('id', 'f' + nfile);
+        obj.innerHTML = ret;
+        return obj;
+    };
+
+    this.addrow = function (nfile) {
+        var tr = this.genrow(nfile);
+        ebi('u2tab').tBodies[0].appendChild(tr);
+    };
+
+    var that = this;
+    btns = document.querySelectorAll(btns + '>a[act]');
+    for (var a = 0; a < btns.length; a++) {
+        btns[a].onclick = function (e) {
+            ev(e);
+            var newtab = this.getAttribute('act');
+            for (var b = 0; b < btns.length; b++) {
+                btns[b].className = (
+                    btns[b].getAttribute('act') == newtab) ? 'act' : '';
+            }
+            that.changecard(newtab);
+        };
+    }
+}
+
+
 function up2k_init(have_crypto) {
    //have_crypto = false;
    var need_filereader_cache = undefined;
@@ -216,10 +490,6 @@ function up2k_init(have_crypto) {
    var flag_en = bcfg_get('flag_en', false);
    var fsearch = bcfg_get('fsearch', false);

-    var col_hashing = '#00bbff';
-    var col_hashed = '#004466';
-    var col_uploading = '#ffcc44';
-    var col_uploaded = '#00bb00';
    var fdom_ctr = 0;
    var st = {
        "files": [],
@@ -239,6 +509,8 @@ function up2k_init(have_crypto) {
        }
    };

+    var pvis = new U2pvis("bz", '#u2cards');
+
    var bobslice = null;
    if (window.File)
        bobslice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
@@ -413,12 +685,12 @@ function up2k_init(have_crypto) {
            if (skip)
                continue;

-            var tr = document.createElement('tr');
-            tr.innerHTML = '<td id="f{0}n"></td><td id="f{0}t">hashing</td><td id="f{0}p" class="prog"></td>'.format(st.files.length);
-            tr.getElementsByTagName('td')[0].innerHTML = fsearch ? esc(entry.name) : linksplit(
-                esc(uricom_dec(entry.purl)[0] + entry.name)).join(' ');
-            ebi('u2tab').appendChild(tr);
-
+            pvis.addfile([
+                fsearch ? esc(entry.name) : linksplit(
+                    esc(uricom_dec(entry.purl)[0] + entry.name)).join(' '),
+                '📐 hash',
+                ''
+            ]);
            st.files.push(entry);
            st.todo.hash.push(entry);
        }
@@ -439,7 +711,10 @@ function up2k_init(have_crypto) {
        for (var a = 0; a < st.files.length; a++) {
            var t = st.files[a];
            if (t.done && t.name) {
-                var tr = ebi('f{0}p'.format(t.n)).parentNode;
+                var tr = ebi('f' + t.n);
+                if (!tr)
+                    continue;
+
                tr.parentNode.removeChild(tr);
                t.name = undefined;
            }
@@ -462,7 +737,8 @@ function up2k_init(have_crypto) {
    function hashing_permitted() {
        if (multitask) {
            var ahead = st.bytes.hashed - st.bytes.uploaded;
-            return ahead < 1024 * 1024 * 128;
+            return ahead < 1024 * 1024 * 128 &&
+                st.todo.handshake.length + st.busy.handshake.length < 16;
        }
        return handshakes_permitted() && 0 ==
            st.todo.handshake.length +
@@ -695,13 +971,8 @@ function up2k_init(have_crypto) {
        if (!need_filereader_cache)
            subchunks = 1;

-        var pb_html = '';
-        var pb_perc = 99.9 / nchunks;
-        for (var a = 0; a < nchunks; a++)
-            pb_html += '<div id="f{0}p{1}" style="width:{2}%"><div></div></div>'.format(
-                t.n, a, pb_perc);
-
-        ebi('f{0}p'.format(t.n)).innerHTML = pb_html;
+        pvis.setab(t.n, nchunks);
+        pvis.move(t.n, 'bz');

        var reader = new FileReader();

@@ -719,8 +990,6 @@ function up2k_init(have_crypto) {

            reader.readAsArrayBuffer(
                bobslice.call(t.fobj, car, cdr));
-
-            prog(t.n, nchunk, col_hashing);
        };

        var segm_load = function (e) {
@@ -764,9 +1033,8 @@ function up2k_init(have_crypto) {
            var b64str = buf2b64(hslice).replace(/=$/, '');
            t.hash.push(b64str);

-            prog(t.n, nchunk, col_hashed);
+            pvis.hashed(t);
            if (++nchunk < nchunks) {
-                prog(t.n, nchunk, col_hashing);
                return segm_next();
            }

@@ -776,7 +1044,8 @@ function up2k_init(have_crypto) {
                alert('{0} ms, {1} MB/s\n'.format(t.t2 - t.t1, spd.toFixed(3)) + t.hash.join('\n'));
            }

-            ebi('f{0}t'.format(t.n)).innerHTML = 'connecting';
+            pvis.seth(t.n, 2, 'hashing done');
+            pvis.seth(t.n, 1, '📦 wait');
            st.busy.hash.splice(st.busy.hash.indexOf(t), 1);
            st.todo.handshake.push(t);
        };
@@ -821,8 +1090,9 @@ function up2k_init(have_crypto) {

                        msg += '<br /><small>' + tr + ' (srv), ' + tu + ' (You), ' + sdiff + '</span></span>';
                    }
-                    ebi('f{0}p'.format(t.n)).innerHTML = msg;
-                    ebi('f{0}t'.format(t.n)).innerHTML = smsg;
+                    pvis.seth(t.n, 2, msg);
+                    pvis.seth(t.n, 1, smsg);
+                    pvis.move(t.n, smsg == '404' ? 'ng' : 'ok');
                    st.busy.handshake.splice(st.busy.handshake.indexOf(t), 1);
                    st.bytes.uploaded += t.size;
                    t.done = true;
@@ -833,7 +1103,7 @@ function up2k_init(have_crypto) {
                if (response.name !== t.name) {
                    // file exists; server renamed us
                    t.name = response.name;
-                    ebi('f{0}n'.format(t.n)).innerHTML = linksplit(esc(t.purl + t.name)).join(' ');
+                    pvis.seth(t.n, 0, linksplit(esc(t.purl + t.name)).join(' '));
                }

                t.postlist = [];
@@ -847,9 +1117,6 @@ function up2k_init(have_crypto) {

                    t.postlist.push(idx);
                }
-                for (var a = 0; a < t.hash.length; a++)
-                    prog(t.n, a, (t.postlist.indexOf(a) == -1)
-                        ? col_uploaded : col_hashed);

                var done = true;
                var msg = '&#x1f3b7;&#x1f41b;';
@@ -863,7 +1130,7 @@ function up2k_init(have_crypto) {
                    msg = 'uploading';
                    done = false;
                }
-                ebi('f{0}t'.format(t.n)).innerHTML = msg;
+                pvis.seth(t.n, 1, msg);
                st.busy.handshake.splice(st.busy.handshake.indexOf(t), 1);

                if (done) {
@@ -871,8 +1138,9 @@ function up2k_init(have_crypto) {
                    st.bytes.uploaded += t.size - t.bytes_uploaded;
                    var spd1 = (t.size / ((t.t2 - t.t1) / 1000.)) / (1024 * 1024.);
                    var spd2 = (t.size / ((t.t4 - t.t3) / 1000.)) / (1024 * 1024.);
-                    ebi('f{0}p'.format(t.n)).innerHTML = 'hash {0}, up {1} MB/s'.format(
-                        spd1.toFixed(2), spd2.toFixed(2));
+                    pvis.seth(t.n, 2, 'hash {0}, up {1} MB/s'.format(
+                        spd1.toFixed(2), spd2.toFixed(2)));
+                    pvis.move(t.n, 'ok');
                }
                else t.t4 = undefined;

@@ -899,18 +1167,19 @@ function up2k_init(have_crypto) {
                    }
                }
                if (err != "") {
-                    ebi('f{0}t'.format(t.n)).innerHTML = "ERROR";
-                    ebi('f{0}p'.format(t.n)).innerHTML = err;
+                    pvis.seth(t.n, 1, "ERROR");
+                    pvis.seth(t.n, 2, err);
+                    pvis.move(t.n, 'ng');

                    st.busy.handshake.splice(st.busy.handshake.indexOf(t), 1);
                    tasker();
                    return;
                }
-                alert("server broke (error {0}):\n\"{1}\"\n".format(
-                    xhr.status,
-                    (xhr.response && xhr.response.err) ||
-                    (xhr.responseText && xhr.responseText) ||
-                    "no further information"));
+                alert("server broke; hs-err {0} on file [{1}]:\n".format(
+                    xhr.status, t.name) + (
+                        (xhr.response && xhr.response.err) ||
+                        (xhr.responseText && xhr.responseText) ||
+                        "no further information"));
            }
        };

@@ -940,7 +1209,7 @@ function up2k_init(have_crypto) {
        var npart = upt.npart;
        var t = st.files[upt.nfile];

-        prog(t.n, npart, col_uploading);
+        pvis.seth(t.n, 1, "🚀 send");

        var chunksize = get_chunksize(t.size);
        var car = npart * chunksize;
@@ -958,28 +1227,28 @@ function up2k_init(have_crypto) {
            var xhr = new XMLHttpRequest();
            xhr.upload.onprogress = function (xev) {
                var perc = xev.loaded / (cdr - car) * 100;
-                prog(t.n, npart, '', perc);
+                pvis.prog(t, npart, perc, t);
            };
            xhr.onload = function (xev) {
                if (xhr.status == 200) {
-                    prog(t.n, npart, col_uploaded);
+                    pvis.prog(t, npart, 101, t);
                    st.bytes.uploaded += cdr - car;
                    t.bytes_uploaded += cdr - car;
                    st.busy.upload.splice(st.busy.upload.indexOf(upt), 1);
                    t.postlist.splice(t.postlist.indexOf(npart), 1);
                    if (t.postlist.length == 0) {
                        t.t4 = new Date().getTime();
-                        ebi('f{0}t'.format(t.n)).innerHTML = 'verifying';
+                        pvis.seth(t.n, 1, 'verifying');
                        st.todo.handshake.unshift(t);
                    }
                    tasker();
                }
                else
-                    alert("server broke (error {0}):\n\"{1}\"\n".format(
-                        xhr.status,
-                        (xhr.response && xhr.response.err) ||
-                        (xhr.responseText && xhr.responseText) ||
-                        "no further information"));
+                    alert("server broke; cu-err {0} on file [{1}]:\n".format(
+                        xhr.status, t.name) + (
+                            (xhr.response && xhr.response.err) ||
+                            (xhr.responseText && xhr.responseText) ||
+                            "no further information"));
            };
            xhr.open('POST', t.purl + 'chunkpit.php', true);
            //xhr.setRequestHeader("X-Up2k-Hash", t.hash[npart].substr(1) + "x");
@@ -999,24 +1268,6 @@ function up2k_init(have_crypto) {
        reader.readAsArrayBuffer(bobslice.call(t.fobj, car, cdr));
    }

-    /////
-    ////
-    ///   progress bar
-    //
-
-    function prog(nfile, nchunk, color, percent) {
-        var n1 = ebi('f{0}p{1}'.format(nfile, nchunk));
-        var n2 = n1.getElementsByTagName('div')[0];
-        if (percent === undefined) {
-            n1.style.background = color;
-            n2.style.display = 'none';
-        }
-        else {
-            n2.style.width = percent + '%';
-            n2.style.display = 'block';
-        }
-    }
-
    /////
    ////
    ///   config ui
@@ -1035,6 +1286,7 @@ function up2k_init(have_crypto) {
        if (btn.parentNode !== parent) {
            parent.appendChild(btn);
            ebi('u2conf').setAttribute('class', wide ? 'has_btn' : '');
+            ebi('u2cards').setAttribute('class', wide ? 'w' : '');
        }
    }
    window.addEventListener('resize', onresize);
--- a/copyparty/web/upload.css
+++ b/copyparty/web/upload.css
@@ -47,6 +47,11 @@
 	margin: -1.5em 0;
 	padding: .8em 0;
 	width: 100%;
+	max-width: 12em;
+	display: inline-block;
+}
+#u2conf #u2btn_cw {
+	text-align: right;
 }
 #u2notbtn {
 	display: none;
@@ -72,6 +77,7 @@
 }
 #u2tab td:nth-child(2) {
 	width: 5em;
+	white-space: nowrap;
 }
 #u2tab td:nth-child(3) {
 	width: 40%;
@@ -83,6 +89,35 @@
 #u2tab tr+tr:hover td {
 	background: #222;
 }
+#u2cards {
+	margin: 2.5em auto -2.5em auto;
+	text-align: center;
+}
+#u2cards.w {
+	width: 45em;
+	text-align: left;
+}
+#u2cards a {
+	padding: .2em 1em;
+	border: 1px solid #777;
+	border-width: 0 0 1px 0;
+	background: linear-gradient(to bottom, #333, #222);
+}
+#u2cards a:first-child {
+	border-radius: .4em 0 0 0;
+}
+#u2cards a:last-child {
+	border-radius: 0 .4em 0 0;
+}
+#u2cards a.act {
+	border-width: 1px 1px 0 1px;
+	border-radius: .3em .3em 0 0;
+	margin-left: -1px;
+	background: transparent;
+}
+#u2cards span {
+	color: #fff;
+}
 #u2conf {
 	margin: 1em auto;
 	width: 30em;
@@ -193,24 +228,6 @@
 .prog {
 	font-family: monospace;
 }
-.prog>div {
-	display: inline-block;
-	position: relative;
-	overflow: hidden;
-	margin: 0;
-	padding: 0;
-	height: 1.1em;
-	margin-bottom: -.15em;
-	box-shadow: -1px -1px 0 inset rgba(255,255,255,0.1);
-}
-.prog>div>div {
-	width: 0%;
-	position: absolute;
-	left: 0;
-	top: 0;
-	bottom: 0;
-	background: #0a0;
-}
 #u2tab a>span {
 	font-weight: bold;
 	font-style: italic;
--- a/copyparty/web/upload.html
+++ b/copyparty/web/upload.html
@@ -79,12 +79,23 @@
                </div>
            </div>

+            <div id="u2cards">
+                <a href="#" act="ok">ok <span>0</span></a><a
+                href="#" act="ng">ng <span>0</span></a><a
+                href="#" act="done">done <span>0</span></a><a
+                href="#" act="bz" class="act">busy <span>0</span></a><a
+                href="#" act="q">que <span>0</span></a>
+            </div>
+
            <table id="u2tab">
-                <tr>
-                    <td>filename</td>
-                    <td>status</td>
-                    <td>progress<a href="#" id="u2cleanup">cleanup</a></td>
-                </tr>
+                <thead>
+                    <tr>
+                        <td>filename</td>
+                        <td>status</td>
+                        <td>progress<a href="#" id="u2cleanup">cleanup</a></td>
+                    </tr>
+                </thead>
+                <tbody></tbody>
            </table>

            <p id="u2foot"></p>
Author	SHA1	Message	Date
ed	aff8185f2e	v0.10.9	2021-04-17 01:29:27 +02:00
ed	217d15fe81	up2k: cheap progress bars	2021-04-17 00:57:35 +02:00
ed	171e93c201	up2k: show realtime speeds	2021-04-17 00:01:03 +02:00
ed	acc1d2e9e3	up2k: show some context in the busy-tab	2021-04-16 23:49:57 +02:00
ed	49c2f37154	up2k: replace progressbars with text	2021-04-16 21:23:53 +02:00
ed	69e54497aa	yes good	2021-04-14 16:03:15 +02:00
ed	9aa1885669	hide search tab when d2d	2021-04-14 15:23:25 +02:00
ed	4418508513	dodge cpython bug	2021-04-14 14:37:44 +02:00