add mistake

README.md

@@ -23,7 +23,6 @@ turn your phone or raspi into a portable file server with resumable uploads/down
         * [on debian](#on-debian)
     * [notes](#notes)
     * [status](#status)
-    * [testimonials](#testimonials)
 * [bugs](#bugs)
     * [general bugs](#general-bugs)
     * [not my bugs](#not-my-bugs)
@@ -46,7 +45,6 @@ turn your phone or raspi into a portable file server with resumable uploads/down
 * [browser support](#browser-support)
 * [client examples](#client-examples)
 * [up2k](#up2k)
-* [performance](#performance)
 * [dependencies](#dependencies)
     * [optional dependencies](#optional-dependencies)
     * [install recommended deps](#install-recommended-deps)
@@ -145,13 +143,6 @@ summary: all planned features work! now please enjoy the bloatening
   * ☑ editor (sure why not)
 
 
-## testimonials
-
-small collection of user feedback
-
-`good enough`, `surprisingly correct`, `certified good software`, `just works`, `why`
-
-
 # bugs
 
 * Windows: python 3.7 and older cannot read tags with ffprobe, so use mutagen or upgrade
@@ -495,23 +486,6 @@ quick outline of the up2k protocol, see [uploading](#uploading) for the web-clie
 * client does another handshake with the hashlist; server replies with OK or a list of chunks to reupload
 
 
-# performance
-
-defaults are good for most cases, don't mind the `cannot efficiently use multiple CPU cores` message, it's very unlikely to be a problem
-
-below are some tweaks roughly ordered by usefulness:
-
-* `-q` disables logging and can help a bunch, even when combined with `-lo` to redirect logs to file
-* `--http-only` or `--https-only` (unless you want to support both protocols) will reduce the delay before a new connection is established
-* `--hist` pointing to a fast location (ssd) will make directory listings and searches faster when `-e2d` or `-e2t` is set
-* `--no-hash` when indexing a networked disk if you don't care about the actual filehashes and only want the names/tags searchable
-* `-j` enables multiprocessing (actual multithreading) and can make copyparty perform better in cpu-intensive workloads, for example:
-  * huge amount of short-lived connections
-  * really heavy traffic (downloads/uploads)
-  
-  ...however it adds an overhead to internal communication so it might be a net loss, see if it works 4 u
-
-
 # dependencies
 
 * `jinja2` (is built into the SFX)
@@ -644,7 +618,6 @@ roughly sorted by priority
 * reduce up2k roundtrips
   * start from a chunk index and just go
   * terminate client on bad data
-* logging to file
 
 discarded ideas
 
@@ -664,6 +637,3 @@ discarded ideas
   * nah
 * look into android thumbnail cache file format
   * absolutely not
-* indexedDB for hashes, cfg enable/clear/sz, 2gb avail, ~9k for 1g, ~4k for 100m, 500k items before autoeviction
-  * blank hashlist when up-ok to skip handshake
-    * too many confusing side-effects

contrib/nginx/copyparty.conf

@@ -1,15 +1,7 @@
-# when running copyparty behind a reverse proxy,
-# the following arguments are recommended:
-#
-#   -nc 512         important, see next paragraph
-#   --http-only     lower latency on initial connection
-#   -i 127.0.0.1    only accept connections from nginx
-#
-# -nc must match or exceed the webserver's max number of concurrent clients;
-# nginx default is 512  (worker_processes 1, worker_connections 512)
-#
-# you may also consider adding -j0 for CPU-intensive configurations
-# (not that i can really think of any good examples)
+# when running copyparty behind a reverse-proxy,
+# make sure that copyparty allows at least as many clients as the proxy does,
+# so run copyparty with -nc 512 if your nginx has the default limits
+# (worker_processes 1, worker_connections 512)
 
 upstream cpp {
 	server 127.0.0.1:3923;

copyparty/__init__.py

@@ -9,9 +9,6 @@ import os
 PY2 = sys.version_info[0] == 2
 if PY2:
     sys.dont_write_bytecode = True
-    unicode = unicode
-else:
-    unicode = str
 
 WINDOWS = False
 if platform.system() == "Windows":

copyparty/__main__.py

@@ -20,7 +20,7 @@ import threading
 import traceback
 from textwrap import dedent
 
-from .__init__ import E, WINDOWS, VT100, PY2, unicode
+from .__init__ import E, WINDOWS, VT100, PY2
 from .__version__ import S_VERSION, S_BUILD_DT, CODENAME
 from .svchub import SvcHub
 from .util import py_desc, align_tab, IMPLICATIONS, alltrace
@@ -31,8 +31,6 @@ try:
 except:
     HAVE_SSL = False
 
-printed = ""
-
 
 class RiceFormatter(argparse.HelpFormatter):
     def _get_help_string(self, action):
@@ -63,15 +61,8 @@ class Dodge11874(RiceFormatter):
         super(Dodge11874, self).__init__(*args, **kwargs)
 
 
-def lprint(*a, **ka):
-    global printed
-
-    printed += " ".join(unicode(x) for x in a) + ka.get("end", "\n")
-    print(*a, **ka)
-
-
 def warn(msg):
-    lprint("\033[1mwarning:\033[0;33m {}\033[0m\n".format(msg))
+    print("\033[1mwarning:\033[0;33m {}\033[0m\n".format(msg))
 
 
 def ensure_locale():
@@ -82,7 +73,7 @@ def ensure_locale():
     ]:
         try:
             locale.setlocale(locale.LC_ALL, x)
-            lprint("Locale:", x)
+            print("Locale:", x)
             break
         except:
             continue
@@ -103,7 +94,7 @@ def ensure_cert():
 
     try:
         if filecmp.cmp(cert_cfg, cert_insec):
-            lprint(
+            print(
                 "\033[33m  using default TLS certificate; https will be insecure."
                 + "\033[36m\n  certificate location: {}\033[0m\n".format(cert_cfg)
             )
@@ -132,7 +123,7 @@ def configure_ssl_ver(al):
     if "help" in sslver:
         avail = [terse_sslver(x[6:]) for x in flags]
         avail = " ".join(sorted(avail) + ["all"])
-        lprint("\navailable ssl/tls versions:\n  " + avail)
+        print("\navailable ssl/tls versions:\n  " + avail)
         sys.exit(0)
 
     al.ssl_flags_en = 0
@@ -152,7 +143,7 @@ def configure_ssl_ver(al):
 
     for k in ["ssl_flags_en", "ssl_flags_de"]:
         num = getattr(al, k)
-        lprint("{}: {:8x} ({})".format(k, num, num))
+        print("{}: {:8x} ({})".format(k, num, num))
 
     # think i need that beer now
 
@@ -169,13 +160,13 @@ def configure_ssl_ciphers(al):
         try:
             ctx.set_ciphers(al.ciphers)
         except:
-            lprint("\n\033[1;31mfailed to set ciphers\033[0m\n")
+            print("\n\033[1;31mfailed to set ciphers\033[0m\n")
 
     if not hasattr(ctx, "get_ciphers"):
-        lprint("cannot read cipher list: openssl or python too old")
+        print("cannot read cipher list: openssl or python too old")
     else:
         ciphers = [x["description"] for x in ctx.get_ciphers()]
-        lprint("\n  ".join(["\nenabled ciphers:"] + align_tab(ciphers) + [""]))
+        print("\n  ".join(["\nenabled ciphers:"] + align_tab(ciphers) + [""]))
 
     if is_help:
         sys.exit(0)
@@ -258,18 +249,17 @@ def run_argparse(argv, formatter):
         ),
     )
     # fmt: off
-    ap2 = ap.add_argument_group('general options')
-    ap2.add_argument("-c", metavar="PATH", type=str, action="append", help="add config file")
-    ap2.add_argument("-nc", metavar="NUM", type=int, default=64, help="max num clients")
-    ap2.add_argument("-j", metavar="CORES", type=int, default=1, help="max num cpu cores")
-    ap2.add_argument("-a", metavar="ACCT", type=str, action="append", help="add account, USER:PASS; example [ed:wark")
-    ap2.add_argument("-v", metavar="VOL", type=str, action="append", help="add volume, SRC:DST:FLAG; example [.::r], [/mnt/nas/music:/music:r:aed")
-    ap2.add_argument("-ed", action="store_true", help="enable ?dots")
-    ap2.add_argument("-emp", action="store_true", help="enable markdown plugins")
-    ap2.add_argument("-mcr", metavar="SEC", type=int, default=60, help="md-editor mod-chk rate")
-    ap2.add_argument("--dotpart", action="store_true", help="dotfile incomplete uploads")
-    ap2.add_argument("--sparse", metavar="MiB", type=int, default=4, help="up2k min.size threshold (mswin-only)")
-    ap2.add_argument("--urlform", metavar="MODE", type=str, default="print,get", help="how to handle url-forms; examples: [stash], [save,get]")
+    ap.add_argument("-c", metavar="PATH", type=str, action="append", help="add config file")
+    ap.add_argument("-nc", metavar="NUM", type=int, default=64, help="max num clients")
+    ap.add_argument("-j", metavar="CORES", type=int, default=1, help="max num cpu cores")
+    ap.add_argument("-a", metavar="ACCT", type=str, action="append", help="add account, USER:PASS; example [ed:wark")
+    ap.add_argument("-v", metavar="VOL", type=str, action="append", help="add volume, SRC:DST:FLAG; example [.::r], [/mnt/nas/music:/music:r:aed")
+    ap.add_argument("-ed", action="store_true", help="enable ?dots")
+    ap.add_argument("-emp", action="store_true", help="enable markdown plugins")
+    ap.add_argument("-mcr", metavar="SEC", type=int, default=60, help="md-editor mod-chk rate")
+    ap.add_argument("--dotpart", action="store_true", help="dotfile incomplete uploads")
+    ap.add_argument("--sparse", metavar="MiB", type=int, default=4, help="up2k min.size threshold (mswin-only)")
+    ap.add_argument("--urlform", metavar="MODE", type=str, default="print,get", help="how to handle url-forms; examples: [stash], [save,get]")
 
     ap2 = ap.add_argument_group('network options')
     ap2.add_argument("-i", metavar="IP", type=str, default="0.0.0.0", help="ip to bind (comma-sep.)")
@@ -296,9 +286,7 @@ def run_argparse(argv, formatter):
 
     ap2 = ap.add_argument_group('logging options')
     ap2.add_argument("-q", action="store_true", help="quiet")
-    ap2.add_argument("-lo", metavar="PATH", type=str, help="logfile, example: cpp-%%Y-%%m%%d-%%H%%M%%S.txt.xz")
     ap2.add_argument("--log-conn", action="store_true", help="print tcp-server msgs")
-    ap2.add_argument("--log-htp", action="store_true", help="print http-server threadpool scaling")
     ap2.add_argument("--ihead", metavar="HEADER", action='append', help="dump incoming header")
     ap2.add_argument("--lf-url", metavar="RE", type=str, default=r"^/\.cpr/|\?th=[wj]$", help="dont log URLs matching")
 
@@ -336,6 +324,9 @@ def run_argparse(argv, formatter):
     ap2.add_argument("-mtp", metavar="M=[f,]bin", action="append", type=str, help="read tag M using bin")
     ap2.add_argument("--srch-time", metavar="SEC", type=int, default=30, help="search deadline")
 
+    ap2 = ap.add_argument_group('video streaming options')
+    ap2.add_argument("--vcr", action="store_true", help="enable video streaming")
+
     ap2 = ap.add_argument_group('appearance options')
     ap2.add_argument("--css-browser", metavar="L", help="URL to additional CSS to include")
 
@@ -343,7 +334,6 @@ def run_argparse(argv, formatter):
     ap2.add_argument("--no-sendfile", action="store_true", help="disable sendfile")
     ap2.add_argument("--no-scandir", action="store_true", help="disable scandir")
     ap2.add_argument("--no-fastboot", action="store_true", help="wait for up2k indexing")
-    ap2.add_argument("--no-htp", action="store_true", help="disable httpserver threadpool, create threads as-needed instead")
     ap2.add_argument("--stackmon", metavar="P,S", help="write stacktrace to Path every S second")
     
     return ap.parse_args(args=argv[1:])
@@ -361,7 +351,7 @@ def main(argv=None):
     desc = py_desc().replace("[", "\033[1;30m[")
 
     f = '\033[36mcopyparty v{} "\033[35m{}\033[36m" ({})\n{}\033[0m\n'
-    lprint(f.format(S_VERSION, CODENAME, S_BUILD_DT, desc))
+    print(f.format(S_VERSION, CODENAME, S_BUILD_DT, desc))
 
     ensure_locale()
     if HAVE_SSL:
@@ -375,7 +365,7 @@ def main(argv=None):
             continue
 
         msg = "\033[1;31mWARNING:\033[0;1m\n  {} \033[0;33mwas replaced with\033[0;1m {} \033[0;33mand will be removed\n\033[0m"
-        lprint(msg.format(dk, nk))
+        print(msg.format(dk, nk))
         argv[idx] = nk
         time.sleep(2)
 
@@ -429,7 +419,7 @@ def main(argv=None):
 
     # signal.signal(signal.SIGINT, sighandler)
 
-    SvcHub(al, argv, printed).run()
+    SvcHub(al).run()
 
 
 if __name__ == "__main__":

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (0, 11, 34)
+VERSION = (0, 11, 29)
 CODENAME = "the grid"
-BUILD_DT = (2021, 7, 9)
+BUILD_DT = (2021, 6, 30)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/authsrv.py

@@ -10,14 +10,13 @@ import hashlib
 import threading
 
 from .__init__ import WINDOWS
-from .util import IMPLICATIONS, uncyg, undot, Pebkac, fsdec, fsenc, statdir
+from .util import IMPLICATIONS, uncyg, undot, Pebkac, fsdec, fsenc, statdir, nuprint
 
 
 class VFS(object):
     """single level in the virtual fs"""
 
-    def __init__(self, log, realpath, vpath, uread=[], uwrite=[], uadm=[], flags={}):
-        self.log = log
+    def __init__(self, realpath, vpath, uread=[], uwrite=[], uadm=[], flags={}):
         self.realpath = realpath  # absolute path on host filesystem
         self.vpath = vpath  # absolute path in the virtual filesystem
         self.uread = uread  # users who can read this
@@ -63,7 +62,6 @@ class VFS(object):
                 return self.nodes[name].add(src, dst)
 
             vn = VFS(
-                self.log,
                 os.path.join(self.realpath, name) if self.realpath else None,
                 "{}/{}".format(self.vpath, name).lstrip("/"),
                 self.uread,
@@ -81,7 +79,7 @@ class VFS(object):
 
         # leaf does not exist; create and keep permissions blank
         vp = "{}/{}".format(self.vpath, dst).lstrip("/")
-        vn = VFS(self.log, src, vp)
+        vn = VFS(src, vp)
         vn.dbv = self.dbv or self
         self.nodes[dst] = vn
         return vn
@@ -183,7 +181,7 @@ class VFS(object):
         """return user-readable [fsdir,real,virt] items at vpath"""
         virt_vis = {}  # nodes readable by user
         abspath = self.canonical(rem)
-        real = list(statdir(self.log, scandir, lstat, abspath))
+        real = list(statdir(nuprint, scandir, lstat, abspath))
         real.sort()
         if not rem:
             for name, vn2 in sorted(self.nodes.items()):
@@ -210,13 +208,8 @@ class VFS(object):
             rem, uname, scandir, incl_wo=False, lstat=lstat
         )
 
-        if (
-            seen
-            and (not fsroot.startswith(seen[-1]) or fsroot == seen[-1])
-            and fsroot in seen
-        ):
-            m = "bailing from symlink loop,\n  prev: {}\n  curr: {}\n  from: {}/{}"
-            self.log("vfs.walk", m.format(seen[-1], fsroot, self.vpath, rem), 3)
+        if seen and not fsroot.startswith(seen[-1]) and fsroot in seen:
+            print("bailing from symlink loop,\n  {}\n  {}".format(seen[-1], fsroot))
             return
 
         seen = seen[:] + [fsroot]
@@ -249,10 +242,6 @@ class VFS(object):
         if flt:
             flt = {k: True for k in flt}
 
-        f1 = "{0}.hist{0}up2k.".format(os.sep)
-        f2a = os.sep + "dir.txt"
-        f2b = "{0}.hist{0}".format(os.sep)
-
         for vpath, apath, files, rd, vd in self.walk(
             "", vrem, [], uname, dots, scandir, False
         ):
@@ -286,11 +275,7 @@ class VFS(object):
                     del vd[x]
 
             # up2k filetring based on actual abspath
-            files = [
-                x
-                for x in files
-                if f1 not in x[1] and (not x[1].endswith(f2a) or f2b not in x[1])
-            ]
+            files = [x for x in files if "{0}.hist{0}up2k.".format(os.sep) not in x[1]]
 
             for f in [{"vp": v, "ap": a, "st": n[1]} for v, a, n in files]:
                 yield f
@@ -481,7 +466,7 @@ class AuthSrv(object):
                         )
                     except:
                         m = "\n\033[1;31m\nerror in config file {} on line {}:\n\033[0m"
-                        self.log(m.format(cfg_fn, self.line_ctr), 1)
+                        print(m.format(cfg_fn, self.line_ctr))
                         raise
 
         # case-insensitive; normalize
@@ -497,10 +482,10 @@ class AuthSrv(object):
 
         if not mount:
             # -h says our defaults are CWD at root and read/write for everyone
-            vfs = VFS(self.log_func, os.path.abspath("."), "", ["*"], ["*"])
+            vfs = VFS(os.path.abspath("."), "", ["*"], ["*"])
         elif "" not in mount:
             # there's volumes but no root; make root inaccessible
-            vfs = VFS(self.log_func, None, "")
+            vfs = VFS(None, "")
             vfs.flags["d2d"] = True
 
         maxdepth = 0
@@ -512,13 +497,7 @@ class AuthSrv(object):
             if dst == "":
                 # rootfs was mapped; fully replaces the default CWD vfs
                 vfs = VFS(
-                    self.log_func,
-                    mount[dst],
-                    dst,
-                    mread[dst],
-                    mwrite[dst],
-                    madm[dst],
-                    mflags[dst],
+                    mount[dst], dst, mread[dst], mwrite[dst], madm[dst], mflags[dst]
                 )
                 continue
 
@@ -801,7 +780,7 @@ class AuthSrv(object):
                         msg = [x[1] for x in files]
 
                     if msg:
-                        self.log("\n" + "\n".join(msg))
+                        nuprint("\n".join(msg))
 
                 if n_bads and flag_p:
                     raise Exception("found symlink leaving volume, and strict is set")

copyparty/broker_mp.py

@@ -4,11 +4,17 @@ from __future__ import print_function, unicode_literals
 import time
 import threading
 
+from .__init__ import PY2, WINDOWS, VT100
 from .broker_util import try_exec
 from .broker_mpw import MpWorker
 from .util import mp
 
 
+if PY2 and not WINDOWS:
+    from multiprocessing.reduction import ForkingPickler
+    from StringIO import StringIO as MemesIO  # pylint: disable=import-error
+
+
 class BrokerMp(object):
     """external api; manages MpWorkers"""
 
@@ -36,6 +42,7 @@ class BrokerMp(object):
             proc.q_yield = q_yield
             proc.nid = n
             proc.clients = {}
+            proc.workload = 0
 
             thr = threading.Thread(
                 target=self.collector, args=(proc,), name="mp-collector"
@@ -46,6 +53,13 @@ class BrokerMp(object):
             self.procs.append(proc)
             proc.start()
 
+        if not self.args.q:
+            thr = threading.Thread(
+                target=self.debug_load_balancer, name="mp-dbg-loadbalancer"
+            )
+            thr.daemon = True
+            thr.start()
+
     def shutdown(self):
         self.log("broker", "shutting down")
         for n, proc in enumerate(self.procs):
@@ -75,6 +89,20 @@ class BrokerMp(object):
             if dest == "log":
                 self.log(*args)
 
+            elif dest == "workload":
+                with self.mutex:
+                    proc.workload = args[0]
+
+            elif dest == "httpdrop":
+                addr = args[0]
+
+                with self.mutex:
+                    del proc.clients[addr]
+                    if not proc.clients:
+                        proc.workload = 0
+
+                self.hub.tcpsrv.num_clients.add(-1)
+
             elif dest == "retq":
                 # response from previous ipc call
                 with self.retpend_mutex:
@@ -100,9 +128,38 @@ class BrokerMp(object):
         returns a Queue object which eventually contains the response if want_retval
         (not-impl here since nothing uses it yet)
         """
-        if dest == "listen":
-            for p in self.procs:
-                p.q_pend.put([0, dest, [args[0], len(self.procs)]])
+        if dest == "httpconn":
+            sck, addr = args
+            sck2 = sck
+            if PY2:
+                buf = MemesIO()
+                ForkingPickler(buf).dump(sck)
+                sck2 = buf.getvalue()
+
+            proc = sorted(self.procs, key=lambda x: x.workload)[0]
+            proc.q_pend.put([0, dest, [sck2, addr]])
+
+            with self.mutex:
+                proc.clients[addr] = 50
+                proc.workload += 50
 
         else:
             raise Exception("what is " + str(dest))
+
+    def debug_load_balancer(self):
+        fmt = "\033[1m{}\033[0;36m{:4}\033[0m "
+        if not VT100:
+            fmt = "({}{:4})"
+
+        last = ""
+        while self.procs:
+            msg = ""
+            for proc in self.procs:
+                msg += fmt.format(len(proc.clients), proc.workload)
+
+            if msg != last:
+                last = msg
+                with self.hub.log_mutex:
+                    print(msg)
+
+            time.sleep(0.1)

copyparty/broker_mpw.py

@@ -3,13 +3,18 @@ from __future__ import print_function, unicode_literals
 from copyparty.authsrv import AuthSrv
 
 import sys
+import time
 import signal
 import threading
 
+from .__init__ import PY2, WINDOWS
 from .broker_util import ExceptionalQueue
 from .httpsrv import HttpSrv
 from .util import FAKE_MP
 
+if PY2 and not WINDOWS:
+    import pickle  # nosec
+
 
 class MpWorker(object):
     """one single mp instance"""
@@ -20,11 +25,10 @@ class MpWorker(object):
         self.args = args
         self.n = n
 
-        self.log = self._log_disabled if args.q and not args.lo else self._log_enabled
-
         self.retpend = {}
         self.retpend_mutex = threading.Lock()
         self.mutex = threading.Lock()
+        self.workload_thr_alive = False
 
         # we inherited signal_handler from parent,
         # replace it with something harmless
@@ -36,6 +40,7 @@ class MpWorker(object):
 
         # instantiate all services here (TODO: inheritance?)
         self.httpsrv = HttpSrv(self, True)
+        self.httpsrv.disconnect_func = self.httpdrop
 
         # on winxp and some other platforms,
         # use thr.join() to block all signals
@@ -48,15 +53,15 @@ class MpWorker(object):
         # print('k')
         pass
 
-    def _log_enabled(self, src, msg, c=0):
+    def log(self, src, msg, c=0):
         self.q_yield.put([0, "log", [src, msg, c]])
 
-    def _log_disabled(self, src, msg, c=0):
-        pass
-
     def logw(self, msg, c=0):
         self.log("mp{}".format(self.n), msg, c)
 
+    def httpdrop(self, addr):
+        self.q_yield.put([0, "httpdrop", [addr]])
+
     def main(self):
         while True:
             retq_id, dest, args = self.q_pend.get()
@@ -68,8 +73,24 @@ class MpWorker(object):
                 sys.exit(0)
                 return
 
-            elif dest == "listen":
-                self.httpsrv.listen(args[0], args[1])
+            elif dest == "httpconn":
+                sck, addr = args
+                if PY2:
+                    sck = pickle.loads(sck)  # nosec
+
+                if self.args.log_conn:
+                    self.log("%s %s" % addr, "|%sC-qpop" % ("-" * 4,), c="1;30")
+
+                self.httpsrv.accept(sck, addr)
+
+                with self.mutex:
+                    if not self.workload_thr_alive:
+                        self.workload_thr_alive = True
+                        thr = threading.Thread(
+                            target=self.thr_workload, name="mpw-workload"
+                        )
+                        thr.daemon = True
+                        thr.start()
 
             elif dest == "retq":
                 # response from previous ipc call
@@ -93,3 +114,16 @@ class MpWorker(object):
 
         self.q_yield.put([retq_id, dest, args])
         return retq
+
+    def thr_workload(self):
+        """announce workloads to MpSrv (the mp controller / loadbalancer)"""
+        # avoid locking in extract_filedata by tracking difference here
+        while True:
+            time.sleep(0.2)
+            with self.mutex:
+                if self.httpsrv.num_clients() == 0:
+                    # no clients rn, termiante thread
+                    self.workload_thr_alive = False
+                    return
+
+            self.q_yield.put([0, "workload", [self.httpsrv.workload]])

copyparty/broker_thr.py

@@ -3,6 +3,7 @@ from __future__ import print_function, unicode_literals
 
 import threading
 
+from .authsrv import AuthSrv
 from .httpsrv import HttpSrv
 from .broker_util import ExceptionalQueue, try_exec
 
@@ -20,6 +21,7 @@ class BrokerThr(object):
 
         # instantiate all services here (TODO: inheritance?)
         self.httpsrv = HttpSrv(self)
+        self.httpsrv.disconnect_func = self.httpdrop
 
     def shutdown(self):
         # self.log("broker", "shutting down")
@@ -27,8 +29,12 @@ class BrokerThr(object):
         pass
 
     def put(self, want_retval, dest, *args):
-        if dest == "listen":
-            self.httpsrv.listen(args[0], 1)
+        if dest == "httpconn":
+            sck, addr = args
+            if self.args.log_conn:
+                self.log("%s %s" % addr, "|%sC-qpop" % ("-" * 4,), c="1;30")
+
+            self.httpsrv.accept(sck, addr)
 
         else:
             # new ipc invoking managed service in hub
@@ -45,3 +51,6 @@ class BrokerThr(object):
             retq = ExceptionalQueue(1)
             retq.put(rv)
             return retq
+
+    def httpdrop(self, addr):
+        self.hub.tcpsrv.num_clients.add(-1)

copyparty/httpcli.py

@@ -13,11 +13,16 @@ import ctypes
 from datetime import datetime
 import calendar
 
-from .__init__ import E, PY2, WINDOWS, ANYWIN, unicode
+from .__init__ import E, PY2, WINDOWS, ANYWIN
 from .util import *  # noqa  # pylint: disable=unused-wildcard-import
 from .authsrv import AuthSrv
 from .szip import StreamZip
 from .star import StreamTar
+from .vcr import VCR_Direct
+from .th_srv import FMT_FF
+
+if not PY2:
+    unicode = str
 
 
 NO_CACHE = {"Cache-Control": "no-cache"}
@@ -95,13 +100,9 @@ class HttpCli(object):
             try:
                 self.mode, self.req, self.http_ver = headerlines[0].split(" ")
             except:
-                msg = " ]\n#[ ".join(headerlines)
-                raise Pebkac(400, "bad headers:\n#[ " + msg + " ]")
+                raise Pebkac(400, "bad headers:\n" + "\n".join(headerlines))
 
         except Pebkac as ex:
-            self.mode = "GET"
-            self.req = "[junk]"
-            self.http_ver = "HTTP/1.1"
             # self.log("pebkac at httpcli.run #1: " + repr(ex))
             self.keepalive = self._check_nonfatal(ex)
             self.loud_reply(unicode(ex), status=ex.code)
@@ -230,7 +231,9 @@ class HttpCli(object):
     def send_headers(self, length, status=200, mime=None, headers={}):
         response = ["{} {} {}".format(self.http_ver, status, HTTPCODE[status])]
 
-        if length is not None:
+        if length is None:
+            self.keepalive = False
+        else:
             response.append("Content-Length: " + unicode(length))
 
         # close if unknown length, otherwise take client's preference
@@ -479,17 +482,15 @@ class HttpCli(object):
         addr = self.ip.replace(":", ".")
         fn = "put-{:.6f}-{}.bin".format(time.time(), addr)
         path = os.path.join(fdir, fn)
-        if self.args.nw:
-            path = os.devnull
 
         with open(fsenc(path), "wb", 512 * 1024) as f:
-            post_sz, _, sha_b64 = hashcopy(reader, f)
+            post_sz, _, sha_b64 = hashcopy(self.conn, reader, f)
 
-        if not self.args.nw:
-            vfs, vrem = vfs.get_dbv(rem)
-            self.conn.hsrv.broker.put(
-                False, "up2k.hash_file", vfs.realpath, vfs.flags, vrem, fn
-            )
+        vfs, vrem = vfs.get_dbv(rem)
+
+        self.conn.hsrv.broker.put(
+            False, "up2k.hash_file", vfs.realpath, vfs.flags, vrem, fn
+        )
 
         return post_sz, sha_b64, remains, path
 
@@ -610,14 +611,13 @@ class HttpCli(object):
                     os.makedirs(fsenc(dst))
             except OSError as ex:
                 self.log("makedirs failed [{}]".format(dst))
-                if not os.path.isdir(fsenc(dst)):
-                    if ex.errno == 13:
-                        raise Pebkac(500, "the server OS denied write-access")
+                if ex.errno == 13:
+                    raise Pebkac(500, "the server OS denied write-access")
 
-                    if ex.errno == 17:
-                        raise Pebkac(400, "some file got your folder name")
+                if ex.errno == 17:
+                    raise Pebkac(400, "some file got your folder name")
 
-                    raise Pebkac(500, min_ex())
+                raise Pebkac(500, min_ex())
             except:
                 raise Pebkac(500, min_ex())
 
@@ -715,7 +715,7 @@ class HttpCli(object):
 
         with open(fsenc(path), "rb+", 512 * 1024) as f:
             f.seek(cstart[0])
-            post_sz, _, sha_b64 = hashcopy(reader, f)
+            post_sz, _, sha_b64 = hashcopy(self.conn, reader, f)
 
             if sha_b64 != chash:
                 raise Pebkac(
@@ -882,7 +882,7 @@ class HttpCli(object):
                     with ren_open(fname, "wb", 512 * 1024, **open_args) as f:
                         f, fname = f["orz"]
                         self.log("writing to {}/{}".format(fdir, fname))
-                        sz, sha512_hex, _ = hashcopy(p_data, f)
+                        sz, sha512_hex, _ = hashcopy(self.conn, p_data, f)
                         if sz == 0:
                             raise Pebkac(400, "empty files in post")
 
@@ -1065,7 +1065,7 @@ class HttpCli(object):
             raise Pebkac(400, "expected body, got {}".format(p_field))
 
         with open(fsenc(fp), "wb", 512 * 1024) as f:
-            sz, sha512, _ = hashcopy(p_data, f)
+            sz, sha512, _ = hashcopy(self.conn, p_data, f)
 
         new_lastmod = os.stat(fsenc(fp)).st_mtime
         new_lastmod3 = int(new_lastmod * 1000)
@@ -1255,7 +1255,8 @@ class HttpCli(object):
             if use_sendfile:
                 remains = sendfile_kern(lower, upper, f, self.s)
             else:
-                remains = sendfile_py(lower, upper, f, self.s)
+                actor = self.conn if self.is_mp else None
+                remains = sendfile_py(lower, upper, f, self.s, actor)
 
         if remains > 0:
             logmsg += " \033[31m" + unicode(upper - remains) + "\033[0m"
@@ -1473,7 +1474,7 @@ class HttpCli(object):
         raise Pebkac(500, x)
 
     def tx_stack(self):
-        if not self.avol:
+        if not self.readable or not self.writable:
             raise Pebkac(403, "not admin")
 
         if self.args.no_stack:
@@ -1563,11 +1564,18 @@ class HttpCli(object):
             raise Pebkac(404)
 
         if self.readable:
-            if rem.startswith(".hist/up2k.") or (
-                rem.endswith("/dir.txt") and rem.startswith(".hist/th/")
-            ):
+            if rem.startswith(".hist/up2k."):
                 raise Pebkac(403)
 
+            if "vcr" in self.uparam:
+                ext = abspath.rsplit(".")[-1]
+                if not self.args.vcr or ext not in FMT_FF:
+                    raise Pebkac(403)
+
+                vcr = VCR_Direct(self, abspath)
+                vcr.run()
+                return False
+
             is_dir = stat.S_ISDIR(st.st_mode)
             th_fmt = self.uparam.get("th")
             if th_fmt is not None:

copyparty/httpconn.py

@@ -45,6 +45,7 @@ class HttpConn(object):
         self.stopping = False
         self.nreq = 0
         self.nbyte = 0
+        self.workload = 0
         self.u2idx = None
         self.log_func = hsrv.log
         self.lf_url = re.compile(self.args.lf_url) if self.args.lf_url else None
@@ -183,6 +184,11 @@ class HttpConn(object):
             self.sr = Unrecv(self.s)
 
         while not self.stopping:
+            if self.is_mp:
+                self.workload += 50
+                if self.workload >= 2 ** 31:
+                    self.workload = 100
+
             self.nreq += 1
             cli = HttpCli(self)
             if not cli.run():

copyparty/httpsrv.py

@@ -4,8 +4,8 @@ from __future__ import print_function, unicode_literals
 import os
 import sys
 import time
-import math
 import base64
+import struct
 import socket
 import threading
 
@@ -26,15 +26,9 @@ except ImportError:
     )
     sys.exit(1)
 
-from .__init__ import E, PY2, MACOS
-from .util import spack, min_ex
+from .__init__ import E, MACOS
 from .httpconn import HttpConn
 
-if PY2:
-    import Queue as queue
-else:
-    import queue
-
 
 class HttpSrv(object):
     """
@@ -49,19 +43,12 @@ class HttpSrv(object):
         self.log = broker.log
         self.asrv = broker.asrv
 
-        self.name = "httpsrv-i{:x}".format(os.getpid())
+        self.disconnect_func = None
         self.mutex = threading.Lock()
-        self.stopping = False
 
-        self.tp_nthr = 0  # actual
-        self.tp_ncli = 0  # fading
-        self.tp_time = None  # latest worker collect
-        self.tp_q = None if self.args.no_htp else queue.LifoQueue()
-
-        self.srvs = []
-        self.ncli = 0  # exact
-        self.clients = {}  # laggy
-        self.nclimax = 0
+        self.clients = {}
+        self.workload = 0
+        self.workload_thr_alive = False
         self.cb_ts = 0
         self.cb_v = 0
 
@@ -78,105 +65,10 @@ class HttpSrv(object):
         else:
             self.cert_path = None
 
-        if self.tp_q:
-            self.start_threads(4)
-
-            t = threading.Thread(target=self.thr_scaler)
-            t.daemon = True
-            t.start()
-
-    def start_threads(self, n):
-        self.tp_nthr += n
-        if self.args.log_htp:
-            self.log(self.name, "workers += {} = {}".format(n, self.tp_nthr), 6)
-
-        for _ in range(n):
-            thr = threading.Thread(
-                target=self.thr_poolw,
-                name="httpsrv-poolw",
-            )
-            thr.daemon = True
-            thr.start()
-
-    def stop_threads(self, n):
-        self.tp_nthr -= n
-        if self.args.log_htp:
-            self.log(self.name, "workers -= {} = {}".format(n, self.tp_nthr), 6)
-
-        for _ in range(n):
-            self.tp_q.put(None)
-
-    def thr_scaler(self):
-        while True:
-            time.sleep(2 if self.tp_ncli else 30)
-            with self.mutex:
-                self.tp_ncli = max(self.ncli, self.tp_ncli - 2)
-                if self.tp_nthr > self.tp_ncli + 8:
-                    self.stop_threads(4)
-
-    def listen(self, sck, nlisteners):
-        self.srvs.append(sck)
-        self.nclimax = math.ceil(self.args.nc * 1.0 / nlisteners)
-        t = threading.Thread(target=self.thr_listen, args=(sck,))
-        t.daemon = True
-        t.start()
-
-    def thr_listen(self, srv_sck):
-        """listens on a shared tcp server"""
-        ip, port = srv_sck.getsockname()
-        fno = srv_sck.fileno()
-        msg = "subscribed @ {}:{}  f{}".format(ip, port, fno)
-        self.log(self.name, msg)
-        while not self.stopping:
-            if self.args.log_conn:
-                self.log(self.name, "|%sC-ncli" % ("-" * 1,), c="1;30")
-
-            if self.ncli >= self.nclimax:
-                self.log(self.name, "at connection limit; waiting", 3)
-                while self.ncli >= self.nclimax:
-                    time.sleep(0.1)
-
-            if self.args.log_conn:
-                self.log(self.name, "|%sC-acc1" % ("-" * 2,), c="1;30")
-
-            try:
-                sck, addr = srv_sck.accept()
-            except (OSError, socket.error) as ex:
-                self.log(self.name, "accept({}): {}".format(fno, ex), c=6)
-                time.sleep(0.02)
-                continue
-
-            if self.args.log_conn:
-                m = "|{}C-acc2 \033[0;36m{} \033[3{}m{}".format(
-                    "-" * 3, ip, port % 8, port
-                )
-                self.log("%s %s" % addr, m, c="1;30")
-
-            self.accept(sck, addr)
-
     def accept(self, sck, addr):
         """takes an incoming tcp connection and creates a thread to handle it"""
-        now = time.time()
-
-        if self.tp_time and now - self.tp_time > 300:
-            self.tp_q = None
-
-        if self.tp_q:
-            self.tp_q.put((sck, addr))
-            with self.mutex:
-                self.ncli += 1
-                self.tp_time = self.tp_time or now
-                self.tp_ncli = max(self.tp_ncli, self.ncli + 1)
-                if self.tp_nthr < self.ncli + 4:
-                    self.start_threads(8)
-            return
-
-        if not self.args.no_htp:
-            m = "looks like the httpserver threadpool died; please make an issue on github and tell me the story of how you pulled that off, thanks and dog bless\n"
-            self.log(self.name, m, 1)
-
-        with self.mutex:
-            self.ncli += 1
+        if self.args.log_conn:
+            self.log("%s %s" % addr, "|%sC-cthr" % ("-" * 5,), c="1;30")
 
         thr = threading.Thread(
             target=self.thr_client,
@@ -186,34 +78,11 @@ class HttpSrv(object):
         thr.daemon = True
         thr.start()
 
-    def thr_poolw(self):
-        while True:
-            task = self.tp_q.get()
-            if not task:
-                break
-
-            with self.mutex:
-                self.tp_time = None
-
-            try:
-                sck, addr = task
-                me = threading.current_thread()
-                me.name = (
-                    "httpsrv-{}-{}".format(addr[0].split(".", 2)[-1][-6:], addr[1]),
-                )
-                self.thr_client(sck, addr)
-                me.name = "httpsrv-poolw"
-            except:
-                self.log(self.name, "thr_client: " + min_ex(), 3)
+    def num_clients(self):
+        with self.mutex:
+            return len(self.clients)
 
     def shutdown(self):
-        self.stopping = True
-        for srv in self.srvs:
-            try:
-                srv.close()
-            except:
-                pass
-
         clients = list(self.clients.keys())
         for cli in clients:
             try:
@@ -221,14 +90,7 @@ class HttpSrv(object):
             except:
                 pass
 
-        if self.tp_q:
-            self.stop_threads(self.tp_nthr)
-            for _ in range(10):
-                time.sleep(0.05)
-                if self.tp_q.empty():
-                    break
-
-        self.log("httpsrv-i" + str(os.getpid()), "ok bye")
+        self.log("httpsrv-n", "ok bye")
 
     def thr_client(self, sck, addr):
         """thread managing one tcp client"""
@@ -238,15 +100,25 @@ class HttpSrv(object):
         with self.mutex:
             self.clients[cli] = 0
 
+            if self.is_mp:
+                self.workload += 50
+                if not self.workload_thr_alive:
+                    self.workload_thr_alive = True
+                    thr = threading.Thread(
+                        target=self.thr_workload, name="httpsrv-workload"
+                    )
+                    thr.daemon = True
+                    thr.start()
+
         fno = sck.fileno()
         try:
             if self.args.log_conn:
-                self.log("%s %s" % addr, "|%sC-crun" % ("-" * 4,), c="1;30")
+                self.log("%s %s" % addr, "|%sC-crun" % ("-" * 6,), c="1;30")
 
             cli.run()
 
         except (OSError, socket.error) as ex:
-            if ex.errno not in [10038, 10054, 107, 57, 49, 9]:
+            if ex.errno not in [10038, 10054, 107, 57, 9]:
                 self.log(
                     "%s %s" % addr,
                     "run({}): {}".format(fno, ex),
@@ -256,7 +128,7 @@ class HttpSrv(object):
         finally:
             sck = cli.s
             if self.args.log_conn:
-                self.log("%s %s" % addr, "|%sC-cdone" % ("-" * 5,), c="1;30")
+                self.log("%s %s" % addr, "|%sC-cdone" % ("-" * 7,), c="1;30")
 
             try:
                 fno = sck.fileno()
@@ -280,7 +152,35 @@ class HttpSrv(object):
             finally:
                 with self.mutex:
                     del self.clients[cli]
-                    self.ncli -= 1
+
+                if self.disconnect_func:
+                    self.disconnect_func(addr)  # pylint: disable=not-callable
+
+    def thr_workload(self):
+        """indicates the python interpreter workload caused by this HttpSrv"""
+        # avoid locking in extract_filedata by tracking difference here
+        while True:
+            time.sleep(0.2)
+            with self.mutex:
+                if not self.clients:
+                    # no clients rn, termiante thread
+                    self.workload_thr_alive = False
+                    self.workload = 0
+                    return
+
+            total = 0
+            with self.mutex:
+                for cli in self.clients.keys():
+                    now = cli.workload
+                    delta = now - self.clients[cli]
+                    if delta < 0:
+                        # was reset in HttpCli to prevent overflow
+                        delta = now
+
+                    total += delta
+                    self.clients[cli] = now
+
+            self.workload = total
 
     def cachebuster(self):
         if time.time() - self.cb_ts < 1:
@@ -299,7 +199,7 @@ class HttpSrv(object):
             except:
                 pass
 
-            v = base64.urlsafe_b64encode(spack(b">xxL", int(v)))
+            v = base64.urlsafe_b64encode(struct.pack(">xxL", int(v)))
             self.cb_v = v.decode("ascii")[-4:]
             self.cb_ts = time.time()
             return self.cb_v

copyparty/mtag.py

@@ -7,9 +7,12 @@ import json
 import shutil
 import subprocess as sp
 
-from .__init__ import PY2, WINDOWS, unicode
+from .__init__ import PY2, WINDOWS
 from .util import fsenc, fsdec, uncyg, REKOBO_LKEY
 
+if not PY2:
+    unicode = str
+
 
 def have_ff(cmd):
     if PY2:

copyparty/svchub.py

@@ -5,12 +5,11 @@ import re
 import os
 import sys
 import time
-import shlex
 import threading
 from datetime import datetime, timedelta
 import calendar
 
-from .__init__ import E, PY2, WINDOWS, MACOS, VT100
+from .__init__ import PY2, WINDOWS, MACOS, VT100
 from .util import mp
 from .authsrv import AuthSrv
 from .tcpsrv import TcpSrv
@@ -29,18 +28,14 @@ class SvcHub(object):
     put() can return a queue (if want_reply=True) which has a blocking get() with the response.
     """
 
-    def __init__(self, args, argv, printed):
+    def __init__(self, args):
         self.args = args
-        self.argv = argv
-        self.logf = None
 
         self.ansi_re = re.compile("\033\\[[^m]*m")
         self.log_mutex = threading.Lock()
         self.next_day = 0
 
         self.log = self._log_disabled if args.q else self._log_enabled
-        if args.lo:
-            self._setup_logfile(printed)
 
         # initiate all services to manage
         self.asrv = AuthSrv(self.args, self.log, False)
@@ -74,52 +69,6 @@ class SvcHub(object):
 
         self.broker = Broker(self)
 
-    def _logname(self):
-        dt = datetime.utcfromtimestamp(time.time())
-        fn = self.args.lo
-        for fs in "YmdHMS":
-            fs = "%" + fs
-            if fs in fn:
-                fn = fn.replace(fs, dt.strftime(fs))
-
-        return fn
-
-    def _setup_logfile(self, printed):
-        base_fn = fn = sel_fn = self._logname()
-        if fn != self.args.lo:
-            ctr = 0
-            # yup this is a race; if started sufficiently concurrently, two
-            # copyparties can grab the same logfile (considered and ignored)
-            while os.path.exists(sel_fn):
-                ctr += 1
-                sel_fn = "{}.{}".format(fn, ctr)
-
-        fn = sel_fn
-
-        try:
-            import lzma
-
-            lh = lzma.open(fn, "wt", encoding="utf-8", errors="replace", preset=0)
-
-        except:
-            import codecs
-
-            lh = codecs.open(fn, "w", encoding="utf-8", errors="replace")
-
-        lh.base_fn = base_fn
-
-        argv = [sys.executable] + self.argv
-        if hasattr(shlex, "quote"):
-            argv = [shlex.quote(x) for x in argv]
-        else:
-            argv = ['"{}"'.format(x) for x in argv]
-
-        msg = "[+] opened logfile [{}]\n".format(fn)
-        printed += msg
-        lh.write("t0: {:.3f}\nargv: {}\n\n{}".format(E.t0, " ".join(argv), printed))
-        self.logf = lh
-        print(msg, end="")
-
     def run(self):
         thr = threading.Thread(target=self.tcpsrv.run, name="svchub-main")
         thr.daemon = True
@@ -150,36 +99,9 @@ class SvcHub(object):
             print("nailed it", end="")
         finally:
             print("\033[0m")
-            if self.logf:
-                self.logf.close()
 
     def _log_disabled(self, src, msg, c=0):
-        if not self.logf:
-            return
-
-        with self.log_mutex:
-            ts = datetime.utcfromtimestamp(time.time())
-            ts = ts.strftime("%Y-%m%d-%H%M%S.%f")[:-3]
-            self.logf.write("@{} [{}] {}\n".format(ts, src, msg))
-
-            now = time.time()
-            if now >= self.next_day:
-                self._set_next_day()
-
-    def _set_next_day(self):
-        if self.next_day and self.logf and self.logf.base_fn != self._logname():
-            self.logf.close()
-            self._setup_logfile("")
-
-        dt = datetime.utcfromtimestamp(time.time())
-
-        # unix timestamp of next 00:00:00 (leap-seconds safe)
-        day_now = dt.day
-        while dt.day == day_now:
-            dt += timedelta(hours=12)
-
-        dt = dt.replace(hour=0, minute=0, second=0)
-        self.next_day = calendar.timegm(dt.utctimetuple())
+        pass
 
     def _log_enabled(self, src, msg, c=0):
         """handles logging from all components"""
@@ -188,7 +110,14 @@ class SvcHub(object):
             if now >= self.next_day:
                 dt = datetime.utcfromtimestamp(now)
                 print("\033[36m{}\033[0m\n".format(dt.strftime("%Y-%m-%d")), end="")
-                self._set_next_day()
+
+                # unix timestamp of next 00:00:00 (leap-seconds safe)
+                day_now = dt.day
+                while dt.day == day_now:
+                    dt += timedelta(hours=12)
+
+                dt = dt.replace(hour=0, minute=0, second=0)
+                self.next_day = calendar.timegm(dt.utctimetuple())
 
             fmt = "\033[36m{} \033[33m{:21} \033[0m{}\n"
             if not VT100:
@@ -215,20 +144,20 @@ class SvcHub(object):
                 except:
                     print(msg.encode("ascii", "replace").decode(), end="")
 
-            if self.logf:
-                self.logf.write(msg)
-
     def check_mp_support(self):
         vmin = sys.version_info[1]
         if WINDOWS:
             msg = "need python 3.3 or newer for multiprocessing;"
-            if PY2 or vmin < 3:
+            if PY2:
+                # py2 pickler doesn't support winsock
+                return msg
+            elif vmin < 3:
                 return msg
         elif MACOS:
             return "multiprocessing is wonky on mac osx;"
         else:
-            msg = "need python 3.3+ for multiprocessing;"
-            if PY2 or vmin < 3:
+            msg = "need python 2.7 or 3.3+ for multiprocessing;"
+            if not PY2 and vmin < 3:
                 return msg
 
         try:
@@ -260,5 +189,5 @@ class SvcHub(object):
         if not err:
             return True
         else:
-            self.log("svchub", err)
+            self.log("root", err)
             return False

copyparty/szip.py

@@ -4,14 +4,15 @@ from __future__ import print_function, unicode_literals
 import os
 import time
 import zlib
+import struct
 from datetime import datetime
 
 from .sutil import errdesc
-from .util import yieldfile, sanitize_fn, spack, sunpack
+from .util import yieldfile, sanitize_fn
 
 
 def dostime2unix(buf):
-    t, d = sunpack(b"<HH", buf)
+    t, d = struct.unpack("<HH", buf)
 
     ts = (t & 0x1F) * 2
     tm = (t >> 5) & 0x3F
@@ -35,13 +36,13 @@ def unixtime2dos(ts):
 
     bd = ((dy - 1980) << 9) + (dm << 5) + dd
     bt = (th << 11) + (tm << 5) + ts // 2
-    return spack(b"<HH", bt, bd)
+    return struct.pack("<HH", bt, bd)
 
 
 def gen_fdesc(sz, crc32, z64):
     ret = b"\x50\x4b\x07\x08"
-    fmt = b"<LQQ" if z64 else b"<LLL"
-    ret += spack(fmt, crc32, sz, sz)
+    fmt = "<LQQ" if z64 else "<LLL"
+    ret += struct.pack(fmt, crc32, sz, sz)
     return ret
 
 
@@ -65,7 +66,7 @@ def gen_hdr(h_pos, fn, sz, lastmod, utf8, crc32, pre_crc):
     req_ver = b"\x2d\x00" if z64 else b"\x0a\x00"
 
     if crc32:
-        crc32 = spack(b"<L", crc32)
+        crc32 = struct.pack("<L", crc32)
     else:
         crc32 = b"\x00" * 4
 
@@ -86,14 +87,14 @@ def gen_hdr(h_pos, fn, sz, lastmod, utf8, crc32, pre_crc):
     # however infozip does actual sz and it even works on winxp
     # (same reasning for z64 extradata later)
     vsz = 0xFFFFFFFF if z64 else sz
-    ret += spack(b"<LL", vsz, vsz)
+    ret += struct.pack("<LL", vsz, vsz)
 
     # windows support (the "?" replace below too)
     fn = sanitize_fn(fn, ok="/")
     bfn = fn.encode("utf-8" if utf8 else "cp437", "replace").replace(b"?", b"_")
 
     z64_len = len(z64v) * 8 + 4 if z64v else 0
-    ret += spack(b"<HH", len(bfn), z64_len)
+    ret += struct.pack("<HH", len(bfn), z64_len)
 
     if h_pos is not None:
         # 2b comment, 2b diskno
@@ -105,12 +106,12 @@ def gen_hdr(h_pos, fn, sz, lastmod, utf8, crc32, pre_crc):
         ret += b"\x01\x00\x00\x00\xa4\x81"
 
         # 4b local-header-ofs
-        ret += spack(b"<L", min(h_pos, 0xFFFFFFFF))
+        ret += struct.pack("<L", min(h_pos, 0xFFFFFFFF))
 
     ret += bfn
 
     if z64v:
-        ret += spack(b"<HH" + b"Q" * len(z64v), 1, len(z64v) * 8, *z64v)
+        ret += struct.pack("<HH" + "Q" * len(z64v), 1, len(z64v) * 8, *z64v)
 
     return ret
 
@@ -135,7 +136,7 @@ def gen_ecdr(items, cdir_pos, cdir_end):
     need_64 = nitems == 0xFFFF or 0xFFFFFFFF in [csz, cpos]
 
     # 2b tnfiles, 2b dnfiles, 4b dir sz, 4b dir pos
-    ret += spack(b"<HHLL", nitems, nitems, csz, cpos)
+    ret += struct.pack("<HHLL", nitems, nitems, csz, cpos)
 
     # 2b comment length
     ret += b"\x00\x00"
@@ -162,7 +163,7 @@ def gen_ecdr64(items, cdir_pos, cdir_end):
 
     # 8b tnfiles, 8b dnfiles, 8b dir sz, 8b dir pos
     cdir_sz = cdir_end - cdir_pos
-    ret += spack(b"<QQQQ", len(items), len(items), cdir_sz, cdir_pos)
+    ret += struct.pack("<QQQQ", len(items), len(items), cdir_sz, cdir_pos)
 
     return ret
 
@@ -177,7 +178,7 @@ def gen_ecdr64_loc(ecdr64_pos):
     ret = b"\x50\x4b\x06\x07"
 
     # 4b cdisk, 8b start of ecdr64, 4b ndisks
-    ret += spack(b"<LQL", 0, ecdr64_pos, 1)
+    ret += struct.pack("<LQL", 0, ecdr64_pos, 1)
 
     return ret
 

copyparty/tcpsrv.py

@@ -2,9 +2,11 @@
 from __future__ import print_function, unicode_literals
 
 import re
+import time
 import socket
+import select
 
-from .util import chkcmd
+from .util import chkcmd, Counter
 
 
 class TcpSrv(object):
@@ -18,6 +20,7 @@ class TcpSrv(object):
         self.args = hub.args
         self.log = hub.log
 
+        self.num_clients = Counter()
         self.stopping = False
 
         ip = "127.0.0.1"
@@ -63,13 +66,44 @@ class TcpSrv(object):
         for srv in self.srv:
             srv.listen(self.args.nc)
             ip, port = srv.getsockname()
-            fno = srv.fileno()
-            msg = "listening @ {}:{}  f{}".format(ip, port, fno)
-            self.log("tcpsrv", msg)
-            if self.args.q:
-                print(msg)
+            self.log("tcpsrv", "listening @ {0}:{1}".format(ip, port))
 
-            self.hub.broker.put(False, "listen", srv)
+        while not self.stopping:
+            if self.args.log_conn:
+                self.log("tcpsrv", "|%sC-ncli" % ("-" * 1,), c="1;30")
+
+            if self.num_clients.v >= self.args.nc:
+                time.sleep(0.1)
+                continue
+
+            if self.args.log_conn:
+                self.log("tcpsrv", "|%sC-acc1" % ("-" * 2,), c="1;30")
+
+            try:
+                # macos throws bad-fd
+                ready, _, _ = select.select(self.srv, [], [])
+            except:
+                ready = []
+                if not self.stopping:
+                    raise
+
+            for srv in ready:
+                if self.stopping:
+                    break
+
+                sck, addr = srv.accept()
+                sip, sport = srv.getsockname()
+                if self.args.log_conn:
+                    self.log(
+                        "%s %s" % addr,
+                        "|{}C-acc2 \033[0;36m{} \033[3{}m{}".format(
+                            "-" * 3, sip, sport % 8, sport
+                        ),
+                        c="1;30",
+                    )
+
+                self.num_clients.add()
+                self.hub.broker.put(False, "httpconn", sck, addr)
 
     def shutdown(self):
         self.stopping = True

copyparty/th_srv.py

@@ -9,11 +9,15 @@ import hashlib
 import threading
 import subprocess as sp
 
-from .__init__ import PY2, unicode
+from .__init__ import PY2
 from .util import fsenc, runcmd, Queue, Cooldown, BytesIO, min_ex
 from .mtag import HAVE_FFMPEG, HAVE_FFPROBE, ffprobe
 
 
+if not PY2:
+    unicode = str
+
+
 HAVE_PIL = False
 HAVE_HEIF = False
 HAVE_AVIF = False

copyparty/up2k.py

@@ -103,15 +103,13 @@ class Up2k(object):
             self.deferred_init()
         else:
             t = threading.Thread(
-                target=self.deferred_init, name="up2k-deferred-init", args=(0.5,)
+                target=self.deferred_init,
+                name="up2k-deferred-init",
             )
             t.daemon = True
             t.start()
 
-    def deferred_init(self, wait=0):
-        if wait:
-            time.sleep(wait)
-
+    def deferred_init(self):
         all_vols = self.asrv.vfs.all_vols
         have_e2d = self.init_indexes(all_vols)
 
@@ -344,15 +342,7 @@ class Up2k(object):
             for k, v in flags.items()
         ]
         if a:
-            vpath = "?"
-            for k, v in self.asrv.vfs.all_vols.items():
-                if v.realpath == ptop:
-                    vpath = k
-
-            if vpath:
-                vpath += "/"
-
-            self.log("/{} {}".format(vpath, " ".join(sorted(a))), "35")
+            self.log(" ".join(sorted(a)) + "\033[0m")
 
         reg = {}
         path = os.path.join(histpath, "up2k.snap")
@@ -411,7 +401,7 @@ class Up2k(object):
             if WINDOWS:
                 excl = [x.replace("/", "\\") for x in excl]
 
-            n_add = self._build_dir(dbw, top, set(excl), top, nohash, [])
+            n_add = self._build_dir(dbw, top, set(excl), top, nohash)
             n_rm = self._drop_lost(dbw[0], top)
             if dbw[1]:
                 self.log("commit {} new files".format(dbw[1]))
@@ -419,25 +409,11 @@ class Up2k(object):
 
             return True, n_add or n_rm or do_vac
 
-    def _build_dir(self, dbw, top, excl, cdir, nohash, seen):
-        rcdir = cdir
-        if not ANYWIN:
-            try:
-                # a bit expensive but worth
-                rcdir = os.path.realpath(cdir)
-            except:
-                pass
-
-        if rcdir in seen:
-            m = "bailing from symlink loop,\n  prev: {}\n  curr: {}\n  from: {}"
-            self.log(m.format(seen[-1], rcdir, cdir), 3)
-            return 0
-
-        seen = seen + [cdir]
+    def _build_dir(self, dbw, top, excl, cdir, nohash):
         self.pp.msg = "a{} {}".format(self.pp.n, cdir)
         histpath = self.asrv.vfs.histtab[top]
         ret = 0
-        g = statdir(self.log_func, not self.args.no_scandir, False, cdir)
+        g = statdir(self.log, not self.args.no_scandir, False, cdir)
         for iname, inf in sorted(g):
             abspath = os.path.join(cdir, iname)
             lmod = int(inf.st_mtime)
@@ -446,7 +422,7 @@ class Up2k(object):
                 if abspath in excl or abspath == histpath:
                     continue
                 # self.log(" dir: {}".format(abspath))
-                ret += self._build_dir(dbw, top, excl, abspath, nohash, seen)
+                ret += self._build_dir(dbw, top, excl, abspath, nohash)
             else:
                 # self.log("file: {}".format(abspath))
                 rp = abspath[len(top) + 1 :]
@@ -1071,9 +1047,8 @@ class Up2k(object):
                         pdir = os.path.join(cj["ptop"], cj["prel"])
                         job["name"] = self._untaken(pdir, cj["name"], now, cj["addr"])
                         dst = os.path.join(job["ptop"], job["prel"], job["name"])
-                        if not self.args.nw:
-                            os.unlink(fsenc(dst))  # TODO ed pls
-                            self._symlink(src, dst)
+                        os.unlink(fsenc(dst))  # TODO ed pls
+                        self._symlink(src, dst)
 
             if not job:
                 job = {

copyparty/util.py

@@ -42,20 +42,6 @@ else:
     from Queue import Queue  # pylint: disable=import-error,no-name-in-module
     from StringIO import StringIO as BytesIO
 
-
-try:
-    struct.unpack(b">i", b"idgi")
-    spack = struct.pack
-    sunpack = struct.unpack
-except:
-
-    def spack(f, *a, **ka):
-        return struct.pack(f.decode("ascii"), *a, **ka)
-
-    def sunpack(f, *a, **ka):
-        return struct.unpack(f.decode("ascii"), *a, **ka)
-
-
 surrogateescape.register_surrogateescape()
 FS_ENCODING = sys.getfilesystemencoding()
 if WINDOWS and PY2:
@@ -137,6 +123,20 @@ REKOBO_KEY = {
 REKOBO_LKEY = {k.lower(): v for k, v in REKOBO_KEY.items()}
 
 
+class Counter(object):
+    def __init__(self, v=0):
+        self.v = v
+        self.mutex = threading.Lock()
+
+    def add(self, delta=1):
+        with self.mutex:
+            self.v += delta
+
+    def set(self, absval):
+        with self.mutex:
+            self.v = absval
+
+
 class Cooldown(object):
     def __init__(self, maxage):
         self.maxage = maxage
@@ -231,7 +231,7 @@ def nuprint(msg):
 
 def rice_tid():
     tid = threading.current_thread().ident
-    c = sunpack(b"B" * 5, spack(b">Q", tid)[-5:])
+    c = struct.unpack(b"B" * 5, struct.pack(b">Q", tid)[-5:])
     return "".join("\033[1;37;48;5;{}m{:02x}".format(x, x) for x in c) + "\033[0m"
 
 
@@ -904,10 +904,16 @@ def yieldfile(fn):
             yield buf
 
 
-def hashcopy(fin, fout):
+def hashcopy(actor, fin, fout):
+    is_mp = actor.is_mp
     hashobj = hashlib.sha512()
     tlen = 0
     for buf in fin:
+        if is_mp:
+            actor.workload += 1
+            if actor.workload > 2 ** 31:
+                actor.workload = 100
+
         tlen += len(buf)
         hashobj.update(buf)
         fout.write(buf)
@@ -918,10 +924,15 @@ def hashcopy(fin, fout):
     return tlen, hashobj.hexdigest(), digest_b64
 
 
-def sendfile_py(lower, upper, f, s):
+def sendfile_py(lower, upper, f, s, actor=None):
     remains = upper - lower
     f.seek(lower)
     while remains > 0:
+        if actor:
+            actor.workload += 1
+            if actor.workload > 2 ** 31:
+                actor.workload = 100
+
         # time.sleep(0.01)
         buf = f.read(min(1024 * 32, remains))
         if not buf:
@@ -968,7 +979,8 @@ def statdir(logger, scandir, lstat, top):
                     try:
                         yield [fsdec(fh.name), fh.stat(follow_symlinks=not lstat)]
                     except Exception as ex:
-                        logger(src, "[s] {} @ {}".format(repr(ex), fsdec(fh.path)), 6)
+                        msg = "scan-stat: \033[36m{} @ {}"
+                        logger(msg.format(repr(ex), fsdec(fh.path)))
         else:
             src = "listdir"
             fun = os.lstat if lstat else os.stat
@@ -977,10 +989,11 @@ def statdir(logger, scandir, lstat, top):
                 try:
                     yield [fsdec(name), fun(abspath)]
                 except Exception as ex:
-                    logger(src, "[s] {} @ {}".format(repr(ex), fsdec(abspath)), 6)
+                    msg = "list-stat: \033[36m{} @ {}"
+                    logger(msg.format(repr(ex), fsdec(abspath)))
 
     except Exception as ex:
-        logger(src, "{} @ {}".format(repr(ex), top), 1)
+        logger("{}: \033[31m{} @ {}".format(src, repr(ex), top))
 
 
 def unescape_cookie(orig):
@@ -1022,7 +1035,7 @@ def guess_mime(url, fallback="application/octet-stream"):
     if ";" not in ret:
         if ret.startswith("text/") or ret.endswith("/javascript"):
             ret += "; charset=UTF-8"
-
+    
     return ret
 
 
@@ -1057,7 +1070,10 @@ def gzip_orig_sz(fn):
     with open(fsenc(fn), "rb") as f:
         f.seek(-4, 2)
         rv = f.read(4)
-        return sunpack(b"I", rv)[0]
+        try:
+            return struct.unpack(b"I", rv)[0]
+        except:
+            return struct.unpack("I", rv)[0]
 
 
 def py_desc():

copyparty/vcr.py

@@ -0,0 +1,80 @@
+# coding: utf-8
+from __future__ import print_function, unicode_literals
+
+import time
+import shlex
+import subprocess as sp
+
+from .__init__ import PY2
+from .util import fsenc
+
+
+class VCR_Direct(object):
+    def __init__(self, cli, fpath):
+        self.cli = cli
+        self.fpath = fpath
+
+        self.log_func = cli.log_func
+        self.log_src = cli.log_src
+
+    def log(self, msg, c=0):
+        self.log_func(self.log_src, "vcr: {}".format(msg), c)
+
+    def run(self):
+        opts = self.cli.uparam
+
+        # fmt: off
+        cmd = [
+            "ffmpeg",
+            "-nostdin",
+            "-hide_banner",
+            "-v", "warning",
+            "-i", fsenc(self.fpath),
+            "-vf", "scale=640:-4",
+            "-c:a", "libopus",
+            "-b:a", "128k",
+            "-c:v", "libvpx",
+            "-deadline", "realtime",
+            "-row-mt", "1"
+        ]
+        # fmt: on
+
+        if "ss" in opts:
+            cmd.extend(["-ss", opts["ss"]])
+
+        if "crf" in opts:
+            cmd.extend(["-b:v", "0", "-crf", opts["crf"]])
+        else:
+            cmd.extend(["-b:v", "{}M".format(opts.get("mbps", 1.2))])
+
+        cmd.extend(["-f", "webm", "-"])
+
+        comp = str if not PY2 else unicode
+        cmd = [x.encode("utf-8") if isinstance(x, comp) else x for x in cmd]
+
+        self.log(" ".join([shlex.quote(x.decode("utf-8", "replace")) for x in cmd]))
+
+        p = sp.Popen(cmd, stdout=sp.PIPE)
+
+        self.cli.send_headers(None, mime="video/webm")
+
+        fails = 0
+        while True:
+            self.log("read")
+            buf = p.stdout.read(1024 * 4)
+            if not buf:
+                fails += 1
+                if p.poll() is not None or fails > 30:
+                    self.log("ffmpeg exited")
+                    return
+
+                time.sleep(0.1)
+                continue
+
+            fails = 0
+            try:
+                self.cli.s.sendall(buf)
+            except:
+                self.log("client disconnected")
+                p.kill()
+                return

copyparty/web/browser.css

@@ -29,10 +29,10 @@ body {
 	position: fixed;
 	max-width: 34em;
 	background: #222;
-	border: 0 solid #777;
+	border: 0 solid #555;
 	overflow: hidden;
 	margin-top: 1em;
-	padding: 0 1.3em;
+	padding: 0 1em;
 	height: 0;
 	opacity: .1;
 	transition: opacity 0.14s, height 0.14s, padding 0.14s;
@@ -40,31 +40,19 @@ body {
 	border-radius: .4em;
 	z-index: 9001;
 }
-#tt.b {
-	padding: 0 2em;
-	border-radius: .5em;
-	box-shadow: 0 .2em 1em #000;
-}
 #tt.show {
-	padding: 1em 1.3em;
-	border-width: .4em 0;
+	padding: 1em;
 	height: auto;
+	border-width: .2em 0;
 	opacity: 1;
 }
-#tt.show.b {
-	padding: 1.5em 2em;
-	border-width: .5em 0;
-}
 #tt code {
 	background: #3c3c3c;
-	padding: .1em .3em;
+	padding: .2em .3em;
 	border-top: 1px solid #777;
 	border-radius: .3em;
 	font-family: monospace, monospace;
-	line-height: 1.7em;
-}
-#tt em {
-	color: #f6a;
+	line-height: 2em;
 }
 #path,
 #path * {
@@ -824,13 +812,11 @@ input.eq_gain {
 	border-bottom: 1px solid #555;
 }
 #thumbs,
-#au_osd_cv,
-#u2tdate {
+#au_osd_cv {
 	opacity: .3;
 }
 #griden.on+#thumbs,
-#au_os_ctl.on+#au_osd_cv,
-#u2turbo.on+#u2tdate {
+#au_os_ctl.on+#au_osd_cv {
 	opacity: 1;
 }
 #ghead {
@@ -935,16 +921,13 @@ html.light {
 }
 html.light #tt {
 	background: #fff;
-	border-color: #888 #000 #777 #000;
+	border-color: #888;
 	box-shadow: 0 .3em 1em rgba(0,0,0,0.4);
 }
 html.light #tt code {
 	background: #060;
 	color: #fff;
 }
-html.light #tt em {
-	color: #d38;
-}
 html.light #ops,
 html.light .opbox,
 html.light #srch_form {

copyparty/web/browser.js

@@ -133,13 +133,6 @@ ebi('op_cfg').innerHTML = (
 	(have_zip ? (
 		'<div><h3>folder download</h3><div id="arc_fmt"></div></div>\n'
 	) : '') +
-	'<div>\n' +
-	'	<h3>up2k switches</h3>\n' +
-	'	<div>\n' +
-	'		<a id="u2turbo" class="tgl btn ttb" href="#" tt="the yolo button, you probably DO NOT want to enable this:$N$Nuse this if you were uploading a huge amount of files and had to restart for some reason, and want to continue the upload ASAP$N$Nthis replaces the hash-check with a simple <em>&quot;does this have the same filesize on the server?&quot;</em> so if the file contents are different it will NOT be uploaded$N$Nyou should turn this off when the upload is done, and then &quot;upload&quot; the same files again to let the client verify them">turbo</a>\n' +
-	'		<a id="u2tdate" class="tgl btn ttb" href="#" tt="has no effect unless the turbo button is enabled$N$Nreduces the yolo factor by a tiny amount; checks whether the file timestamps on the server matches yours$N$Nshould <em>theoretically</em> catch most unfinished/corrupted uploads, but is not a substitute for doing a verification pass with turbo disabled afterwards">date-chk</a>\n' +
-	'	</div>\n' +
-	'</div>\n' +
 	'<div><h3>key notation</h3><div id="key_notation"></div></div>\n' +
 	'<div class="fill"><h3>hidden columns</h3><div id="hcols"></div></div>'
 );
@@ -1559,6 +1552,7 @@ var thegrid = (function () {
 			href = this.getAttribute('href'),
 			aplay = ebi('a' + oth.getAttribute('id')),
 			is_img = /\.(gif|jpe?g|png|webp)(\?|$)/i.test(href),
+			is_vid = /\.(av1|asf|avi|flv|m4v|mkv|mjpeg|mjpg|mpg|mpeg|mpg2|mpeg2|h264|avc|h265|hevc|mov|3gp|mp4|ts|mpegts|nut|ogv|ogm|rm|vob|webm|wmv)(\?|$)/i.test(href),
 			in_tree = null,
 			have_sel = QS('#files tr.sel'),
 			td = oth.closest('td').nextSibling,
@@ -1586,6 +1580,9 @@ var thegrid = (function () {
 		else if (in_tree && !have_sel)
 			in_tree.click();
 
+		else if (is_vid)
+			window.open(href + (href.indexOf('?') === -1 ? '?' : '&') + 'vcr', '_blank');
+
 		else if (!is_img && have_sel)
 			window.open(href, '_blank');
 

copyparty/web/splash.html

@@ -35,7 +35,7 @@
             </table>
         </td></tr></table>
         <div class="btns">
-            <a href="/?stack">dump stack</a>
+            <a href="{{ avol[0] }}?stack">dump stack</a>
         </div>
         {%- endif %}
 

copyparty/web/up2k.js

@@ -225,7 +225,7 @@ function U2pvis(act, btns) {
     this.hashed = function (fobj) {
         var fo = this.tab[fobj.n],
             nb = fo.bt * (++fo.nh / fo.cb.length),
-            p = this.perc(nb, 0, fobj.size, fobj.t_hashing);
+            p = this.perc(nb, 0, fobj.size, fobj.t1);
 
         fo.hp = '{0}%, {1}, {2} MB/s'.format(
             p[0].toFixed(2), p[1], p[2].toFixed(2)
@@ -248,7 +248,7 @@ function U2pvis(act, btns) {
         fo.cb[nchunk] = cbd;
         fo.bd += delta;
 
-        var p = this.perc(fo.bd, fo.bd0, fo.bt, fobj.t_uploading);
+        var p = this.perc(fo.bd, fo.bd0, fo.bt, fobj.t3);
         fo.hp = '{0}%, {1}, {2} MB/s'.format(
             p[0].toFixed(2), p[1], p[2].toFixed(2)
         );
@@ -308,12 +308,6 @@ function U2pvis(act, btns) {
             throw 42;
         }
 
-        //console.log("oldcat %s %d, newcat %s %d, head=%d, tail=%d, file=%d, act.old=%s, act.new=%s, bz_act=%s",
-        //    oldcat, this.ctr[oldcat],
-        //    newcat, this.ctr[newcat],
-        //    this.head, this.tail, nfile,
-        //    this.is_act(oldcat), this.is_act(newcat), bz_act);
-
         fo.in = newcat;
         this.ctr[oldcat]--;
         this.ctr[newcat]++;
@@ -325,7 +319,7 @@ function U2pvis(act, btns) {
                 this.addrow(nfile);
         }
         else if (this.is_act(oldcat)) {
-            while (this.head < Math.min(this.tab.length, this.tail) && this.precard[this.tab[this.head].in])
+            while (this.head < Math.min(this.tab.length, this.tail) && (this.head == nfile || !this.is_act(this.tab[this.head].in)))
                 this.head++;
 
             if (!bz_act) {
@@ -333,10 +327,9 @@ function U2pvis(act, btns) {
                 tr.parentNode.removeChild(tr);
             }
         }
-        else return;
-
-        if (bz_act)
+        if (bz_act) {
             this.bzw();
+        }
     };
 
     this.bzw = function () {
@@ -350,8 +343,7 @@ function U2pvis(act, btns) {
 
         while (this.head - first > this.wsz) {
             var obj = ebi('f' + (first++));
-            if (obj)
-                obj.parentNode.removeChild(obj);
+            obj.parentNode.removeChild(obj);
         }
         while (last - this.tail < this.wsz && last < this.tab.length - 2) {
             var obj = ebi('f' + (++last));
@@ -384,8 +376,6 @@ function U2pvis(act, btns) {
 
     this.changecard = function (card) {
         this.act = card;
-        this.precard = has(["ok", "ng", "done"], this.act) ? {} : this.act == "bz" ? { "ok": 1, "ng": 1 } : { "ok": 1, "ng": 1, "bz": 1 };
-        this.postcard = has(["ok", "ng", "done"], this.act) ? { "bz": 1, "q": 1 } : this.act == "bz" ? { "q": 1 } : {};
         this.head = -1;
         this.tail = -1;
         var html = [];
@@ -400,23 +390,22 @@ function U2pvis(act, btns) {
             }
         }
         if (this.head == -1) {
+            var precard = has(["ok", "ng", "done"], this.act) ? {} : this.act == "bz" ? { "ok": 1, "ng": 1 } : { "ok": 1, "ng": 1, "bz": 1 },
+                postcard = has(["ok", "ng", "done"], this.act) ? { "bz": 1, "q": 1 } : this.act == "bz" ? { "q": 1 } : {};
+
             for (var a = 0; a < this.tab.length; a++) {
                 var rt = this.tab[a].in;
-                if (this.precard[rt]) {
+                if (precard[rt]) {
                     this.head = a + 1;
                     this.tail = a;
                 }
-                else if (this.postcard[rt]) {
+                else if (postcard[rt]) {
                     this.head = a;
                     this.tail = a - 1;
                     break;
                 }
             }
         }
-
-        if (this.head < 0)
-            this.head = 0;
-
         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 "));
@@ -463,8 +452,6 @@ function U2pvis(act, btns) {
             that.changecard(newtab);
         };
     }
-
-    this.changecard(this.act);
 }
 
 
@@ -561,21 +548,17 @@ function up2k_init(subtle) {
         ask_up = bcfg_get('ask_up', true),
         flag_en = bcfg_get('flag_en', false),
         fsearch = bcfg_get('fsearch', false),
-        turbo = bcfg_get('u2turbo', false),
-        datechk = bcfg_get('u2tdate', true),
         fdom_ctr = 0,
         min_filebuf = 0;
 
     var st = {
         "files": [],
         "todo": {
-            "head": [],
             "hash": [],
             "handshake": [],
             "upload": []
         },
         "busy": {
-            "head": [],
             "hash": [],
             "handshake": [],
             "upload": []
@@ -586,15 +569,6 @@ function up2k_init(subtle) {
         }
     };
 
-    function push_t(arr, t) {
-        var sort = arr.length && arr[arr.length - 1].n > t.n;
-        arr.push(t);
-        if (sort)
-            arr.sort(function (a, b) {
-                return a.n < b.n ? -1 : 1;
-            });
-    }
-
     var pvis = new U2pvis("bz", '#u2cards');
 
     var bobslice = null;
@@ -638,7 +612,7 @@ function up2k_init(subtle) {
         }
         else files = e.target.files;
 
-        if (!files || !files.length)
+        if (!files || files.length == 0)
             return alert('no files selected??');
 
         more_one_file();
@@ -741,7 +715,8 @@ function up2k_init(subtle) {
 
                     pf.push(name);
                     dn.file(function (fobj) {
-                        apop(pf, name);
+                        var idx = pf.indexOf(name);
+                        pf.splice(idx, 1);
                         try {
                             if (fobj.size > 0) {
                                 good.push([fobj, name]);
@@ -764,7 +739,7 @@ function up2k_init(subtle) {
     }
 
     function gotallfiles(good_files, bad_files) {
-        if (bad_files.length) {
+        if (bad_files.length > 0) {
             var ntot = bad_files.length + good_files.length,
                 msg = 'These {0} files (of {1} total) were skipped because they are empty:\n'.format(bad_files.length, ntot);
 
@@ -822,10 +797,7 @@ function up2k_init(subtle) {
             ], fobj.size, draw_each);
 
             st.files.push(entry);
-            if (turbo)
-                push_t(st.todo.head, entry);
-            else
-                push_t(st.todo.hash, entry);
+            st.todo.hash.push(entry);
         }
         if (!draw_each) {
             pvis.drawcard("q");
@@ -865,34 +837,17 @@ function up2k_init(subtle) {
     //
 
     function handshakes_permitted() {
-        if (!st.todo.handshake.length)
-            return true;
+        var lim = multitask ? 1 : 0;
 
-        var t = st.todo.handshake[0],
-            cd = t.cooldown;
-
-        if (cd && cd - Date.now() > 0)
-            return false;
-
-        // keepalive or verify
-        if (t.keepalive ||
-            t.t_uploaded)
-            return true;
-
-        if (parallel_uploads <
-            st.busy.handshake.length)
-            return false;
-
-        if (st.busy.handshake.length)
-            for (var n = t.n - 1; n >= t.n - parallel_uploads && n >= 0; n--)
-                if (st.files[n].t_uploading)
-                    return false;
-
-        if ((multitask ? 1 : 0) <
+        if (lim <
             st.todo.upload.length +
             st.busy.upload.length)
             return false;
 
+        var cd = st.todo.handshake.length ? st.todo.handshake[0].cooldown : 0;
+        if (cd && cd - Date.now() > 0)
+            return false;
+
         return true;
     }
 
@@ -925,16 +880,13 @@ function up2k_init(subtle) {
             clearTimeout(tto);
             running = true;
             while (window['vis_exh']) {
-                var now = Date.now(),
-                    is_busy = 0 !=
-                        st.todo.head.length +
-                        st.todo.hash.length +
-                        st.todo.handshake.length +
-                        st.todo.upload.length +
-                        st.busy.head.length +
-                        st.busy.hash.length +
-                        st.busy.handshake.length +
-                        st.busy.upload.length;
+                var is_busy = 0 !=
+                    st.todo.hash.length +
+                    st.todo.handshake.length +
+                    st.todo.upload.length +
+                    st.busy.hash.length +
+                    st.busy.handshake.length +
+                    st.busy.upload.length;
 
                 if (was_busy != is_busy) {
                     was_busy = is_busy;
@@ -945,6 +897,7 @@ function up2k_init(subtle) {
 
                 if (flag) {
                     if (is_busy) {
+                        var now = Date.now();
                         flag.take(now);
                         if (!flag.ours)
                             return defer();
@@ -956,52 +909,43 @@ function up2k_init(subtle) {
 
                 var mou_ikkai = false;
 
-                if (st.busy.handshake.length &&
-                    st.busy.handshake[0].t_busied < now - 30 * 1000
+                if (st.busy.handshake.length > 0 &&
+                    st.busy.handshake[0].busied < Date.now() - 30 * 1000
                 ) {
                     console.log("retrying stuck handshake");
                     var t = st.busy.handshake.shift();
                     st.todo.handshake.unshift(t);
                 }
 
-                var nprev = -1;
-                for (var a = 0; a < st.todo.upload.length; a++) {
-                    var nf = st.todo.upload[a].nfile;
-                    if (nprev == nf)
-                        continue;
-
-                    nprev = nf;
-                    var t = st.files[nf];
-                    if (now - t.t_busied > 1000 * 30 &&
-                        now - t.t_handshake > 1000 * (21600 - 1800)
-                    ) {
-                        apop(st.todo.handshake, t);
-                        st.todo.handshake.unshift(t);
-                        t.keepalive = true;
-                    }
-                }
-
-                if (st.todo.head.length &&
-                    st.busy.head.length < parallel_uploads) {
-                    exec_head();
-                    mou_ikkai = true;
-                }
-
-                if (handshakes_permitted() &&
-                    st.todo.handshake.length) {
+                if (st.todo.handshake.length > 0 &&
+                    st.busy.handshake.length == 0 && (
+                        st.todo.handshake[0].t4 || (
+                            handshakes_permitted() &&
+                            st.busy.upload.length < parallel_uploads
+                        )
+                    )
+                ) {
                     exec_handshake();
                     mou_ikkai = true;
                 }
 
-                if (st.todo.upload.length &&
+                if (handshakes_permitted() &&
+                    st.todo.handshake.length > 0 &&
+                    st.busy.handshake.length == 0 &&
+                    st.busy.upload.length < parallel_uploads) {
+                    exec_handshake();
+                    mou_ikkai = true;
+                }
+
+                if (st.todo.upload.length > 0 &&
                     st.busy.upload.length < parallel_uploads) {
                     exec_upload();
                     mou_ikkai = true;
                 }
 
                 if (hashing_permitted() &&
-                    st.todo.hash.length &&
-                    !st.busy.hash.length) {
+                    st.todo.hash.length > 0 &&
+                    st.busy.hash.length == 0) {
                     exec_hash();
                     mou_ikkai = true;
                 }
@@ -1136,7 +1080,7 @@ function up2k_init(subtle) {
 
                 if (handled) {
                     pvis.move(t.n, 'ng');
-                    apop(st.busy.hash, t);
+                    st.busy.hash.splice(st.busy.hash.indexOf(t), 1);
                     st.bytes.uploaded += t.size;
                     return tasker();
                 }
@@ -1169,15 +1113,15 @@ function up2k_init(subtle) {
                     t.hash.push(hashtab[a]);
                 }
 
-                t.t_hashed = Date.now();
+                t.t2 = Date.now();
                 if (t.n == 0 && window.location.hash == '#dbg') {
-                    var spd = (t.size / ((t.t_hashed - t.t_hashing) / 1000.)) / (1024 * 1024.);
-                    alert('{0} ms, {1} MB/s\n'.format(t.t_hashed - t.t_hashing, spd.toFixed(3)) + t.hash.join('\n'));
+                    var spd = (t.size / ((t.t2 - t.t1) / 1000.)) / (1024 * 1024.);
+                    alert('{0} ms, {1} MB/s\n'.format(t.t2 - t.t1, spd.toFixed(3)) + t.hash.join('\n'));
                 }
 
                 pvis.seth(t.n, 2, 'hashing done');
                 pvis.seth(t.n, 1, '📦 wait');
-                apop(st.busy.hash, t);
+                st.busy.hash.splice(st.busy.hash.indexOf(t), 1);
                 st.todo.handshake.push(t);
                 tasker();
             };
@@ -1200,57 +1144,10 @@ function up2k_init(subtle) {
             }, 1);
         };
 
-        t.t_hashing = Date.now();
+        t.t1 = Date.now();
         segm_next();
     }
 
-    /////
-    ////
-    ///   head
-    //
-
-    function exec_head() {
-        var t = st.todo.head.shift();
-        st.busy.head.push(t);
-
-        var xhr = new XMLHttpRequest();
-        xhr.onerror = function () {
-            console.log('head onerror, retrying', t);
-            apop(st.busy.head, t);
-            st.todo.head.unshift(t);
-            tasker();
-        };
-        function orz(e) {
-            var ok = false;
-            if (xhr.status == 200) {
-                var srv_sz = xhr.getResponseHeader('Content-Length'),
-                    srv_ts = xhr.getResponseHeader('Last-Modified');
-
-                ok = t.size == srv_sz;
-                if (ok && datechk) {
-                    srv_ts = new Date(srv_ts) / 1000;
-                    ok = Math.abs(srv_ts - t.lmod) < 2;
-                }
-            }
-            apop(st.busy.head, t);
-            if (!ok)
-                return push_t(st.todo.hash, t);
-
-            t.done = true;
-            st.bytes.hashed += t.size;
-            st.bytes.uploaded += t.size;
-            pvis.seth(t.n, 1, 'YOLO');
-            pvis.seth(t.n, 2, "turbo'd");
-            pvis.move(t.n, 'ok');
-        };
-        xhr.onload = function (e) {
-            try { orz(e); } catch (ex) { vis_exh(ex + '', '', '', '', ex); }
-        };
-
-        xhr.open('HEAD', t.purl + t.name, true);
-        xhr.send();
-    }
-
     /////
     ////
     ///   handshake
@@ -1258,41 +1155,30 @@ function up2k_init(subtle) {
 
     function exec_handshake() {
         var t = st.todo.handshake.shift(),
-            keepalive = t.keepalive,
             me = Date.now();
 
         st.busy.handshake.push(t);
-        t.keepalive = undefined;
-        t.t_busied = me;
-
-        if (keepalive)
-            console.log("sending keepalive handshake", t);
+        t.busied = me;
 
         var xhr = new XMLHttpRequest();
         xhr.onerror = function () {
-            if (t.t_busied != me) {
+            if (t.busied != me) {
                 console.log('zombie handshake onerror,', t);
                 return;
             }
             console.log('handshake onerror, retrying', t);
-            apop(st.busy.handshake, t);
+            st.busy.handshake.splice(st.busy.handshake.indexOf(t), 1);
             st.todo.handshake.unshift(t);
-            t.keepalive = keepalive;
             tasker();
         };
         function orz(e) {
-            if (t.t_busied != me) {
+            if (t.busied != me) {
                 console.log('zombie handshake onload,', t);
                 return;
             }
             if (xhr.status == 200) {
-                t.t_handshake = Date.now();
-                if (keepalive) {
-                    apop(st.busy.handshake, t);
-                    return;
-                }
-
                 var response = JSON.parse(xhr.responseText);
+
                 if (!response.name) {
                     var msg = '',
                         smsg = '';
@@ -1316,7 +1202,7 @@ function up2k_init(subtle) {
                     pvis.seth(t.n, 2, msg);
                     pvis.seth(t.n, 1, smsg);
                     pvis.move(t.n, smsg == '404' ? 'ng' : 'ok');
-                    apop(st.busy.handshake, t);
+                    st.busy.handshake.splice(st.busy.handshake.indexOf(t), 1);
                     st.bytes.uploaded += t.size;
                     t.done = true;
                     tasker();
@@ -1358,41 +1244,31 @@ function up2k_init(subtle) {
                 var done = true,
                     msg = '&#x1f3b7;&#x1f41b;';
 
-                if (t.postlist.length) {
-                    var arr = st.todo.upload,
-                        sort = arr.length && arr[arr.length - 1].nfile > t.n;
-
+                if (t.postlist.length > 0) {
                     for (var a = 0; a < t.postlist.length; a++)
-                        arr.push({
+                        st.todo.upload.push({
                             'nfile': t.n,
                             'npart': t.postlist[a]
                         });
 
                     msg = 'uploading';
                     done = false;
-
-                    if (sort)
-                        arr.sort(function (a, b) {
-                            return a.nfile < b.nfile ? -1 :
-                            /*  */ a.nfile > b.nfile ? 1 :
-                                    a.npart < b.npart ? -1 : 1;
-                        });
                 }
                 pvis.seth(t.n, 1, msg);
-                apop(st.busy.handshake, t);
+                st.busy.handshake.splice(st.busy.handshake.indexOf(t), 1);
 
                 if (done) {
                     t.done = true;
                     st.bytes.uploaded += t.size - t.bytes_uploaded;
-                    var spd1 = (t.size / ((t.t_hashed - t.t_hashing) / 1000.)) / (1024 * 1024.),
-                        spd2 = (t.size / ((t.t_uploaded - t.t_uploading) / 1000.)) / (1024 * 1024.);
+                    var spd1 = (t.size / ((t.t2 - t.t1) / 1000.)) / (1024 * 1024.),
+                        spd2 = (t.size / ((t.t4 - t.t3) / 1000.)) / (1024 * 1024.);
 
                     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.t_uploaded = undefined;
+                else t.t4 = undefined;
 
                 tasker();
             }
@@ -1411,7 +1287,7 @@ function up2k_init(subtle) {
                     var penalty = rsp.replace(/.*rate-limit /, "").split(' ')[0];
                     console.log("rate-limit: " + penalty);
                     t.cooldown = Date.now() + parseFloat(penalty) * 1000;
-                    apop(st.busy.handshake, t);
+                    st.busy.handshake.splice(st.busy.handshake.indexOf(t), 1);
                     st.todo.handshake.unshift(t);
                     return;
                 }
@@ -1430,7 +1306,7 @@ function up2k_init(subtle) {
                     pvis.seth(t.n, 2, err);
                     pvis.move(t.n, 'ng');
 
-                    apop(st.busy.handshake, t);
+                    st.busy.handshake.splice(st.busy.handshake.indexOf(t), 1);
                     tasker();
                     return;
                 }
@@ -1471,8 +1347,8 @@ function up2k_init(subtle) {
         var npart = upt.npart,
             t = st.files[upt.nfile];
 
-        if (!t.t_uploading)
-            t.t_uploading = Date.now();
+        if (!t.t3)
+            t.t3 = Date.now();
 
         pvis.seth(t.n, 1, "🚀 send");
 
@@ -1491,17 +1367,17 @@ function up2k_init(subtle) {
                 t.bytes_uploaded += cdr - car;
             }
             else if (txt.indexOf('already got that') !== -1) {
-                console.log("ignoring dupe-segment error", t);
+                console.log("ignoring dupe-segment error");
             }
             else {
                 alert("server broke; cu-err {0} on file [{1}]:\n".format(
                     xhr.status, t.name) + (txt || "no further information"));
                 return;
             }
-            apop(st.busy.upload, upt);
-            apop(t.postlist, npart);
-            if (!t.postlist.length) {
-                t.t_uploaded = Date.now();
+            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 = Date.now();
                 pvis.seth(t.n, 1, 'verifying');
                 st.todo.handshake.unshift(t);
             }
@@ -1628,35 +1504,6 @@ function up2k_init(subtle) {
         set_fsearch(!fsearch);
     }
 
-    function tgl_turbo() {
-        turbo = !turbo;
-        bcfg_set('u2turbo', turbo);
-        draw_turbo();
-    }
-
-    function tgl_datechk() {
-        datechk = !datechk;
-        bcfg_set('u2tdate', datechk);
-    }
-
-    function draw_turbo() {
-        var msgu = '<p class="warn">WARNING: turbo enabled, <span>&nbsp;client may not detect and resume incomplete uploads; see turbo-button tooltip</span></p>',
-            msgs = '<p class="warn">WARNING: turbo enabled, <span>&nbsp;search may give false-positives; see turbo-button tooltip</span></p>',
-            msg = fsearch ? msgs : msgu,
-            omsg = fsearch ? msgu : msgs,
-            html = ebi('u2foot').innerHTML,
-            ohtml = html;
-
-        if (turbo && html.indexOf(msg) === -1)
-            html = html.replace(omsg, '') + msg;
-        else if (!turbo)
-            html = html.replace(msgu, '').replace(msgs, '');
-
-        if (html !== ohtml)
-            ebi('u2foot').innerHTML = html;
-    }
-    draw_turbo();
-
     function set_fsearch(new_state) {
         var fixed = false;
 
@@ -1694,7 +1541,6 @@ function up2k_init(subtle) {
         }
         catch (ex) { }
 
-        draw_turbo();
         onresize();
     }
 
@@ -1739,8 +1585,6 @@ function up2k_init(subtle) {
     ebi('multitask').addEventListener('click', tgl_multitask, false);
     ebi('ask_up').addEventListener('click', tgl_ask_up, false);
     ebi('flag_en').addEventListener('click', tgl_flag_en, false);
-    ebi('u2turbo').addEventListener('click', tgl_turbo, false);
-    ebi('u2tdate').addEventListener('click', tgl_datechk, false);
     var o = ebi('fsearch');
     if (o)
         o.addEventListener('click', tgl_fsearch, false);

copyparty/web/upload.css

@@ -215,31 +215,9 @@
 	color: #fff;
 	font-style: italic;
 }
-#u2foot .warn {
-	font-size: 1.3em;
-	padding: .5em .8em;
-	margin: 1em -.6em;
-	color: #f74;
-	background: #322;
-	border: 1px solid #633;
-	border-width: .1em 0;
-	text-align: center;
-}
-#u2foot .warn span {
-	color: #f86;
-}
-html.light #u2foot .warn {
-	color: #b00;
-	background: #fca;
-	border-color: #f70;
-}
-html.light #u2foot .warn span {
-	color: #930;
-}
 #u2foot span {
 	color: #999;
 	font-size: .9em;
-	font-weight: normal;
 }
 #u2footfoot {
 	margin-bottom: -1em;

copyparty/web/util.js

@@ -389,13 +389,6 @@ function has(haystack, needle) {
 }
 
 
-function apop(arr, v) {
-    var ofs = arr.indexOf(v);
-    if (ofs !== -1)
-        arr.splice(ofs, 1);
-}
-
-
 function jcp(obj) {
     return JSON.parse(JSON.stringify(obj));
 }
@@ -514,10 +507,8 @@ var tt = (function () {
 
         var pos = this.getBoundingClientRect(),
             left = pos.left < window.innerWidth / 2,
-            top = pos.top < window.innerHeight / 2,
-            big = this.className.indexOf(' ttb') !== -1;
+            top = pos.top < window.innerHeight / 2;
 
-        clmod(r.tt, 'b', big);
         r.tt.style.top = top ? pos.bottom + 'px' : 'auto';
         r.tt.style.bottom = top ? 'auto' : (window.innerHeight - pos.top) + 'px';
         r.tt.style.left = left ? pos.left + 'px' : 'auto';

docs/hls.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html><html lang="en"><head>
-	<meta charset="utf-8">
-	<title>hls-test</title>
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-</head><body>
-
-<video id="vid" controls></video>
-<script src="hls.light.js"></script>
-<script>
-
-var video = document.getElementById('vid');
-var hls = new Hls({
-	debug: true,
-	autoStartLoad: false
-});
-hls.loadSource('live/v.m3u8');
-hls.attachMedia(video);
-hls.on(Hls.Events.MANIFEST_PARSED, function() {
-	hls.startLoad(0);
-});
-hls.on(Hls.Events.MEDIA_ATTACHED, function() {
-	video.muted = true;
-	video.play();
-});
-
-/*
-general good news:
-- doesn't need fixed-length segments; ok to let x264 pick optimal keyframes and slice on those
-- hls.js polls the m3u8 for new segments, scales the duration accordingly, seeking works great
-- the sfx will grow by 66 KiB since that's how small hls.js can get, wait thats not good
-
-# vod, creates m3u8 at the end, fixed keyframes, v bad
-ffmpeg -hide_banner -threads 0 -flags -global_header -i ..\CowboyBebopMovie-OP1.webm -vf scale=1280:-4,format=yuv420p -ac 2 -c:a libopus -b:a 128k -c:v libx264 -preset slow -crf 24 -maxrate:v 5M -bufsize:v 10M -g 120 -keyint_min 120 -sc_threshold 0 -hls_time 4 -hls_playlist_type vod -hls_segment_filename v%05d.ts v.m3u8
-
-# live, updates m3u8 as it goes, dynamic keyframes, streamable with hls.js
-ffmpeg -hide_banner -threads 0 -flags -global_header -i ..\..\CowboyBebopMovie-OP1.webm -vf scale=1280:-4,format=yuv420p -ac 2 -c:a libopus -b:a 128k -c:v libx264 -preset slow -crf 24 -maxrate:v 5M -bufsize:v 10M -f segment -segment_list v.m3u8 -segment_format mpegts -segment_list_flags live v%05d.ts
-
-# fmp4 (fragmented mp4), doesn't work with hls.js, gets duratoin 149:07:51 (536871s), probably the tkhd/mdhd 0xffffffff (timebase 8000? ok)
-ffmpeg -re -hide_banner -threads 0 -flags +cgop -i ..\..\CowboyBebopMovie-OP1.webm -vf scale=1280:-4,format=yuv420p -ac 2 -c:a libopus -b:a 128k -c:v libx264 -preset slow -crf 24 -maxrate:v 5M -bufsize:v 10M -f segment -segment_list v.m3u8 -segment_format fmp4 -segment_list_flags live v%05d.mp4
-
-# try 2, works, uses tempfiles for m3u8 updates, good, 6% smaller
-ffmpeg -re -hide_banner -threads 0 -flags +cgop -i ..\..\CowboyBebopMovie-OP1.webm -vf scale=1280:-4,format=yuv420p -ac 2 -c:a libopus -b:a 128k -c:v libx264 -preset slow -crf 24 -maxrate:v 5M -bufsize:v 10M -f hls -hls_segment_type fmp4 -hls_list_size 0 -hls_segment_filename v%05d.mp4 v.m3u8
-
-more notes
-- adding -hls_flags single_file makes duration wack during playback (for both fmp4 and ts), ok once finalized and refreshed, gives no size reduction anyways
-- bebop op has good keyframe spacing for testing hls.js, in particular it hops one seg back and immediately resumes if it hits eof with the explicit hls.startLoad(0); otherwise it jumps into the middle of a seg and becomes art
-- can probably -c:v copy most of the time, is there a way to check for cgop? todo
-
-*/
-</script>
-</body></html>

tests/test_httpcli.py

@@ -30,7 +30,6 @@ class Cfg(Namespace):
             c=c,
             rproxy=0,
             ed=False,
-            nw=False,
             no_zip=False,
             no_scandir=False,
             no_sendfile=True,

tests/test_vfs.py

@@ -17,7 +17,7 @@ from copyparty import util
 
 class Cfg(Namespace):
     def __init__(self, a=[], v=[], c=None):
-        ex = {k: False for k in "nw e2d e2ds e2dsa e2t e2ts e2tsr".split()}
+        ex = {k: False for k in "e2d e2ds e2dsa e2t e2ts e2tsr".split()}
         ex2 = {
             "mtp": [],
             "mte": "a",