filter apple metadata files when uploading with up2k.js:

abandoned because it is ultimately pointless; browsers running on
macos already do a decent job filtering these out, and there is
only limited benefit of doing this for all other users, probably
more harm than good in case of false positives

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,42 +8,33 @@ assignees: '9001'
 ---
 
 NOTE:
-**please use english, or include an english translation.** aside from that,  
 all of the below are optional, consider them as inspiration, delete and rewrite at will, thx md
 
 
-### Describe the bug
+**Describe the bug**
 a description of what the bug is
 
-### To Reproduce
+**To Reproduce**
 List of steps to reproduce the issue, or, if it's hard to reproduce, then at least a detailed explanation of what you did to run into it
 
-### Expected behavior
+**Expected behavior**
 a description of what you expected to happen
 
-### Screenshots
+**Screenshots**
 if applicable, add screenshots to help explain your problem, such as the kickass crashpage :^)
 
-### Server details (if you are using docker/podman)
-remove the ones that are not relevant:
-* **server OS / version:** 
-* **how you're running copyparty:** (docker/podman/something-else)
-* **docker image:** (variant, version, and arch if you know)
-* **copyparty arguments and/or config-file:** 
+**Server details**
+if the issue is possibly on the server-side, then mention some of the following:
+* server OS / version: 
+* python version: 
+* copyparty arguments: 
+* filesystem (`lsblk -f` on linux): 
 
-### Server details (if you're NOT using docker/podman)
-remove the ones that are not relevant:
-* **server OS / version:** 
-* **what copyparty did you grab:** (sfx/exe/pip/arch/...)
-* **how you're running it:** (in a terminal, as a systemd-service, ...)
-* run copyparty with `--version` and grab the last 3 lines (they start with `copyparty`, `CPython`, `sqlite`) and paste them below this line:
-* **copyparty arguments and/or config-file:** 
-
-### Client details
+**Client details**
 if the issue is possibly on the client-side, then mention some of the following:
 * the device type and model: 
 * OS version: 
 * browser version: 
 
-### Additional context
+**Additional context**
 any other context about the problem here

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,8 +7,6 @@ assignees: '9001'
 
 ---
 
-NOTE:
-**please use english, or include an english translation.** aside from that,  
 all of the below are optional, consider them as inspiration, delete and rewrite at will
 
 **is your feature request related to a problem? Please describe.**

.gitignore

@@ -12,7 +12,6 @@ copyparty.egg-info/
 /dist/
 /py2/
 /sfx*
-/pyz/
 /unt/
 /log/
 
@@ -30,7 +29,6 @@ copyparty/res/COPYING.txt
 copyparty/web/deps/
 srv/
 scripts/docker/i/
-scripts/deps-docker/uncomment.py
 contrib/package/arch/pkg/
 contrib/package/arch/src/
 

.vscode/launch.json

@@ -19,7 +19,8 @@
                 "-emp",
                 "-e2dsa",
                 "-e2ts",
-                "-mtp=.bpm=f,bin/mtag/audio-bpm.py",
+                "-mtp",
+                ".bpm=f,bin/mtag/audio-bpm.py",
                 "-aed:wark",
                 "-vsrv::r:rw,ed:c,dupe",
                 "-vdist:dist:r"

.vscode/settings.json

@@ -22,9 +22,6 @@
         "terminal.ansiBrightCyan": "#9cf0ed",
         "terminal.ansiBrightWhite": "#ffffff",
     },
-    "python.terminal.activateEnvironment": false,
-    "python.analysis.enablePytestSupport": false,
-    "python.analysis.typeCheckingMode": "standard",
     "python.testing.pytestEnabled": false,
     "python.testing.unittestEnabled": true,
     "python.testing.unittestArgs": [
@@ -34,8 +31,23 @@
         "-p",
         "test_*.py"
     ],
-    // python3 -m isort --py=27 --profile=black ~/dev/copyparty/{copyparty,tests}/*.py && python3 -m black -t py27 ~/dev/copyparty/{copyparty,tests,bin}/*.py $(find ~/dev/copyparty/copyparty/stolen -iname '*.py')
-    "editor.formatOnSave": false,
+    "python.linting.pylintEnabled": true,
+    "python.linting.flake8Enabled": true,
+    "python.linting.banditEnabled": true,
+    "python.linting.mypyEnabled": true,
+    "python.linting.flake8Args": [
+        "--max-line-length=120",
+        "--ignore=E722,F405,E203,W503,W293,E402,E501,E128,E226",
+    ],
+    "python.linting.banditArgs": [
+        "--ignore=B104,B110,B112"
+    ],
+    // python3 -m isort --py=27 --profile=black copyparty/
+    "python.formatting.provider": "none",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    },
+    "editor.formatOnSave": true,
     "[html]": {
         "editor.formatOnSave": false,
         "editor.autoIndent": "keep",
@@ -46,4 +58,6 @@
     "files.associations": {
         "*.makefile": "makefile"
     },
+    "python.linting.enabled": true,
+    "python.pythonPath": "/usr/bin/python3"
 }

CONTRIBUTING.md

@@ -1,21 +1,8 @@
-* **found a bug?** [create an issue!](https://github.com/9001/copyparty/issues) or let me know in the [discord](https://discord.gg/25J8CdTT6G) :>
-* **fixed a bug?** create a PR or post a patch! big thx in advance :>
-* **have a cool idea?** let's discuss it! anywhere's fine, you choose.
+* do something cool
 
-but please:
-
-
-
-# do not use AI / LMM when writing code
-
-copyparty is 100% organic, free-range, human-written software!
-
-> ⚠ you are now entering a no-copilot zone
-
-the *only* place where LMM/AI *may* be accepted is for [localization](https://github.com/9001/copyparty/tree/hovudstraum/docs/rice#translations) if you are fluent and have confirmed that the translation is accurate.
-
-sorry for the harsh tone, but this is important to me 🙏
+really tho, send a PR or an issue or whatever, all appreciated, anything goes, just behave aight 👍👍
 
+but to be more specific,
 
 
 # contribution ideas
@@ -41,8 +28,6 @@ aside from documentation and ideas, some other things that would be cool to have
 
 * **translations** -- the copyparty web-UI has translations for english and norwegian at the top of [browser.js](https://github.com/9001/copyparty/blob/hovudstraum/copyparty/web/browser.js); if you'd like to add a translation for another language then that'd be welcome! and if that language has a grammar that doesn't fit into the way the strings are assembled, then we'll fix that as we go :>
 
-  * but please note that support for [RTL (Right-to-Left) languages](https://en.wikipedia.org/wiki/Right-to-left_script) is currently not planned, since the javascript is a bit too jank for that
-
 * **UI ideas** -- at some point I was thinking of rewriting the UI in react/preact/something-not-vanilla-javascript, but I'll admit the comfiness of not having any build stage combined with raw performance has kinda convinced me otherwise :p but I'd be very open to ideas on how the UI could be improved, or be more intuitive.
 
 * **docker improvements** -- I don't really know what I'm doing when it comes to containers, so I'm sure there's a *huge* room for improvement here, mainly regarding how you're supposed to use the container with kubernetes / docker-compose / any of the other popular ways to do things. At some point I swear I'll start learning about docker so I can pick up clach04's [docker-compose draft](https://github.com/9001/copyparty/issues/38) and learn how that stuff ticks, unless someone beats me to it!

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 ed <oss@ocv.me>
+Copyright (c) 2019 ed
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bin/README.md

@@ -15,18 +15,22 @@ produces a chronological list of all uploads by collecting info from up2k databa
 # [`partyfuse.py`](partyfuse.py)
 * mount a copyparty server as a local filesystem (read-only)
 * **supports Windows!** -- expect `194 MiB/s` sequential read
-* **supports Linux** -- expect `600 MiB/s` sequential read
+* **supports Linux** -- expect `117 MiB/s` sequential read
 * **supports macos** -- expect `85 MiB/s` sequential read
 
+filecache is default-on for windows and macos;
+* macos readsize is 64kB, so speed ~32 MiB/s without the cache
+* windows readsize varies by software; explorer=1M, pv=32k
+
 note that copyparty should run with `-ed` to enable dotfiles (hidden otherwise)
 
-and consider using [../docs/rclone.md](../docs/rclone.md) instead; usually a bit faster, especially on windows
+also consider using [../docs/rclone.md](../docs/rclone.md) instead for 5x performance
 
 
 ## to run this on windows:
 * install [winfsp](https://github.com/billziss-gh/winfsp/releases/latest) and [python 3](https://www.python.org/downloads/)
   * [x] add python 3.x to PATH (it asks during install)
-* `python -m pip install --user fusepy` (or grab a copy of `fuse.py` from the `connect` page on your copyparty, and keep it in the same folder)
+* `python -m pip install --user fusepy`
 * `python ./partyfuse.py n: http://192.168.1.69:3923/`
 
 10% faster in [msys2](https://www.msys2.org/), 700% faster if debug prints are enabled:
@@ -78,6 +82,3 @@ cd /mnt/nas/music/.hist
 # [`prisonparty.sh`](prisonparty.sh)
 * run copyparty in a chroot, preventing any accidental file access
 * creates bindmounts for /bin, /lib, and so on, see `sysdirs=`
-
-# [`bubbleparty.sh`](bubbleparty.sh)
-* run copyparty in an isolated process, preventing any accidental file access and more

bin/bubbleparty.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-# usage: ./bubbleparty.sh ./copyparty-sfx.py ....
-bwrap \
-  --unshare-all \
-  --ro-bind /usr /usr \
-  --ro-bind /bin /bin \
-  --ro-bind /lib /lib \
-  --ro-bind /etc/resolv.conf /etc/resolv.conf \
-  --dev-bind /dev /dev \
-  --dir /tmp \
-  --dir /var \
-  --bind $(pwd) $(pwd) \
-  --share-net \
-  --die-with-parent \
-  --file 11 /etc/passwd \
-  --file 12 /etc/group \
-  "$@" \
-  11< <(getent passwd $(id -u) 65534) \
-  12< <(getent group $(id -g) 65534) 

bin/handlers/README.md

@@ -20,8 +20,6 @@ each plugin must define a `main()` which takes 3 arguments;
 
 ## on404
 
-* [redirect.py](redirect.py) sends an HTTP 301 or 302, redirecting the client to another page/file
-* [randpic.py](randpic.py) redirects `/foo/bar/randpic.jpg` to a random pic in `/foo/bar/`
 * [sorry.py](answer.py) replies with a custom message instead of the usual 404
 * [nooo.py](nooo.py) replies with an endless noooooooooooooo
 * [never404.py](never404.py) 100% guarantee that 404 will never be a thing again as it automatically creates dummy files whenever necessary

bin/handlers/randpic.py

@@ -1,35 +0,0 @@
-import os
-import random
-from urllib.parse import quote
-
-
-# assuming /foo/bar/ is a valid URL but /foo/bar/randpic.png does not exist,
-# hijack the 404 with a redirect to a random pic in that folder
-#
-# thx to lia & kipu for the idea
-
-
-def main(cli, vn, rem):
-    req_fn = rem.split("/")[-1]
-    if not cli.can_read or not req_fn.startswith("randpic"):
-        return
-
-    req_abspath = vn.canonical(rem)
-    req_ap_dir = os.path.dirname(req_abspath)
-    files_in_dir = os.listdir(req_ap_dir)
-
-    if "." in req_fn:
-        file_ext = "." + req_fn.split(".")[-1]
-        files_in_dir = [x for x in files_in_dir if x.lower().endswith(file_ext)]
-
-    if not files_in_dir:
-        return
-
-    selected_file = random.choice(files_in_dir)
-
-    req_url = "/".join([vn.vpath, rem]).strip("/")
-    req_dir = req_url.rsplit("/", 1)[0]
-    new_url = "/".join([req_dir, quote(selected_file)]).strip("/")
-
-    cli.reply(b"redirecting...", 302, headers={"Location": "/" + new_url})
-    return "true"

bin/handlers/redirect.py

@@ -1,52 +0,0 @@
-# if someone hits a 404, redirect them to another location
-
-
-def send_http_302_temporary_redirect(cli, new_path):
-    """
-    replies with an HTTP 302, which is a temporary redirect;
-    "new_path" can be any of the following:
-      - "http://a.com/" would redirect to another website,
-      - "/foo/bar" would redirect to /foo/bar on the same server;
-          note the leading '/' in the location which is important
-    """
-    cli.reply(b"redirecting...", 302, headers={"Location": new_path})
-
-
-def send_http_301_permanent_redirect(cli, new_path):
-    """
-    replies with an HTTP 301, which is a permanent redirect;
-    otherwise identical to send_http_302_temporary_redirect
-    """
-    cli.reply(b"redirecting...", 301, headers={"Location": new_path})
-
-
-def send_errorpage_with_redirect_link(cli, new_path):
-    """
-    replies with a website explaining that the page has moved;
-    "new_path" must be an absolute location on the same server
-    but without a leading '/', so for example "foo/bar"
-    would redirect to "/foo/bar"
-    """
-    cli.redirect(new_path, click=False, msg="this page has moved")
-
-
-def main(cli, vn, rem):
-    """
-    this is the function that gets called by copyparty;
-    note that vn.vpath and cli.vpath does not have a leading '/'
-    so we're adding the slash in the debug messages below
-    """
-    print(f"this client just hit a 404: {cli.ip}")
-    print(f"they were accessing this volume: /{vn.vpath}")
-    print(f"and the original request-path (straight from the URL) was /{cli.vpath}")
-    print(f"...which resolves to the following filesystem path: {vn.canonical(rem)}")
-
-    new_path = "/foo/bar/"
-    print(f"will now redirect the client to {new_path}")
-
-    # uncomment one of these:
-    send_http_302_temporary_redirect(cli, new_path)
-    #send_http_301_permanent_redirect(cli, new_path)
-    #send_errorpage_with_redirect_link(cli, new_path)
-
-    return "true"

bin/hooks/README.md

@@ -2,7 +2,7 @@ standalone programs which are executed by copyparty when an event happens (uploa
 
 these programs either take zero arguments, or a filepath (the affected file), or a json message with filepath + additional info
 
-run copyparty with `--help-hooks` for usage details / hook type explanations (xm/xbu/xau/xiu/xbc/xac/xbr/xar/xbd/xad/xban)
+run copyparty with `--help-hooks` for usage details / hook type explanations (xbu/xau/xiu/xbr/xar/xbd/xad)
 
 > **note:** in addition to event hooks (the stuff described here), copyparty has another api to run your programs/scripts while providing way more information such as audio tags / video codecs / etc and optionally daisychaining data between scripts in a processing pipeline; if that's what you want then see [mtp plugins](../mtag/) instead
 
@@ -13,9 +13,6 @@ run copyparty with `--help-hooks` for usage details / hook type explanations (xm
 * [image-noexif.py](image-noexif.py) removes image exif by overwriting / directly editing the uploaded file
 * [discord-announce.py](discord-announce.py) announces new uploads on discord using webhooks ([example](https://user-images.githubusercontent.com/241032/215304439-1c1cb3c8-ec6f-4c17-9f27-81f969b1811a.png))
 * [reject-mimetype.py](reject-mimetype.py) rejects uploads unless the mimetype is acceptable
-* [into-the-cache-it-goes.py](into-the-cache-it-goes.py) avoids bugs in caching proxies by immediately downloading each file that is uploaded
-* [podcast-normalizer.py](podcast-normalizer.py) creates a second file with dynamic-range-compression whenever an audio file is uploaded
-  * good example of the `idx` [hook effect](https://github.com/9001/copyparty/blob/hovudstraum/docs/devnotes.md#hook-effects) to tell copyparty about additional files to scan/index
 
 
 # upload batches
@@ -26,12 +23,7 @@ these are `--xiu` hooks; unlike `xbu` and `xau` (which get executed on every sin
 
 # before upload
 * [reject-extension.py](reject-extension.py) rejects uploads if they match a list of file extensions
-* [reloc-by-ext.py](reloc-by-ext.py) redirects an upload to another destination based on the file extension
-  * good example of the `reloc` [hook effect](https://github.com/9001/copyparty/blob/hovudstraum/docs/devnotes.md#hook-effects)
 
 
 # on message
 * [wget.py](wget.py) lets you download files by POSTing URLs to copyparty
-* [qbittorrent-magnet.py](qbittorrent-magnet.py) starts downloading a torrent if you post a magnet url
-* [usb-eject.py](usb-eject.py) adds web-UI buttons to safe-remove usb flashdrives shared through copyparty
-* [msg-log.py](msg-log.py) is a guestbook; logs messages to a doc in the same folder

bin/hooks/discord-announce.py

@@ -12,28 +12,19 @@ announces a new upload on discord
 example usage as global config:
     --xau f,t5,j,bin/hooks/discord-announce.py
 
-parameters explained,
-    xau = execute after upload
-    f  = fork; don't delay other hooks while this is running
-    t5 = timeout if it's still running after 5 sec
-    j  = this hook needs upload information as json (not just the filename)
-
 example usage as a volflag (per-volume config):
     -v srv/inc:inc:r:rw,ed:c,xau=f,t5,j,bin/hooks/discord-announce.py
                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     (share filesystem-path srv/inc as volume /inc,
      readable by everyone, read-write for user 'ed',
-     running this plugin on all uploads with the params explained above)
+     running this plugin on all uploads with the params listed below)
 
-example usage as a volflag in a copyparty config file:
-    [/inc]
-      srv/inc
-      accs:
-        r: *
-        rw: ed
-      flags:
-        xau: f,t5,j,bin/hooks/discord-announce.py
+parameters explained,
+    xbu = execute after upload
+    f  = fork; don't wait for it to finish
+    t5 = timeout if it's still running after 5 sec
+    j  = provide upload information as json; not just the filename
 
 replace "xau" with "xbu" to announce Before upload starts instead of After completion
 

bin/hooks/into-the-cache-it-goes.py

@@ -1,140 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import json
-import shutil
-import platform
-import subprocess as sp
-from urllib.parse import quote
-
-
-_ = r"""
-try to avoid race conditions in caching proxies
-(primarily cloudflare, but probably others too)
-by means of the most obvious solution possible:
-
-just as each file has finished uploading, use
-the server's external URL to download the file
-so that it ends up in the cache, warm and snug
-
-this intentionally delays the upload response
-as it waits for the file to finish downloading
-before copyparty is allowed to return the URL
-
-NOTE: you must edit this script before use,
-  replacing https://example.com with your URL
-
-NOTE: if the files are only accessible with a
-  password and/or filekey, you must also add
-  a cromulent password in the PASSWORD field
-
-NOTE: needs either wget, curl, or "requests":
-  python3 -m pip install --user -U requests
-
-
-example usage as global config:
-    --xau j,t10,bin/hooks/into-the-cache-it-goes.py
-
-parameters explained,
-    xau = execute after upload
-    j   = this hook needs upload information as json (not just the filename)
-    t10 = abort download and continue if it takes longer than 10sec
-
-example usage as a volflag (per-volume config):
-    -v srv/inc:inc:r:rw,ed:c,xau=j,t10,bin/hooks/into-the-cache-it-goes.py
-                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-    (share filesystem-path srv/inc as volume /inc,
-     readable by everyone, read-write for user 'ed',
-     running this plugin on all uploads with params explained above)
-
-example usage as a volflag in a copyparty config file:
-    [/inc]
-      srv/inc
-      accs:
-        r: *
-        rw: ed
-      flags:
-        xau: j,t10,bin/hooks/into-the-cache-it-goes.py
-"""
-
-
-# replace this with your site's external URL
-# (including the :portnumber if necessary)
-SITE_URL = "https://example.com"
-
-# if downloading is protected by passwords or filekeys,
-# specify a valid password between the quotes below:
-PASSWORD = ""
-
-# if file is larger than this, skip download
-MAX_MEGABYTES = 8
-
-# =============== END OF CONFIG ===============
-
-
-WINDOWS = platform.system() == "Windows"
-
-
-def main():
-    fun = download_with_python
-    if shutil.which("curl"):
-        fun = download_with_curl
-    elif shutil.which("wget"):
-        fun = download_with_wget
-
-    inf = json.loads(sys.argv[1])
-
-    if inf["sz"] > 1024 * 1024 * MAX_MEGABYTES:
-        print("[into-the-cache] file is too large; will not download")
-        return
-
-    file_url = "/"
-    if inf["vp"]:
-        file_url += inf["vp"] + "/"
-    file_url += inf["ap"].replace("\\", "/").split("/")[-1]
-    file_url = SITE_URL.rstrip("/") + quote(file_url, safe=b"/")
-
-    print("[into-the-cache] %s(%s)" % (fun.__name__, file_url))
-    fun(file_url, PASSWORD.strip())
-
-    print("[into-the-cache] Download OK")
-
-
-def download_with_curl(url, pw):
-    cmd = ["curl"]
-
-    if pw:
-        cmd += ["-HPW:%s" % (pw,)]
-
-    nah = sp.DEVNULL
-    sp.check_call(cmd + [url], stdout=nah, stderr=nah)
-
-
-def download_with_wget(url, pw):
-    cmd = ["wget", "-O"]
-
-    cmd += ["nul" if WINDOWS else "/dev/null"]
-
-    if pw:
-        cmd += ["--header=PW:%s" % (pw,)]
-
-    nah = sp.DEVNULL
-    sp.check_call(cmd + [url], stdout=nah, stderr=nah)
-
-
-def download_with_python(url, pw):
-    import requests
-
-    headers = {}
-    if pw:
-        headers["PW"] = pw
-
-    with requests.get(url, headers=headers, stream=True) as r:
-        r.raise_for_status()
-        for _ in r.iter_content(chunk_size=1024 * 256):
-            pass
-
-
-if __name__ == "__main__":
-    main()

bin/hooks/msg-log.py

@@ -14,32 +14,19 @@ except:
     from datetime import datetime
 
 
-_ = r"""
+"""
 use copyparty as a dumb messaging server / guestbook thing;
-accepts guestbook entries from 📟 (message-to-server-log) in the web-ui
 initially contributed by @clach04 in https://github.com/9001/copyparty/issues/35 (thanks!)
 
-example usage as global config:
+Sample usage:
+
     python copyparty-sfx.py --xm j,bin/hooks/msg-log.py
 
-parameters explained,
-    xm = execute on message (📟)
-    j  = this hook needs message information as json (not just the message-text)
+Where:
 
-example usage as a volflag (per-volume config):
-    python copyparty-sfx.py -v srv/log:log:r:c,xm=j,bin/hooks/msg-log.py
-                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-    (share filesystem-path srv/log as volume /log, readable by everyone,
-     running this plugin on all messages with the params explained above)
-
-example usage as a volflag in a copyparty config file:
-    [/log]
-      srv/log
-      accs:
-        r: *
-      flags:
-        xm: j,bin/hooks/msg-log.py
+    xm = execute on message-to-server-log
+    j = provide message information as json; not just the text - this script REQUIRES json
+    t10 = timeout and kill download after 10 secs
 """
 
 

bin/hooks/podcast-normalizer.py

@@ -1,121 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import os
-import sys
-import subprocess as sp
-
-
-_ = r"""
-sends all uploaded audio files through an aggressive
-dynamic-range-compressor to even out the volume levels
-
-dependencies:
-    ffmpeg
-
-being an xau hook, this gets eXecuted After Upload completion
-    but before copyparty has started hashing/indexing the file, so
-    we'll create a second normalized copy in a subfolder and tell
-    copyparty to hash/index that additional file as well
-
-example usage as global config:
-    -e2d -e2t --xau j,c1,bin/hooks/podcast-normalizer.py
-
-parameters explained,
-    e2d/e2t = enable database and metadata indexing
-    xau = execute after upload
-    j   = this hook needs upload information as json (not just the filename)
-    c1  = this hook returns json on stdout, so tell copyparty to read that
-
-example usage as a volflag (per-volume config):
-    -v srv/inc/pods:inc/pods:r:rw,ed:c,xau=j,c1,bin/hooks/podcast-normalizer.py
-                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-    (share fs-path srv/inc/pods at URL /inc/pods,
-     readable by all, read-write for user ed,
-     running this xau (exec-after-upload) plugin for all uploaded files)
-
-example usage as a volflag in a copyparty config file:
-    [/inc/pods]
-      srv/inc/pods
-      accs:
-        r: *
-        rw: ed
-      flags:
-        e2d  # enables file indexing
-        e2t  # metadata tags too
-        xau: j,c1,bin/hooks/podcast-normalizer.py
-
-"""
-
-########################################################################
-### CONFIG
-
-# filetypes to process; ignores everything else
-EXTS = "mp3 flac ogg oga opus m4a aac wav wma"
-
-# the name of the subdir to put the normalized files in
-SUBDIR = "normalized"
-
-########################################################################
-
-
-# try to enable support for crazy filenames
-try:
-    from copyparty.util import fsenc
-except:
-
-    def fsenc(p):
-        return p.encode("utf-8")
-
-
-def main():
-    # read info from copyparty
-    inf = json.loads(sys.argv[1])
-    vpath = inf["vp"]
-    abspath = inf["ap"]
-
-    # check if the file-extension is on the to-be-processed list
-    ext = abspath.lower().split(".")[-1]
-    if ext not in EXTS.split():
-        return
-
-    # jump into the folder where the file was uploaded
-    # and create the subfolder to place the normalized copy inside
-    dirpath, filename = os.path.split(abspath)
-    os.chdir(fsenc(dirpath))
-    os.makedirs(SUBDIR, exist_ok=True)
-
-    # the input and output filenames to give ffmpeg
-    fname_in = fsenc(f"./{filename}")
-    fname_out = fsenc(f"{SUBDIR}/{filename}.opus")
-
-    # fmt: off
-    # create and run the ffmpeg command
-    cmd = [
-        b"ffmpeg",
-        b"-nostdin",
-        b"-hide_banner",
-        b"-i", fname_in,
-        b"-af", b"dynaudnorm=f=100:g=9",  # the normalizer config
-        b"-c:a", b"libopus",
-        b"-b:a", b"128k",
-        fname_out,
-    ]
-    # fmt: on
-    sp.check_output(cmd)
-
-    # and finally, tell copyparty about the new file
-    # so it appears in the database and rss-feed:
-    vpath = f"{SUBDIR}/{filename}.opus"
-    print(json.dumps({"idx": {"vp": [vpath]}}))
-
-    # (it's fine to give it a relative path like that; it gets
-    #  resolved relative to the folder the file was uploaded into)
-
-
-if __name__ == "__main__":
-    try:
-        main()
-    except Exception as ex:
-        print("podcast-normalizer failed; %r" % (ex,))

bin/hooks/qbittorrent-magnet.py

@@ -1,128 +0,0 @@
-#!/usr/bin/env python3
-# coding: utf-8
-
-import os
-import sys
-import json
-import shutil
-import subprocess as sp
-
-
-_ = r"""
-start downloading a torrent by POSTing a magnet URL to copyparty,
-for example using 📟 (message-to-server-log) in the web-ui
-
-by default it will download the torrent to the folder you were in
-when you pasted the magnet into the message-to-server-log field
-
-you can optionally specify another location by adding a whitespace
-after the magnet URL followed by the name of the subfolder to DL into,
-or for example "anime/airing" would download to /srv/media/anime/airing
-because the keyword "anime" is in the DESTS config below
-
-needs python3
-
-example usage as global config (not a good idea):
-    python copyparty-sfx.py --xm aw,f,j,t60,bin/hooks/qbittorrent-magnet.py
-
-parameters explained,
-    xm = execute on message (📟)
-    aw = only users with write-access can use this
-    f = fork; don't delay other hooks while this is running
-    j = provide message information as json (not just the text)
-    t60 = abort if qbittorrent has to think about it for more than 1 min
-
-example usage as a volflag (per-volume config, much better):
-    -v srv/qb:qb:A,ed:c,xm=aw,f,j,t60,bin/hooks/qbittorrent-magnet.py
-                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-    (share filesystem-path srv/qb as volume /qb with Admin for user 'ed',
-     running this plugin on all messages with the params explained above)
-
-example usage as a volflag in a copyparty config file:
-    [/qb]
-      srv/qb
-      accs:
-        A: ed
-      flags:
-        xm: aw,f,j,t60,bin/hooks/qbittorrent-magnet.py
-
-the volflag examples only kicks in if you send the torrent magnet
-while you're in the /qb folder (or any folder below there)
-"""
-
-
-# list of usernames to allow
-ALLOWLIST = [ "ed", "morpheus" ]
-
-
-# list of destination aliases to translate into full filesystem
-# paths; takes effect if the first folder component in the
-# custom download location matches anything in this dict
-DESTS = {
-    "iso": "/srv/pub/linux-isos",
-    "anime": "/srv/media/anime",
-}
-
-
-def main():
-    inf = json.loads(sys.argv[1])
-    url = inf["txt"]
-    if not url.lower().startswith("magnet:?"):
-        # not a magnet, abort
-        return
-
-    if inf["user"] not in ALLOWLIST:
-        print("🧲 denied for user", inf["user"])
-        return
-
-    # might as well run the command inside the filesystem folder
-    # which matches the URL that the magnet message was sent to
-    os.chdir(inf["ap"])
-
-    # is there is a custom download location in the url?
-    dst = ""
-    if " " in url:
-        url, dst = url.split(" ", 1)
-
-        # is the location in the predefined list of locations?
-        parts = dst.replace("\\", "/").split("/")
-        if parts[0] in DESTS:
-            dst = os.path.join(DESTS[parts[0]], *(parts[1:]))
-
-    else:
-        # nope, so download to the current folder instead;
-        # comment the dst line below to instead use the default
-        # download location from your qbittorrent settings
-        dst = inf["ap"]
-        pass
-
-    # archlinux has a -nox suffix for qbittorrent if headless
-    # so check if we should be using that
-    if shutil.which("qbittorrent-nox"):
-        torrent_bin = "qbittorrent-nox"
-    else:
-        torrent_bin = "qbittorrent"
-
-    # the command to add a new torrent, adjust if necessary
-    cmd = [torrent_bin, url]
-    if dst:
-        cmd += ["--save-path=%s" % (dst,)]
-
-    # if copyparty and qbittorrent are running as different users
-    # you may have to do something like the following
-    # (assuming qbittorrent* is nopasswd-allowed in sudoers):
-    #
-    # cmd = ["sudo", "-u", "qbitter"] + cmd
-
-    print("🧲", cmd)
-
-    try:
-        sp.check_call(cmd)
-    except:
-        print("🧲 FAILED TO ADD", url)
-
-
-if __name__ == "__main__":
-    main()
-

bin/hooks/reloc-by-ext.py

@@ -1,130 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import os
-import re
-import sys
-
-
-_ = r"""
-relocate/redirect incoming uploads according to file extension or name
-
-example usage as global config:
-    --xbu j,c1,bin/hooks/reloc-by-ext.py
-
-parameters explained,
-    xbu = execute before upload
-    j   = this hook needs upload information as json (not just the filename)
-    c1  = this hook returns json on stdout, so tell copyparty to read that
-
-example usage as a volflag (per-volume config):
-    -v srv/inc:inc:r:rw,ed:c,xbu=j,c1,bin/hooks/reloc-by-ext.py
-                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-    (share filesystem-path srv/inc as volume /inc,
-     readable by everyone, read-write for user 'ed',
-     running this plugin on all uploads with the params explained above)
-
-example usage as a volflag in a copyparty config file:
-    [/inc]
-      srv/inc
-      accs:
-        r: *
-        rw: ed
-      flags:
-        xbu: j,c1,bin/hooks/reloc-by-ext.py
-
-note: this could also work as an xau hook (after-upload), but
-  because it doesn't need to read the file contents its better
-  as xbu (before-upload) since that's safer / less buggy,
-  and only xbu works with up2k (dragdrop into browser)
-"""
-
-
-PICS = "avif bmp gif heic heif jpeg jpg jxl png psd qoi tga tif tiff webp"
-VIDS = "3gp asf avi flv mkv mov mp4 mpeg mpeg2 mpegts mpg mpg2 nut ogm ogv rm ts vob webm wmv"
-MUSIC = "aac aif aiff alac amr ape dfpwm flac m4a mp3 ogg opus ra tak tta wav wma wv"
-
-
-def main():
-    inf = json.loads(sys.argv[1])
-    vdir, fn = os.path.split(inf["vp"])
-
-    try:
-        fn, ext = fn.rsplit(".", 1)
-    except:
-        # no file extension; pretend it's "bin"
-        ext = "bin"
-
-    ext = ext.lower()
-
-    # this function must end by printing the action to perform;
-    # that's handled by the print(json.dumps(... at the bottom
-    #
-    # the action can contain the following keys:
-    # "vp" is the folder URL to move the upload to,
-    # "ap" is the filesystem-path to move it to (but "vp" is safer),
-    # "fn" overrides the final filename to use
-
-    ##
-    ## some example actions to take; pick one by
-    ## selecting it inside the print at the end:
-    ##
-
-    # move all uploads to one specific folder
-    into_junk = {"vp": "/junk"}
-
-    # create a subfolder named after the filetype and move it into there
-    into_subfolder = {"vp": ext}
-
-    # move it into a toplevel folder named after the filetype
-    into_toplevel = {"vp": "/" + ext}
-
-    # move it into a filetype-named folder next to the target folder
-    into_sibling = {"vp": "../" + ext}
-
-    # move images into "/just/pics", vids into "/just/vids",
-    # music into "/just/tunes", and anything else as-is
-    if ext in PICS.split():
-        by_category = {"vp": "/just/pics"}
-    elif ext in VIDS.split():
-        by_category = {"vp": "/just/vids"}
-    elif ext in MUSIC.split():
-        by_category = {"vp": "/just/tunes"}
-    else:
-        by_category = {}  # no action
-
-    # now choose the default effect to apply; can be any of these:
-    # into_junk  into_subfolder  into_toplevel  into_sibling  by_category
-    effect = into_sibling
-
-    ##
-    ## but we can keep going, adding more speicifc rules
-    ## which can take precedence, replacing the fallback
-    ## effect we just specified:
-    ##
-
-    fn = fn.lower()  # lowercase filename to make this easier
-
-    if "screenshot" in fn:
-        effect = {"vp": "/ss"}
-    if "mpv_" in fn:
-        effect = {"vp": "/anishots"}
-    elif "debian" in fn or "biebian" in fn:
-        effect = {"vp": "/linux-ISOs"}
-    elif re.search(r"ep(isode |\.)?[0-9]", fn):
-        effect = {"vp": "/podcasts"}
-
-    # regex lets you grab a part of the matching
-    # text and use that in the upload path:
-    m = re.search(r"\b(op|ed)([^a-z]|$)", fn)
-    if m:
-        # the regex matched; use "anime-op" or "anime-ed"
-        effect = {"vp": "/anime-" + m[1]}
-
-    # aaand DO IT
-    print(json.dumps({"reloc": effect}))
-
-
-if __name__ == "__main__":
-    main()

bin/hooks/usb-eject.js

@@ -1,62 +0,0 @@
-// see usb-eject.py for usage
-
-function usbclick() {
-    var o = QS('#treeul a[dst="/usb/"]') || QS('#treepar a[dst="/usb/"]');
-    if (o)
-        o.click();
-}
-
-function eject_cb() {
-    var t = ('' + this.responseText).trim();
-    if (t.indexOf('can be safely unplugged') < 0 && t.indexOf('Device can be removed') < 0)
-        return toast.err(30, 'usb eject failed:\n\n' + t);
-
-    toast.ok(5, esc(t.replace(/ - /g, '\n\n')).trim());
-    usbclick(); setTimeout(usbclick, 10);
-};
-
-function add_eject_2(a) {
-    var aw = a.getAttribute('href').split(/\//g);
-    if (aw.length != 4 || aw[3])
-        return;
-
-    var v = aw[2],
-        k = 'umount_' + v;
-
-    for (var b = 0; b < 9; b++) {
-        var o = ebi(k);
-        if (!o)
-            break;
-        o.parentNode.removeChild(o);
-    }
-
-    a.appendChild(mknod('span', k, '⏏'), a);
-    o = ebi(k);
-    o.style.cssText = 'position:absolute; right:1em; margin-top:-.2em; font-size:1.3em';
-    o.onclick = function (e) {
-        ev(e);
-        var xhr = new XHR();
-        xhr.open('POST', get_evpath(), true);
-        xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
-        xhr.send('msg=' + uricom_enc(':usb-eject:' + v + ':'));
-        xhr.onload = xhr.onerror = eject_cb;
-        toast.inf(10, "ejecting " + v + "...");
-    };
-};
-
-function add_eject() {
-    var o = QSA('#treeul a[href^="/usb/"]') || QSA('#treepar a[href^="/usb/"]');
-    for (var a = o.length - 1; a > 0; a--)
-        add_eject_2(o[a]);
-};
-
-(function() {
-    var f0 = treectl.rendertree;
-    treectl.rendertree = function (res, ts, top0, dst, rst) {
-        var ret = f0(res, ts, top0, dst, rst);
-        add_eject();
-        return ret;
-    };
-})();
-
-setTimeout(add_eject, 50);

bin/hooks/usb-eject.py

@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import stat
-import subprocess as sp
-import sys
-
-
-"""
-if you've found yourself using copyparty to serve flashdrives on a LAN
-and your only wish is that the web-UI had a button to unmount / safely
-remove those flashdrives, then boy howdy are you in the right place :D
-
-put usb-eject.js in the webroot (or somewhere else http-accessible)
-then run copyparty with these args:
-
-   -v /run/media/egon:/usb:A:c,hist=/tmp/junk
-   --xm=c1,bin/hooks/usb-eject.py
-   --js-browser=/usb-eject.js
-
-which does the following respectively,
-
-  * share all of /run/media/egon as /usb with admin for everyone
-     and put the histpath somewhere it won't cause trouble
-  * run the usb-eject hook with stdout redirect to the web-ui
-  * add the complementary usb-eject.js to the browser
-
-"""
-
-
-def main():
-    try:
-        label = sys.argv[1].split(":usb-eject:")[1].split(":")[0]
-        mp = "/run/media/egon/" + label
-        # print("ejecting [%s]... " % (mp,), end="")
-        mp = os.path.abspath(os.path.realpath(mp.encode("utf-8")))
-        st = os.lstat(mp)
-        if not stat.S_ISDIR(st.st_mode):
-            raise Exception("not a regular directory")
-
-        # if you're running copyparty as root (thx for the faith)
-        # you'll need something like this to make dbus talkative
-        cmd = b"sudo -u egon DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus gio mount -e"
-
-        # but if copyparty and the ui-session is running
-        # as the same user (good) then this is plenty
-        cmd = b"gio mount -e"
-
-        cmd = cmd.split(b" ") + [mp]
-        ret = sp.check_output(cmd).decode("utf-8", "replace")
-        print(ret.strip() or (label + " can be safely unplugged"))
-
-    except Exception as ex:
-        print("unmount failed: %r" % (ex,))
-
-
-if __name__ == "__main__":
-    main()

bin/hooks/wget.py

@@ -9,38 +9,25 @@ import subprocess as sp
 _ = r"""
 use copyparty as a file downloader by POSTing URLs as
 application/x-www-form-urlencoded (for example using the
-📟 message-to-server-log in the web-ui)
+message/pager function on the website)
 
 example usage as global config:
-    --xm aw,f,j,t3600,bin/hooks/wget.py
-
-parameters explained,
-    xm = execute on message-to-server-log
-    aw = only users with write-access can use this
-    f = fork; don't delay other hooks while this is running
-    j = provide message information as json (not just the text)
-    c3 = mute all output
-    t3600 = timeout and abort download after 1 hour
+    --xm f,j,t3600,bin/hooks/wget.py
 
 example usage as a volflag (per-volume config):
-    -v srv/inc:inc:r:rw,ed:c,xm=aw,f,j,t3600,bin/hooks/wget.py
-                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    -v srv/inc:inc:r:rw,ed:c,xm=f,j,t3600,bin/hooks/wget.py
+                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     (share filesystem-path srv/inc as volume /inc,
      readable by everyone, read-write for user 'ed',
-     running this plugin on all messages with the params explained above)
+     running this plugin on all messages with the params listed below)
 
-example usage as a volflag in a copyparty config file:
-    [/inc]
-      srv/inc
-      accs:
-        r: *
-        rw: ed
-      flags:
-        xm: aw,f,j,t3600,bin/hooks/wget.py
-
-the volflag examples only kicks in if you send the message
-while you're in the /inc folder (or any folder below there)
+parameters explained,
+    xm = execute on message-to-server-log
+    f = fork so it doesn't block uploads
+    j = provide message information as json; not just the text
+    c3 = mute all output
+    t3600 = timeout and kill download after 1 hour
 """
 
 

bin/mtag/README.md

@@ -31,9 +31,6 @@ plugins in this section should only be used with appropriate precautions:
 * [very-bad-idea.py](./very-bad-idea.py) combined with [meadup.js](https://github.com/9001/copyparty/blob/hovudstraum/contrib/plugins/meadup.js) converts copyparty into a janky yet extremely flexible chromecast clone
   * also adds a virtual keyboard by @steinuil to the basic-upload tab for comfy couch crowd control
   * anything uploaded through the [android app](https://github.com/9001/party-up) (files or links) are executed on the server, meaning anyone can infect your PC with malware... so protect this with a password and keep it on a LAN!
-  * [kamelåså](https://github.com/steinuil/kameloso) is a much better (and MUCH safer) alternative to this plugin
-    * powered by [chicken-curry-banana-pineapple-peanut pizza](https://a.ocv.me/pub/g/i/2025/01/298437ce-8351-4c8c-861c-fa131d217999.jpg?cache) so you know it's good
-    * and, unlike this plugin, kamelåså even has windows support (nice)
 
 
 # dependencies

bin/mtag/cksum.py

@@ -2,15 +2,11 @@
 
 import sys
 import json
+import zlib
 import struct
 import base64
 import hashlib
 
-try:
-    from zlib_ng import zlib_ng as zlib
-except:
-    import zlib
-
 try:
     from copyparty.util import fsenc
 except:

bin/mtag/install-deps.sh

@@ -223,15 +223,12 @@ install_vamp() {
 	#   use msys2 in mingw-w64 mode
 	#   pacman -S --needed mingw-w64-x86_64-{ffmpeg,python,python-pip,vamp-plugin-sdk}
 	
-	$pybin -m pip install --user vamp || {
-		printf '\n\033[7malright, trying something else...\033[0m\n'
-		$pybin -m pip install --user --no-build-isolation vamp
-	}
+	$pybin -m pip install --user vamp
 
 	cd "$td"
 	echo '#include <vamp-sdk/Plugin.h>' | g++ -x c++ -c -o /dev/null - || [ -e ~/pe/vamp-sdk ] || {
 		printf '\033[33mcould not find the vamp-sdk, building from source\033[0m\n'
-		(dl_files yolo https://ocv.me/mirror/vamp-plugin-sdk-2.10.0.tar.gz)
+		(dl_files yolo https://code.soundsoftware.ac.uk/attachments/download/2691/vamp-plugin-sdk-2.10.0.tar.gz)
 		sha512sum -c <(
 			echo "153b7f2fa01b77c65ad393ca0689742d66421017fd5931d216caa0fcf6909355fff74706fabbc062a3a04588a619c9b515a1dae00f21a57afd97902a355c48ed  -"
 		) <vamp-plugin-sdk-2.10.0.tar.gz
@@ -247,7 +244,7 @@ install_vamp() {
 	cd "$td"
 	have_beatroot || {
 		printf '\033[33mcould not find the vamp beatroot plugin, building from source\033[0m\n'
-		(dl_files yolo https://ocv.me/mirror/beatroot-vamp-v1.0.tar.gz)
+		(dl_files yolo https://code.soundsoftware.ac.uk/attachments/download/885/beatroot-vamp-v1.0.tar.gz)
 		sha512sum -c <(
 			echo "1f444d1d58ccf565c0adfe99f1a1aa62789e19f5071e46857e2adfbc9d453037bc1c4dcb039b02c16240e9b97f444aaff3afb625c86aa2470233e711f55b6874  -"
 		) <beatroot-vamp-v1.0.tar.gz

bin/mtag/very-bad-idea.py

@@ -6,11 +6,6 @@ WARNING -- DANGEROUS PLUGIN --
   running this plugin, they can execute malware on your machine
   so please keep this on a LAN and protect it with a password
 
-here is a MUCH BETTER ALTERNATIVE (which also works on Windows):
-  https://github.com/steinuil/kameloso
-
-----------------------------------------------------------------------
-
 use copyparty as a chromecast replacement:
   * post a URL and it will open in the default browser
   * upload a file and it will open in the default application

bin/zmq-recv.py

@@ -1,76 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import zmq
-
-"""
-zmq-recv.py: demo zmq receiver
-2025-01-22, v1.0, ed <irc.rizon.net>, MIT-Licensed
-https://github.com/9001/copyparty/blob/hovudstraum/bin/zmq-recv.py
-
-basic zmq-server to receive events from copyparty; try one of
-the below and then "send a message to serverlog" in the web-ui:
-
-1) dumb fire-and-forget to any and all listeners;
-run this script with "sub" and run copyparty with this:
-  --xm zmq:pub:tcp://*:5556
-
-2) one lucky listener gets the message, blocks if no listeners:
-run this script with "pull" and run copyparty with this:
-  --xm t3,zmq:push:tcp://*:5557
-
-3) blocking syn/ack mode, client must ack each message;
-run this script with "rep" and run copyparty with this:
-  --xm t3,zmq:req:tcp://localhost:5555
-
-note: to conditionally block uploads based on message contents,
-use rep_server to answer with "return 1" and run copyparty with
-  --xau t3,c,zmq:req:tcp://localhost:5555
-"""
-
-
-ctx = zmq.Context()
-
-
-def sub_server():
-    # PUB/SUB allows any number of servers/clients, and
-    # messages are fire-and-forget
-    sck = ctx.socket(zmq.SUB)
-    sck.connect("tcp://localhost:5556")
-    sck.setsockopt_string(zmq.SUBSCRIBE, "")
-    while True:
-        print("copyparty says %r" % (sck.recv_string(),))
-
-
-def pull_server():
-    # PUSH/PULL allows any number of servers/clients, and
-    # each message is sent to a exactly one PULL client
-    sck = ctx.socket(zmq.PULL)
-    sck.connect("tcp://localhost:5557")
-    while True:
-        print("copyparty says %r" % (sck.recv_string(),))
-
-
-def rep_server():
-    # REP/REQ is a server/client pair where each message must be
-    # acked by the other before another message can be sent, so
-    # copyparty will do a blocking-wait for the ack
-    sck = ctx.socket(zmq.REP)
-    sck.bind("tcp://*:5555")
-    while True:
-        print("copyparty says %r" % (sck.recv_string(),))
-        reply = b"thx"
-        # reply = b"return 1"  # non-zero to block an upload
-        sck.send(reply)
-
-
-mode = sys.argv[1].lower() if len(sys.argv) > 1 else ""
-
-if mode == "sub":
-    sub_server()
-elif mode == "pull":
-    pull_server()
-elif mode == "rep":
-    rep_server()
-else:
-    print("specify mode as first argument:  SUB | PULL | REP")

contrib/README.md

@@ -12,25 +12,15 @@
 * assumes the webserver and copyparty is running on the same server/IP
 * modify `10.13.1.1` as necessary if you wish to support browsers without javascript
 
-### [`sharex.sxcu`](sharex.sxcu) - Windows screenshot uploader
-* [sharex](https://getsharex.com/) config file to upload screenshots and grab the URL
-* `RequestURL`: full URL to the target folder
-* `pw`: password (remove the `pw` line if anon-write)
-* the `act:bput` thing is optional since copyparty v1.9.29
-* using an older sharex version, maybe sharex v12.1.1 for example? dw fam i got your back 👉😎👉 [`sharex12.sxcu`](sharex12.sxcu)
-
-### [`ishare.iscu`](ishare.iscu) - MacOS screenshot uploader
-* [ishare](https://isharemac.app/) config file to upload screenshots and grab the URL
+### [`sharex.sxcu`](sharex.sxcu)
+* sharex config file to upload screenshots and grab the URL
 * `RequestURL`: full URL to the target folder
 * `pw`: password (remove the `pw` line if anon-write)
 
-### [`flameshot.sh`](flameshot.sh) - Linux screenshot uploader
-* takes a screenshot with [flameshot](https://flameshot.org/) on Linux, uploads it, and writes the URL to clipboard
-
-### [`send-to-cpp.contextlet.json`](send-to-cpp.contextlet.json)
-* browser integration, kind of? custom rightclick actions and stuff
-* rightclick a pic and send it to copyparty straight from your browser
-* for the [contextlet](https://addons.mozilla.org/en-US/firefox/addon/contextlets/) firefox extension
+however if your copyparty is behind a reverse-proxy, you may want to use [`sharex-html.sxcu`](sharex-html.sxcu) instead:
+* `RequestURL`: full URL to the target folder
+* `URL`: full URL to the root folder (with trailing slash) followed by `$regex:1|1$`
+* `pw`: password (remove `Parameters` if anon-write)
 
 ### [`media-osd-bgone.ps1`](media-osd-bgone.ps1)
 * disables the [windows OSD popup](https://user-images.githubusercontent.com/241032/122821375-0e08df80-d2dd-11eb-9fd9-184e8aacf1d0.png) (the thing on the left) which appears every time you hit media hotkeys to adjust volume or change song while playing music with the copyparty web-ui, or most other audio players really
@@ -50,9 +40,6 @@
 * give a 3rd argument to install it to your copyparty config
 * systemd service at [`systemd/cfssl.service`](systemd/cfssl.service)
 
-### [`zfs-tune.py`](zfs-tune.py)
-* optimizes databases for optimal performance when stored on a zfs filesystem; also see [openzfs docs](https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Workload%20Tuning.html#database-workloads) and specifically the SQLite subsection
-
 # OS integration
 init-scripts to start copyparty as a service
 * [`systemd/copyparty.service`](systemd/copyparty.service) runs the sfx normally
@@ -61,10 +48,5 @@ init-scripts to start copyparty as a service
 * [`openrc/copyparty`](openrc/copyparty)
 
 # Reverse-proxy
-copyparty supports running behind another webserver
-* [`apache/copyparty.conf`](apache/copyparty.conf)
-* [`haproxy/copyparty.conf`](haproxy/copyparty.conf)
-* [`lighttpd/subdomain.conf`](lighttpd/subdomain.conf)
-* [`lighttpd/subpath.conf`](lighttpd/subpath.conf)
-* [`nginx/copyparty.conf`](nginx/copyparty.conf) -- recommended
-* [`traefik/copyparty.yaml`](traefik/copyparty.yaml)
+copyparty has basic support for running behind another webserver
+* [`nginx/copyparty.conf`](nginx/copyparty.conf)

contrib/apache/copyparty.conf

@@ -1,29 +1,14 @@
-# if you would like to use unix-sockets (recommended),
-# you must run copyparty with one of the following:
+# when running copyparty behind a reverse proxy,
+# the following arguments are recommended:
 #
-#   -i unix:777:/dev/shm/party.sock
-#   -i unix:777:/dev/shm/party.sock,127.0.0.1
+#   -i 127.0.0.1    only accept connections from nginx
 #
 # if you are doing location-based proxying (such as `/stuff` below)
 # you must run copyparty with --rp-loc=stuff
 #
 # on fedora/rhel, remember to setsebool -P httpd_can_network_connect 1
 
-
 LoadModule proxy_module modules/mod_proxy.so
-
+ProxyPass "/stuff" "http://127.0.0.1:3923/stuff"
+# do not specify ProxyPassReverse
 RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
-# NOTE: do not specify ProxyPassReverse
-
-
-##
-## then, enable one of the below:
-
-# use subdomain proxying to unix-socket (best)
-ProxyPass "/" "unix:///dev/shm/party.sock|http://whatever/"
-
-# use subdomain proxying to 127.0.0.1 (slower)
-#ProxyPass "/" "http://127.0.0.1:3923/"
-
-# use subpath proxying to 127.0.0.1 (slow and maybe buggy)
-#ProxyPass "/stuff" "http://127.0.0.1:3923/stuff"

contrib/flameshot.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-
-# take a screenshot with flameshot and send it to copyparty;
-# the image url will be placed on your clipboard
-
-password=wark
-url=https://a.ocv.me/up/
-filename=$(date +%Y-%m%d-%H%M%S).png
-
-flameshot gui -s -r |
-curl -T- $url$filename?pw=$password |
-tail -n 1 |
-xsel -ib

contrib/haproxy/copyparty.conf

@@ -1,24 +0,0 @@
-# this config is essentially two separate examples;
-#
-#   foo1 connects to copyparty using tcp, and
-#   foo2 uses unix-sockets for 27% higher performance
-#
-# to use foo2 you must run copyparty with one of the following:
-#
-#   -i unix:777:/dev/shm/party.sock
-#   -i unix:777:/dev/shm/party.sock,127.0.0.1
-
-defaults
-  mode http
-  option forwardfor
-  timeout connect 1s
-  timeout client 610s
-  timeout server 610s
-
-listen foo1
-  bind *:8081
-  server srv1 127.0.0.1:3923 maxconn 512
-
-listen foo2
-  bind *:8082
-  server srv1 /dev/shm/party.sock maxconn 512

contrib/ishare.iscu

@@ -1,10 +0,0 @@
-{
-  "Name": "copyparty",
-  "RequestURL": "http://127.0.0.1:3923/screenshots/",
-  "Headers": {
-    "pw": "PUT_YOUR_PASSWORD_HERE_MY_DUDE",
-    "accept": "json"
-  },
-  "FileFormName": "f",
-  "ResponseURL": "{{fileurl}}"
-}

contrib/lighttpd/subdomain.conf

@@ -1,24 +0,0 @@
-# example usage for benchmarking:
-#
-#   taskset -c 1 lighttpd -Df ~/dev/copyparty/contrib/lighttpd/subdomain.conf
-#
-# lighttpd can connect to copyparty using either tcp (127.0.0.1)
-# or a unix-socket, but unix-sockets are 37% faster because
-# lighttpd doesn't reuse tcp connections, so we're doing unix-sockets
-#
-# this means we must run copyparty with one of the following:
-#
-#   -i unix:777:/dev/shm/party.sock
-#   -i unix:777:/dev/shm/party.sock,127.0.0.1
-#
-# on fedora/rhel, remember to setsebool -P httpd_can_network_connect 1
-
-server.port = 80
-server.document-root = "/var/empty"
-server.upload-dirs = ( "/dev/shm", "/tmp" )
-server.modules = ( "mod_proxy" )
-proxy.forwarded = ( "for" => 1, "proto" => 1 )
-proxy.server = ( "" => ( ( "host" => "/dev/shm/party.sock" ) ) )
-
-# if you really need to use tcp instead of unix-sockets, do this instead:
-#proxy.server = ( "" => ( ( "host" => "127.0.0.1", "port" => "3923" ) ) )

contrib/lighttpd/subpath.conf

@@ -1,31 +0,0 @@
-# example usage for benchmarking:
-#
-#   taskset -c 1 lighttpd -Df ~/dev/copyparty/contrib/lighttpd/subpath.conf
-#
-# lighttpd can connect to copyparty using either tcp (127.0.0.1)
-# or a unix-socket, but unix-sockets are 37% faster because
-# lighttpd doesn't reuse tcp connections, so we're doing unix-sockets
-#
-# this means we must run copyparty with one of the following:
-#
-#   -i unix:777:/dev/shm/party.sock
-#   -i unix:777:/dev/shm/party.sock,127.0.0.1
-#
-# also since this example proxies a subpath instead of the
-# recommended subdomain-proxying, we must also specify this:
-#
-#   --rp-loc files
-#
-# on fedora/rhel, remember to setsebool -P httpd_can_network_connect 1
-
-server.port = 80
-server.document-root = "/var/empty"
-server.upload-dirs = ( "/dev/shm", "/tmp" )
-server.modules = ( "mod_proxy" )
-$HTTP["url"] =~ "^/files" {
-    proxy.forwarded = ( "for" => 1, "proto" => 1 )
-    proxy.server = ( "" => ( ( "host" => "/dev/shm/party.sock" ) ) )
-
-    # if you really need to use tcp instead of unix-sockets, do this instead:
-    #proxy.server = ( "" => ( ( "host" => "127.0.0.1", "port" => "3923" ) ) )
-}

contrib/nginx/copyparty.conf

@@ -1,70 +1,35 @@
-# look for "max clients:" when starting copyparty, as nginx should
-# not accept more consecutive clients than what copyparty is able to;
+# when running copyparty behind a reverse proxy,
+# the following arguments are recommended:
+#
+#   -i 127.0.0.1    only accept connections from nginx
+#
+# -nc must match or exceed the webserver's max number of concurrent clients;
+# copyparty default is 1024 if OS permits it (see "max clients:" on startup),
 # nginx default is 512  (worker_processes 1, worker_connections 512)
 #
-# rarely, in some extreme usecases, it can be good to add -j0
-# (40'000 requests per second, or 20gbps upload/download in parallel)
-# but this is usually counterproductive and slightly buggy
+# you may also consider adding -j0 for CPU-intensive configurations
+# (5'000 requests per second, or 20gbps upload/download in parallel)
 #
 # on fedora/rhel, remember to setsebool -P httpd_can_network_connect 1
-#
-# if you are behind cloudflare (or another protection service),
-# remember to reject all connections which are not coming from your
-# protection service -- for cloudflare in particular, you can
-# generate the list of permitted IP ranges like so:
-#   (curl -s https://www.cloudflare.com/ips-v{4,6} | sed 's/^/allow /; s/$/;/'; echo; echo "deny all;") > /etc/nginx/cloudflare-only.conf
-#
-# and then enable it below by uncomenting the cloudflare-only.conf line
-
-
-upstream cpp_tcp {
-	# alternative 1: connect to copyparty using tcp;
-	# cpp_uds is slightly faster and more secure, but
-	# cpp_tcp is easier to setup and "just works"
-	# ...you should however restrict copyparty to only
-	# accept connections from nginx by adding these args:
-	# -i 127.0.0.1
 
+upstream cpp {
 	server 127.0.0.1:3923 fail_timeout=1s;
 	keepalive 1;
 }
-
-
-upstream cpp_uds {
-	# alternative 2: unix-socket, aka. "unix domain socket";
-	# 5-10% faster, and better isolation from other software,
-	# but there must be at least one unix-group which both
-	# nginx and copyparty is a member of; if that group is
-	# "www" then run copyparty with the following args:
-	# -i unix:770:www:/dev/shm/party.sock
-
-	server unix:/dev/shm/party.sock fail_timeout=1s;
-	keepalive 1;
-}
-
-
 server {
 	listen 443 ssl;
 	listen [::]:443 ssl;
 
 	server_name fs.example.com;
-
-	# uncomment the following line to reject non-cloudflare connections, ensuring client IPs cannot be spoofed:
-	#include /etc/nginx/cloudflare-only.conf;
-
+	
 	location / {
-		# recommendation: replace cpp_tcp with cpp_uds below
-		proxy_pass http://cpp_tcp;
+		proxy_pass http://cpp;
 		proxy_redirect off;
 		# disable buffering (next 4 lines)
 		proxy_http_version 1.1;
 		client_max_body_size 0;
 		proxy_buffering off;
 		proxy_request_buffering off;
-		# improve download speed from 600 to 1500 MiB/s
-		proxy_buffers 32 8k;
-		proxy_buffer_size 16k;
-		proxy_busy_buffers_size 24k;
 
 		proxy_set_header   Host              $host;
 		proxy_set_header   X-Real-IP         $remote_addr;
@@ -76,7 +41,6 @@ server {
 	}
 }
 
-
 # default client_max_body_size (1M) blocks uploads larger than 256 MiB
 client_max_body_size 1024M;
 client_header_timeout 610m;

contrib/nixos/modules/copyparty.nix

@@ -1,31 +1,29 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  mkKeyValue = key: value:
-    if value == true
-    then
-      # sets with a true boolean value are coerced to just the key name
-      key
-    else if value == false
-    then
-      # or omitted completely when false
-      ""
-    else (generators.mkKeyValueDefault {inherit mkValueString;} ": " key value);
+{ config, pkgs, lib, ... }:
 
-  mkAttrsString = value: (generators.toKeyValue {inherit mkKeyValue;} value);
+with lib;
+
+let
+  mkKeyValue = key: value:
+    if value == true then
+    # sets with a true boolean value are coerced to just the key name
+      key
+    else if value == false then
+    # or omitted completely when false
+      ""
+    else
+      (generators.mkKeyValueDefault { inherit mkValueString; } ": " key value);
+
+  mkAttrsString = value: (generators.toKeyValue { inherit mkKeyValue; } value);
 
   mkValueString = value:
-    if isList value
-    then (concatStringsSep ", " (map mkValueString value))
-    else if isAttrs value
-    then "\n" + (mkAttrsString value)
-    else (generators.mkValueStringDefault {} value);
+    if isList value then
+      (concatStringsSep ", " (map mkValueString value))
+    else if isAttrs value then
+      "\n" + (mkAttrsString value)
+    else
+      (generators.mkValueStringDefault { } value);
 
-  mkSectionName = value: "[" + (escape ["[" "]"] value) + "]";
+  mkSectionName = value: "[" + (escape [ "[" "]" ] value) + "]";
 
   mkSection = name: attrs: ''
     ${mkSectionName name}
@@ -51,12 +49,12 @@ with lib; let
     ${concatStringsSep "\n" (mapAttrsToList mkVolume cfg.volumes)}
   '';
 
+  name = "copyparty";
   cfg = config.services.copyparty;
-  configFile = pkgs.writeText "copyparty.conf" configStr;
-  runtimeConfigPath = "/run/copyparty/copyparty.conf";
-  externalCacheDir = "/var/cache/copyparty";
-  externalStateDir = "/var/lib/copyparty";
-  defaultShareDir = "${externalStateDir}/data";
+  configFile = pkgs.writeText "${name}.conf" configStr;
+  runtimeConfigPath = "/run/${name}/${name}.conf";
+  home = "/var/lib/${name}";
+  defaultShareDir = "${home}/data";
 in {
   options.services.copyparty = {
     enable = mkEnableOption "web-based file manager";
@@ -70,35 +68,6 @@ in {
       '';
     };
 
-    mkHashWrapper = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Make a shell script wrapper called 'copyparty-hash' with all options set here,
-        that launches the hashing cli.
-      '';
-    };
-
-    user = mkOption {
-      type = types.str;
-      default = "copyparty";
-      description = ''
-        The user that copyparty will run under.
-
-        If changed from default, you are responsible for making sure the user exists.
-      '';
-    };
-
-    group = mkOption {
-      type = types.str;
-      default = "copyparty";
-      description = ''
-        The group that copyparty will run under.
-
-        If changed from default, you are responsible for making sure the user exists.
-      '';
-    };
-
     openFilesLimit = mkOption {
       default = 4096;
       type = types.either types.int types.str;
@@ -110,25 +79,22 @@ in {
       description = ''
         Global settings to apply.
         Directly maps to values in the [global] section of the copyparty config.
-        Cannot set "c" or "hist", those are set by this module.
         See `${getExe cfg.package} --help` for more details.
       '';
       default = {
         i = "127.0.0.1";
         no-reload = true;
-        hist = externalCacheDir;
       };
       example = literalExpression ''
         {
           i = "0.0.0.0";
           no-reload = true;
-          hist = ${externalCacheDir};
         }
       '';
     };
 
     accounts = mkOption {
-      type = types.attrsOf (types.submodule ({...}: {
+      type = types.attrsOf (types.submodule ({ ... }: {
         options = {
           passwordFile = mkOption {
             type = types.str;
@@ -143,7 +109,7 @@ in {
       description = ''
         A set of copyparty accounts to create.
       '';
-      default = {};
+      default = { };
       example = literalExpression ''
         {
           ed.passwordFile = "/run/keys/copyparty/ed";
@@ -152,10 +118,10 @@ in {
     };
 
     volumes = mkOption {
-      type = types.attrsOf (types.submodule ({...}: {
+      type = types.attrsOf (types.submodule ({ ... }: {
         options = {
           path = mkOption {
-            type = types.path;
+            type = types.str;
             description = ''
               Path of a directory to share.
             '';
@@ -211,7 +177,7 @@ in {
                 nohash = "\.iso$";
               };
             '';
-            default = {};
+            default = { };
           };
         };
       }));
@@ -219,7 +185,7 @@ in {
       default = {
         "/" = {
           path = defaultShareDir;
-          access = {r = "*";};
+          access = { r = "*"; };
         };
       };
       example = literalExpression ''
@@ -238,65 +204,52 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (let
-    command = "${getExe cfg.package} -c ${runtimeConfigPath}";
-  in {
+  config = mkIf cfg.enable {
     systemd.services.copyparty = {
       description = "http file sharing hub";
-      wantedBy = ["multi-user.target"];
+      wantedBy = [ "multi-user.target" ];
 
       environment = {
         PYTHONUNBUFFERED = "true";
-        XDG_CONFIG_HOME = externalStateDir;
+        XDG_CONFIG_HOME = "${home}/.config";
       };
 
       preStart = let
-        replaceSecretCommand = name: attrs: "${getExe pkgs.replace-secret} '${
-          passwordPlaceholder name
-        }' '${attrs.passwordFile}' ${runtimeConfigPath}";
+        replaceSecretCommand = name: attrs:
+          "${getExe pkgs.replace-secret} '${
+            passwordPlaceholder name
+          }' '${attrs.passwordFile}' ${runtimeConfigPath}";
       in ''
         set -euo pipefail
         install -m 600 ${configFile} ${runtimeConfigPath}
         ${concatStringsSep "\n"
-          (mapAttrsToList replaceSecretCommand cfg.accounts)}
+        (mapAttrsToList replaceSecretCommand cfg.accounts)}
       '';
 
       serviceConfig = {
         Type = "simple";
-        ExecStart = command;
+        ExecStart = "${getExe cfg.package} -c ${runtimeConfigPath}";
+
         # Hardening options
-        User = cfg.user;
-        Group = cfg.group;
-        RuntimeDirectory = ["copyparty"];
+        User = "copyparty";
+        Group = "copyparty";
+        RuntimeDirectory = name;
         RuntimeDirectoryMode = "0700";
-        StateDirectory = ["copyparty"];
+        StateDirectory = [ name "${name}/data" "${name}/.config" ];
         StateDirectoryMode = "0700";
-        CacheDirectory = lib.mkIf (cfg.settings ? hist) ["copyparty"];
-        CacheDirectoryMode = lib.mkIf (cfg.settings ? hist) "0700";
-        WorkingDirectory = externalStateDir;
-        BindReadOnlyPaths =
-          [
-            "/nix/store"
-            "-/etc/resolv.conf"
-            "-/etc/nsswitch.conf"
-            "-/etc/hosts"
-            "-/etc/localtime"
-          ]
-          ++ (mapAttrsToList (k: v: "-${v.passwordFile}") cfg.accounts);
-        BindPaths =
-          (
-            if cfg.settings ? hist
-            then [cfg.settings.hist]
-            else []
-          )
-          ++ [externalStateDir]
-          ++ (mapAttrsToList (k: v: v.path) cfg.volumes);
-        # ProtectSystem = "strict";
-        # Note that unlike what 'ro' implies,
-        # this actually makes it impossible to read anything in the root FS,
-        # except for things explicitly mounted via `RuntimeDirectory`, `StateDirectory`, `CacheDirectory`, and `BindReadOnlyPaths`.
-        # This is because TemporaryFileSystem creates a *new* *empty* filesystem for the process, so only bindmounts are visible.
+        WorkingDirectory = home;
         TemporaryFileSystem = "/:ro";
+        BindReadOnlyPaths = [
+          "/nix/store"
+          "-/etc/resolv.conf"
+          "-/etc/nsswitch.conf"
+          "-/etc/hosts"
+          "-/etc/localtime"
+        ] ++ (mapAttrsToList (k: v: "-${v.passwordFile}") cfg.accounts);
+        BindPaths = [ home ] ++ (mapAttrsToList (k: v: v.path) cfg.volumes);
+        # Would re-mount paths ignored by temporary root
+        #ProtectSystem = "strict";
+        ProtectHome = true;
         PrivateTmp = true;
         PrivateDevices = true;
         ProtectKernelTunables = true;
@@ -316,48 +269,15 @@ in {
         NoNewPrivileges = true;
         LockPersonality = true;
         RestrictRealtime = true;
-        MemoryDenyWriteExecute = true;
       };
     };
 
-    # ensure volumes exist:
-    systemd.tmpfiles.settings."copyparty" = (
-      lib.attrsets.mapAttrs' (
-        name: value:
-          lib.attrsets.nameValuePair (value.path) {
-            d = {
-              #: in front of things means it wont change it if the directory already exists.
-              group = ":${cfg.group}";
-              user = ":${cfg.user}";
-              mode = ":755";
-            };
-          }
-      )
-      cfg.volumes
-    );
-
-    users.groups.copyparty = lib.mkIf (cfg.user == "copyparty" && cfg.group == "copyparty") {};
-    users.users.copyparty = lib.mkIf (cfg.user == "copyparty" && cfg.group == "copyparty") {
+    users.groups.copyparty = { };
+    users.users.copyparty = {
       description = "Service user for copyparty";
       group = "copyparty";
-      home = externalStateDir;
+      home = home;
       isSystemUser = true;
     };
-    environment.systemPackages = lib.mkIf cfg.mkHashWrapper [
-      (pkgs.writeShellScriptBin
-      "copyparty-hash"
-      ''
-        set -a  # automatically export variables
-        # set same environment variables as the systemd service
-        ${lib.pipe config.systemd.services.copyparty.environment [
-          (lib.filterAttrs (n: v: v != null && n != "PATH"))
-          (lib.mapAttrs (_: v: "${v}"))
-          (lib.toShellVars)
-        ]}
-        PATH=${config.systemd.services.copyparty.environment.PATH}:$PATH
-
-        exec ${command} --ah-cli
-      '')
-    ];
-  });
+  };
 }

contrib/package/arch/PKGBUILD

@@ -1,8 +1,8 @@
 # Maintainer: icxes <dev.null@need.moe>
 pkgname=copyparty
-pkgver="1.17.0"
+pkgver="1.9.28"
 pkgrel=1
-pkgdesc="File server with accelerated resumable uploads, dedup, WebDAV, FTP, TFTP, zeroconf, media indexer, thumbnails++"
+pkgdesc="File server with accelerated resumable uploads, dedup, WebDAV, FTP, zeroconf, media indexer, thumbnails++"
 arch=("any")
 url="https://github.com/9001/${pkgname}"
 license=('MIT')
@@ -16,13 +16,12 @@ optdepends=("ffmpeg: thumbnails for videos, images (slower) and audio, music tag
             "libkeyfinder-git: detection of musical keys" 
             "qm-vamp-plugins: BPM detection" 
             "python-pyopenssl: ftps functionality" 
-            "python-pyzmq: send zeromq messages from event-hooks" 
-            "python-argon2-cffi: hashed passwords in config" 
+            "python-argon2_cffi: hashed passwords in config" 
             "python-impacket-git: smb support (bad idea)"
 )
 source=("https://github.com/9001/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
 backup=("etc/${pkgname}.d/init" )
-sha256sums=("d8a49b3398f4cdb0754dd8b9e3ab32544e44e2fee94c88903f65ffc003b6eeec")
+sha256sums=("0134f2298b8793f3a8a0a9ba6e7e5a5bf3dc12da5501b100c2f17d061f167fb9")
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"

contrib/package/nix/copyparty/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, makeWrapper, fetchurl, utillinux, python, jinja2, impacket, pyftpdlib, pyopenssl, argon2-cffi, pillow, pyvips, pyzmq, ffmpeg, mutagen,
+{ lib, stdenv, makeWrapper, fetchurl, utillinux, python, jinja2, impacket, pyftpdlib, pyopenssl, argon2-cffi, pillow, pyvips, ffmpeg, mutagen,
 
 # use argon2id-hashed passwords in config files (sha2 is always available)
 withHashedPasswords ? true,
@@ -21,9 +21,6 @@ withMediaProcessing ? true,
 # if MediaProcessing is not enabled, you probably want this instead (less accurate, but much safer and faster)
 withBasicAudioMetadata ? false,
 
-# send ZeroMQ messages from event-hooks
-withZeroMQ ? true,
-
 # enable FTPS support in the FTP server
 withFTPS ? false,
 
@@ -46,7 +43,6 @@ let
     ++ lib.optional withMediaProcessing ffmpeg
     ++ lib.optional withBasicAudioMetadata mutagen
     ++ lib.optional withHashedPasswords argon2-cffi
-    ++ lib.optional withZeroMQ pyzmq
     );
 in stdenv.mkDerivation {
   pname = "copyparty";
@@ -64,5 +60,4 @@ in stdenv.mkDerivation {
       --set PATH '${lib.makeBinPath ([ utillinux ] ++ lib.optional withMediaProcessing ffmpeg)}:$PATH' \
       --add-flags "$out/share/copyparty-sfx.py"
   '';
-  meta.mainProgram = "copyparty";
 }

contrib/package/nix/copyparty/pin.json

@@ -1,5 +1,5 @@
 {
-    "url": "https://github.com/9001/copyparty/releases/download/v1.17.0/copyparty-sfx.py",
-    "version": "1.17.0",
-    "hash": "sha256-iRqaXQvwX4DceOhZmI6g9KXeR+rFAWnNHK/GTHkoQ7Q="
+    "url": "https://github.com/9001/copyparty/releases/download/v1.9.28/copyparty-sfx.py",
+    "version": "1.9.28",
+    "hash": "sha256-3pHlJYmEu0C/aHPN8JL9fb6tEHYpB3/gON7SJko3tUY="
 }

contrib/plugins/README.md

@@ -15,19 +15,11 @@ save one of these as `.epilogue.html` inside a folder to customize it:
 point `--js-browser` to one of these by URL:
 
 * [`minimal-up2k.js`](minimal-up2k.js) is similar to the above `minimal-up2k.html` except it applies globally to all write-only folders
-* [`quickmove.js`](quickmove.js) adds a hotkey to move selected files into a subfolder
 * [`up2k-hooks.js`](up2k-hooks.js) lets you specify a ruleset for files to skip uploading
   * [`up2k-hook-ytid.js`](up2k-hook-ytid.js) is a more specific example checking youtube-IDs against some API
 
 
 
-## example any-js
-point `--js-browser` and/or `--js-other` to one of these by URL:
-
-* [`banner.js`](banner.js) shows a very enterprise [legal-banner](https://github.com/user-attachments/assets/8ae8e087-b209-449c-b08d-74e040f0284b)
-
-
-
 ## example browser-css
 point `--css-browser` to one of these by URL:
 

contrib/plugins/banner.js

@@ -1,93 +0,0 @@
-(function() {
-
-// usage: copy this to '.banner.js' in your webroot,
-// and run copyparty with the following arguments:
-// --js-browser /.banner.js  --js-other /.banner.js
-
-
-
-// had to pick the most chuuni one as the default
-var bannertext = '' +
-'<h3>You are accessing a U.S. Government (USG) Information System (IS) that is provided for USG-authorized use only.</h3>' +
-'<p>By using this IS (which includes any device attached to this IS), you consent to the following conditions:</p>' +
-'<ul>' +
-'<li>The USG routinely intercepts and monitors communications on this IS for purposes including, but not limited to, penetration testing, COMSEC monitoring, network operations and defense, personnel misconduct (PM), law enforcement (LE), and counterintelligence (CI) investigations.</li>' +
-'<li>At any time, the USG may inspect and seize data stored on this IS.</li>' +
-'<li>Communications using, or data stored on, this IS are not private, are subject to routine monitoring, interception, and search, and may be disclosed or used for any USG-authorized purpose.</li>' +
-'<li>This IS includes security measures (e.g., authentication and access controls) to protect USG interests -- not for your personal benefit or privacy.</li>' +
-'<li>Notwithstanding the above, using this IS does not constitute consent to PM, LE or CI investigative searching or monitoring of the content of privileged communications, or work product, related to personal representation or services by attorneys, psychotherapists, or clergy, and their assistants. Such communications and work product are private and confidential. See User Agreement for details.</li>' +
-'</ul>';
-
-
-
-// fancy div to insert into pages
-function bannerdiv(border) {
-    var ret = mknod('div', null, bannertext);
-    if (border)
-        ret.setAttribute("style", "border:1em solid var(--fg); border-width:.3em 0; margin:3em 0");
-    return ret;
-}
-
-
-
-// keep all of these false and then selectively enable them in the if-blocks below
-var show_msgbox = false,
-    login_top = false,
-    top = false,
-    bottom = false,
-    top_bordered = false,
-    bottom_bordered = false;
-
-if (QS("h1#cc") && QS("a#k")) {
-    // this is the controlpanel
-    // (you probably want to keep just one of these enabled)
-    show_msgbox = true;
-    login_top = true;
-    bottom = true;
-}
-else if (ebi("swin") && ebi("smac")) {
-    // this is the connect-page, same deal here
-    show_msgbox = true;
-    top_bordered = true;
-    bottom_bordered = true;
-}
-else if (ebi("op_cfg") || ebi("div#mw") ) {
-    // we're running in the main filebrowser (op_cfg) or markdown-viewer/editor (div#mw),
-    // fragile pages which break if you do something too fancy
-    show_msgbox = true;
-}
-
-
-
-// shows a fullscreen messagebox; works on all pages
-if (show_msgbox) {
-    var now = Math.floor(Date.now() / 1000),
-        last_shown = sread("bannerts") || 0;
-
-    // 60 * 60 * 17 = 17 hour cooldown
-    if (now - last_shown > 60 * 60 * 17) {
-        swrite("bannerts", now);
-        modal.confirm(bannertext, null, function () {
-            location = 'https://this-page-intentionally-left-blank.org/';
-        });
-    }
-}
-
-// show a message on the page footer; only works on the connect-page
-if (top || top_bordered) {
-    var dst = ebi('wrap');
-    dst.insertBefore(bannerdiv(top_bordered), dst.firstChild);
-}
-
-// show a message on the page footer; only works on the controlpanel and connect-page
-if (bottom || bottom_bordered) {
-    ebi('wrap').appendChild(bannerdiv(bottom_bordered));
-}
-
-// show a message on the top of the page; only works on the controlpanel
-if (login_top) {
-    var dst = QS('h1');
-    dst.parentNode.insertBefore(bannerdiv(false), dst);
-}
-
-})();

contrib/plugins/graft-thumbs.js

@@ -1,117 +0,0 @@
-// USAGE:
-//   place this file somewhere in the webroot and then
-//   python3 -m copyparty --js-browser /.res/graft-thumbs.js
-//
-// DESCRIPTION:
-//   this is a gridview plugin which, for each file in a folder,
-//   looks for another file with the same filename (but with a
-//   different file extension)
-//
-//   if one of those files is an image and the other is not,
-//   then this plugin assumes the image is a "sidecar thumbnail"
-//   for the other file, and it will graft the image thumbnail
-//   onto the non-image file (for example an mp3)
-//
-//   optional feature 1, default-enabled:
-//   the image-file is then hidden from the directory listing
-//
-//   optional feature 2, default-enabled:
-//   when clicking the audio file, the image will also open
-
-
-(function() {
-
-	// `graft_thumbs` assumes the gridview has just been rendered;
-	// it looks for sidecars, and transplants those thumbnails onto
-	// the other file with the same basename (filename sans extension)
-
-	var graft_thumbs = function () {
-		if (!thegrid.en)
-			return;  // not in grid mode
-
-		var files = msel.getall(),
-			pairs = {};
-
-		console.log(files);
-
-		for (var a = 0; a < files.length; a++) {
-			var file = files[a],
-				is_pic = /\.(jpe?g|png|gif|webp)$/i.exec(file.vp),
-				is_audio = re_au_all.exec(file.vp),
-				basename = file.vp.replace(/\.[^\.]+$/, ""),
-				entry = pairs[basename];
-
-			if (!entry)
-				// first time seeing this basename; create a new entry in pairs
-				entry = pairs[basename] = {};
-
-			if (is_pic)
-				entry.thumb = file;
-			else if (is_audio)
-				entry.audio = file;
-		}
-
-		var basenames = Object.keys(pairs);
-		for (var a = 0; a < basenames.length; a++)
-			(function(a) {
-				var pair = pairs[basenames[a]];
-
-				if (!pair.thumb || !pair.audio)
-					return;  // not a matching pair of files
-
-				var img_thumb = QS('#ggrid a[ref="' + pair.thumb.id + '"] img[onload]'),
-					img_audio = QS('#ggrid a[ref="' + pair.audio.id + '"] img[onload]');
-
-				if (!img_thumb || !img_audio)
-					return;  // something's wrong... let's bail
-
-				// alright, graft the thumb...
-				img_audio.src = img_thumb.src;
-
-				// ...and hide the sidecar
-				img_thumb.closest('a').style.display = 'none';
-
-				// ...and add another onclick-handler to the audio,
-				// so it also opens the pic while playing the song
-				img_audio.addEventListener('click', function() {
-					img_thumb.click();
-					return false;  // let it bubble to the next listener
-				});
-
-			})(a);
-	};
-
-	// ...and then the trick! near the end of loadgrid,
-	// thegrid.bagit is called to initialize the baguettebox
-	// (image/video gallery); this is the perfect function to
-	// "hook" (hijack) so we can run our code :^)
-
-	// need to grab a backup of the original function first,
-	var orig_func = thegrid.bagit;
-
-	// and then replace it with our own:
-	thegrid.bagit = function (isrc) {
-
-		if (isrc !== '#ggrid')
-			// we only want to modify the grid, so
-			// let the original function handle this one
-			return orig_func(isrc);
-
-		graft_thumbs();
-
-		// when changing directories, the grid is
-		// rendered before msel returns the correct
-		// filenames, so schedule another run:
-		setTimeout(graft_thumbs, 1);
-
-		// and finally, call the original thegrid.bagit function
-		return orig_func(isrc);
-	};
-
-	if (ls0) {
-		// the server included an initial listing json (ls0),
-		// so the grid has already been rendered without our hook
-		graft_thumbs();
-	}
-
-})();

contrib/plugins/quickmove.js

@@ -1,140 +0,0 @@
-"use strict";
-
-
-// USAGE:
-//   place this file somewhere in the webroot, 
-//   for example in a folder named ".res" to hide it, and then
-//   python3 copyparty-sfx.py -v .::A --js-browser /.res/quickmove.js
-//
-// DESCRIPTION:
-//   the command above launches copyparty with one single volume;
-//   ".::A" = current folder as webroot, and everyone has Admin
-//
-//   the plugin adds hotkey "W" which moves all selected files
-//   into a subfolder named "foobar" inside the current folder
-
-
-(function() {
-
-    var action_to_perform = ask_for_confirmation_and_then_move;
-    // this decides what the new hotkey should do;
-    //  ask_for_confirmation_and_then_move  =  show a yes/no box,
-    //  move_selected_files  =  just move the files immediately
-
-    var move_destination = "foobar";
-    // this is the target folder to move files to;
-    // by default it is a subfolder of the current folder,
-    // but it can also be an absolute path like "/foo/bar"
-
-    // ===
-    // ===   END OF CONFIG
-    // ===
-
-    var main_hotkey_handler,  // copyparty's original hotkey handler
-        plugin_enabler,  // timer to engage this plugin when safe
-        files_to_move;  // list of files to move
-
-    function ask_for_confirmation_and_then_move() {
-        var num_files = msel.getsel().length,
-            msg = "move the selected " + num_files + " files?";
-
-        if (!num_files)
-            return toast.warn(2, 'no files were selected to be moved');
-
-        modal.confirm(msg, move_selected_files, null);
-    }
-
-    function move_selected_files() {
-        var selection = msel.getsel();
-
-        if (!selection.length)
-            return toast.warn(2, 'no files were selected to be moved');
-
-        if (thegrid.bbox) {
-            // close image/video viewer
-            thegrid.bbox = null;
-            baguetteBox.destroy();
-        }
-
-        files_to_move = [];
-        for (var a = 0; a < selection.length; a++)
-            files_to_move.push(selection[a].vp);
-
-        move_next_file();
-    }
-
-    function move_next_file() {
-        var num_files = files_to_move.length,
-            filepath = files_to_move.pop(),
-            filename = vsplit(filepath)[1];
-
-        toast.inf(10, "moving " + num_files + " files...\n\n" + filename);
-
-        var dst = move_destination;
-
-        if (!dst.endsWith('/'))
-            // must have a trailing slash, so add it
-            dst += '/';
-
-        if (!dst.startsWith('/'))
-            // destination is a relative path, so prefix current folder path
-            dst = get_evpath() + dst;
-
-        // and finally append the filename
-        dst += '/' + filename;
-
-        // prepare the move-request to be sent
-        var xhr = new XHR();
-        xhr.onload = xhr.onerror = function() {
-            if (this.status !== 201)
-                return toast.err(30, 'move failed: ' + esc(this.responseText));
-
-            if (files_to_move.length)
-                return move_next_file();  // still more files to go
-
-            toast.ok(1, 'move OK');
-            treectl.goto(); // reload the folder contents
-        };
-        xhr.open('POST', filepath + '?move=' + dst);
-        xhr.send();
-    }
-
-    function our_hotkey_handler(e) {
-        // bail if either ALT, CTRL, or SHIFT is pressed
-        if (e.altKey || e.shiftKey || e.isComposing || ctrl(e))
-            return main_hotkey_handler(e);  // let copyparty handle this keystroke
-
-        var key_name = (e.code || e.key) + '',
-    		ae = document.activeElement,
-		    aet = ae && ae != document.body ? ae.nodeName.toLowerCase() : '';
-
-        // check the current aet (active element type),
-        // only continue if one of the following currently has input focus:
-        //   nothing | link | button | table-row | table-cell | div | text
-        if (aet && !/^(a|button|tr|td|div|pre)$/.test(aet))
-            return main_hotkey_handler(e);  // let copyparty handle this keystroke
-
-        if (key_name == 'KeyW') {
-            // okay, this one's for us... do the thing
-            action_to_perform();
-            return ev(e);
-        }
-
-        return main_hotkey_handler(e);  // let copyparty handle this keystroke
-    }
-
-    function enable_plugin() {
-        if (!window.hotkeys_attached)
-            return console.log('quickmove is waiting for the page to finish loading');
-
-        clearInterval(plugin_enabler);
-        main_hotkey_handler = document.onkeydown;
-        document.onkeydown = our_hotkey_handler;
-        console.log('quickmove is now enabled');
-    }
-
-    // copyparty doesn't enable its hotkeys until the page
-    // has finished loading, so we'll wait for that too
-    plugin_enabler = setInterval(enable_plugin, 100);
-
-})();

contrib/send-to-cpp.contextlet.json

@@ -1,11 +0,0 @@
-{
-    "code": "// https://addons.mozilla.org/en-US/firefox/addon/contextlets/\n// https://github.com/davidmhammond/contextlets\n\nvar url = 'http://partybox.local:3923/';\nvar pw = 'wark';\n\nvar xhr = new XMLHttpRequest();\nxhr.msg = this.info.linkUrl || this.info.srcUrl;\nxhr.open('POST', url, true);\nxhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');\nxhr.setRequestHeader('PW', pw);\nxhr.send('msg=' + xhr.msg);\n",
-    "contexts": [
-        "link"
-    ],
-    "icons": null,
-    "patterns": "",
-    "scope": "background",
-    "title": "send to cpp",
-    "type": "normal"
-}

contrib/sharex-html.sxcu

@@ -0,0 +1,19 @@
+{
+  "Version": "13.5.0",
+  "Name": "copyparty-html",
+  "DestinationType": "ImageUploader",
+  "RequestMethod": "POST",
+  "RequestURL": "http://127.0.0.1:3923/sharex",
+  "Parameters": {
+    "pw": "wark"
+  },
+  "Body": "MultipartFormData",
+  "Arguments": {
+    "act": "bput"
+  },
+  "FileFormName": "f",
+  "RegexList": [
+    "bytes // <a href=\"/([^\"]+)\""
+  ],
+  "URL": "http://127.0.0.1:3923/$regex:1|1$"
+}

contrib/sharex.sxcu

@@ -1,19 +1,17 @@
 {
-  "Version": "15.0.0",
+  "Version": "13.5.0",
   "Name": "copyparty",
   "DestinationType": "ImageUploader",
   "RequestMethod": "POST",
   "RequestURL": "http://127.0.0.1:3923/sharex",
   "Parameters": {
+    "pw": "wark",
     "j": null
   },
-  "Headers": {
-    "pw": "PUT_YOUR_PASSWORD_HERE_MY_DUDE"
-  },
   "Body": "MultipartFormData",
   "Arguments": {
     "act": "bput"
   },
   "FileFormName": "f",
-  "URL": "{json:files[0].url}"
+  "URL": "$json:files[0].url$"
 }

contrib/sharex12.sxcu

@@ -1,13 +0,0 @@
-{
-  "Name": "copyparty",
-  "DestinationType": "ImageUploader, TextUploader, FileUploader",
-  "RequestURL": "http://127.0.0.1:3923/sharex",
-  "FileFormName": "f",
-  "Arguments": {
-    "act": "bput"
-  },
-  "Headers": {
-    "accept": "url",
-    "pw": "PUT_YOUR_PASSWORD_HERE_MY_DUDE"
-  }
-}

contrib/systemd/copyparty.service

@@ -4,7 +4,7 @@
 #
 # installation:
 #   wget https://github.com/9001/copyparty/releases/latest/download/copyparty-sfx.py -O /usr/local/bin/copyparty-sfx.py
-#   useradd -r -s /sbin/nologin -m -d /var/lib/copyparty copyparty
+#   useradd -r -s /sbin/nologin -d /var/lib/copyparty copyparty
 #   firewall-cmd --permanent --add-port=3923/tcp  # --zone=libvirt
 #   firewall-cmd --reload
 #   cp -pv copyparty.service /etc/systemd/system/
@@ -12,18 +12,11 @@
 #   restorecon -vr /etc/systemd/system/copyparty.service  # on fedora/rhel
 #   systemctl daemon-reload && systemctl enable --now copyparty
 #
-# every time you edit this file, you must "systemctl daemon-reload"
-# for the changes to take effect and then "systemctl restart copyparty"
-#
 # if it fails to start, first check this: systemctl status copyparty
 # then try starting it while viewing logs:
 #   journalctl -fan 100
 #   tail -Fn 100 /var/log/copyparty/$(date +%Y-%m%d.log)
 #
-# if you run into any issues, for example thumbnails not working,
-# try removing the "some quick hardening" section and then please
-# let me know if that actually helped so we can look into it
-#
 # you may want to:
 #  - change "User=copyparty" and "/var/lib/copyparty/" to another user
 #  - edit /etc/copyparty.conf to configure copyparty

contrib/themes/bsod.css

@@ -1,116 +0,0 @@
-/* copy bsod.* into a folder named ".themes" in your webroot and then
-     --themes=10 --theme=9 --css-browser=/.themes/bsod.css
-*/
-
-html.ey {
-    --w2: #3d7bbc;
-    --w3: #5fcbec;
-
-    --fg: #fff;
-    --fg-max: #fff;
-    --fg-weak: var(--w3);
-
-    --bg: #2067b2;
-    --bg-d3: var(--bg);
-    --bg-d2: var(--w2);
-    --bg-d1: var(--fg-weak);
-    --bg-u2: var(--bg);
-    --bg-u3: var(--bg);
-    --bg-u5: var(--w2);
-
-    --tab-alt: var(--fg-weak);
-	--row-alt: var(--w2);
-
-    --scroll: var(--w3);
-
-    --a: #fff;
-    --a-b: #fff;
-    --a-hil: #fff;
-    --a-h-bg: var(--fg-weak);
-    --a-dark: var(--a);
-    --a-gray: var(--fg-weak);
-
-	--btn-fg: var(--a);
-	--btn-bg: var(--w2);
-    --btn-h-fg: var(--w2);
-	--btn-1-fg: var(--bg);
-	--btn-1-bg: var(--a);
-    --txt-sh: a;
-    --txt-bg: var(--w2);
-
-	--u2-b1-bg: var(--w2);
-	--u2-b2-bg: var(--w2);
-    --u2-txt-bg: var(--w2);
-	--u2-tab-bg: a;
-	--u2-tab-1-bg: var(--w2);
-
-    --sort-1: var(--a);
-    --sort-1: var(--fg-weak);
-
-    --tree-bg: var(--bg);
-
-	--g-b1: a;
-	--g-b2: a;
-    --g-f-bg: var(--w2);
-
-    --f-sh1: 0.1;
-    --f-sh2: 0.02;
-    --f-sh3: 0.1;
-    --f-h-b1: a;
-
-    --srv-1: var(--a);
-    --srv-3: var(--a);
-
-    --mp-sh: a;
-}
-
-html.ey {
-    background: url('bsod.png') top 5em right 4.5em no-repeat fixed var(--bg);
-}
-html.ey body#b {
-    background: var(--bg);  /*sandbox*/
-}
-html.ey #ops {
-    margin: 1.7em 1.5em 0 1.5em;
-	border-radius: .3em;
-	border-width: 1px 0;
-}
-html.ey #ops a {
-    text-shadow: 1px 1px 0 rgba(0,0,0,0.5);
-}
-html.ey .opbox {
-	margin: 1.5em 0 0 0;
-}
-html.ey #tree {
-    box-shadow: none;
-}
-html.ey #tt {
-    border-color: var(--w2);
-    background: var(--w2);
-}
-html.ey .mdo a {
-    background: none;
-    text-decoration: underline;
-}
-html.ey .mdo pre,
-html.ey .mdo code {
-    color: #fff;
-    background: var(--w2);
-    border: none;
-}
-html.ey .mdo h1,
-html.ey .mdo h2 {
-    background: none;
-    border-color: var(--w2);
-}
-html.ey .mdo ul ul,
-html.ey .mdo ul ol,
-html.ey .mdo ol ul,
-html.ey .mdo ol ol {
-	border-color: var(--w2);
-}
-html.ey .mdo p>em,
-html.ey .mdo li>em,
-html.ey .mdo td>em {
-	color: #fd0;
-}

contrib/traefik/copyparty.yaml

@@ -1,25 +0,0 @@
-# ./traefik --configFile=copyparty.yaml
-
-entryPoints:
-  web:
-    address: :8080
-    transport:
-      # don't disconnect during big uploads
-      respondingTimeouts:
-        readTimeout: "0s"
-log:
-  level: DEBUG
-providers:
-  file:
-    # WARNING: must be same filename as current file
-    filename: "copyparty.yaml"
-http:
-  services:
-    service-cpp:
-      loadBalancer:
-        servers:
-          - url: "http://127.0.0.1:3923/"
-  routers:
-    my-router:
-      rule: "PathPrefix(`/`)"
-      service: service-cpp

contrib/zfs-tune.py

@@ -1,107 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sqlite3
-import sys
-import traceback
-
-
-"""
-when the up2k-database is stored on a zfs volume, this may give
-slightly higher performance (actual gains not measured yet)
-
-NOTE: must be applied in combination with the related advice in the openzfs documentation;
-https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Workload%20Tuning.html#database-workloads
-and see specifically the SQLite subsection
-
-it is assumed that all databases are stored in a single location,
-for example with `--hist /var/store/hists`
-
-three alternatives for running this script:
-
-1. copy it into /var/store/hists and run "python3 zfs-tune.py s"
-    (s = modify all databases below folder containing script)
-
-2. cd into /var/store/hists and run "python3 ~/zfs-tune.py w"
-    (w = modify all databases below current working directory)
-
-3. python3 ~/zfs-tune.py /var/store/hists
-
-if you use docker, run copyparty with `--hist /cfg/hists`, copy this script into /cfg, and run this:
-podman run --rm -it --entrypoint /usr/bin/python3 ghcr.io/9001/copyparty-ac /cfg/zfs-tune.py s
-
-"""
-
-
-PAGESIZE = 65536
-
-
-# borrowed from copyparty; short efficient stacktrace for errors
-def min_ex(max_lines: int = 8, reverse: bool = False) -> str:
-    et, ev, tb = sys.exc_info()
-    stb = traceback.extract_tb(tb) if tb else traceback.extract_stack()[:-1]
-    fmt = "%s:%d <%s>: %s"
-    ex = [fmt % (fp.split(os.sep)[-1], ln, fun, txt) for fp, ln, fun, txt in stb]
-    if et or ev or tb:
-        ex.append("[%s] %s" % (et.__name__ if et else "(anonymous)", ev))
-    return "\n".join(ex[-max_lines:][:: -1 if reverse else 1])
-
-
-def set_pagesize(db_path):
-    try:
-        # check current page_size
-        with sqlite3.connect(db_path) as db:
-            v = db.execute("pragma page_size").fetchone()[0]
-            if v == PAGESIZE:
-                print(" `-- OK")
-                return
-
-        # https://www.sqlite.org/pragma.html#pragma_page_size
-        #  `- disable wal; set pagesize; vacuum
-        #      (copyparty will reenable wal if necessary)
-
-        with sqlite3.connect(db_path) as db:
-            db.execute("pragma journal_mode=delete")
-            db.commit()
-
-        with sqlite3.connect(db_path) as db:
-            db.execute(f"pragma page_size = {PAGESIZE}")
-            db.execute("vacuum")
-
-        print(" `-- new pagesize OK")
-
-    except Exception:
-        err = min_ex().replace("\n", "\n -- ")
-        print(f"FAILED: {db_path}\n -- {err}")
-
-
-def main():
-    top = os.path.dirname(os.path.abspath(__file__))
-    cwd = os.path.abspath(os.getcwd())
-    try:
-        x = sys.argv[1]
-    except:
-        print(f"""
-this script takes one mandatory argument:
-specify 's' to start recursing from folder containing this script file ({top})
-specify 'w' to start recursing from the current working directory ({cwd})
-specify a path to start recursing from there
-""")
-        sys.exit(1)
-
-    if x.lower() == "w":
-        top = cwd
-    elif x.lower() != "s":
-        top = x
-
-    for dirpath, dirs, files in os.walk(top):
-        for fname in files:
-            if not fname.endswith(".db"):
-                continue
-            db_path = os.path.join(dirpath, fname)
-            print(db_path)
-            set_pagesize(db_path)
-
-
-if __name__ == "__main__":
-    main()

copyparty/__init__.py

@@ -16,10 +16,9 @@ except:
     TYPE_CHECKING = False
 
 if True:
-    from typing import Any, Callable, Optional
+    from typing import Any, Callable
 
 PY2 = sys.version_info < (3,)
-PY36 = sys.version_info > (3, 6)
 if not PY2:
     unicode: Callable[[Any], str] = str
 else:
@@ -51,70 +50,13 @@ try:
 except:
     CORES = (os.cpu_count() if hasattr(os, "cpu_count") else 0) or 2
 
-# all embedded resources to be retrievable over http
-zs = """
-web/a/partyfuse.py
-web/a/u2c.py
-web/a/webdav-cfg.bat
-web/baguettebox.js
-web/browser.css
-web/browser.html
-web/browser.js
-web/browser2.html
-web/cf.html
-web/copyparty.gif
-web/dd/2.png
-web/dd/3.png
-web/dd/4.png
-web/dd/5.png
-web/deps/busy.mp3
-web/deps/easymde.css
-web/deps/easymde.js
-web/deps/marked.js
-web/deps/fuse.py
-web/deps/mini-fa.css
-web/deps/mini-fa.woff
-web/deps/prism.css
-web/deps/prism.js
-web/deps/prismd.css
-web/deps/scp.woff2
-web/deps/sha512.ac.js
-web/deps/sha512.hw.js
-web/iiam.gif
-web/md.css
-web/md.html
-web/md.js
-web/md2.css
-web/md2.js
-web/mde.css
-web/mde.html
-web/mde.js
-web/msg.css
-web/msg.html
-web/rups.css
-web/rups.html
-web/rups.js
-web/shares.css
-web/shares.html
-web/shares.js
-web/splash.css
-web/splash.html
-web/splash.js
-web/svcs.html
-web/svcs.js
-web/ui.css
-web/up2k.js
-web/util.js
-web/w.hash.js
-"""
-RES = set(zs.strip().split("\n"))
-
 
 class EnvParams(object):
     def __init__(self) -> None:
         self.t0 = time.time()
         self.mod = ""
         self.cfg = ""
+        self.ox = getattr(sys, "oxidized", None)
 
 
 E = EnvParams()

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (1, 17, 1)
-CODENAME = "mixtape.m3u"
-BUILD_DT = (2025, 5, 18)
+VERSION = (1, 9, 28)
+CODENAME = "prometheable"
+BUILD_DT = (2023, 12, 31)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/broker_mp.py

@@ -9,14 +9,14 @@ import queue
 
 from .__init__ import CORES, TYPE_CHECKING
 from .broker_mpw import MpWorker
-from .broker_util import ExceptionalQueue, NotExQueue, try_exec
+from .broker_util import ExceptionalQueue, try_exec
 from .util import Daemon, mp
 
 if TYPE_CHECKING:
     from .svchub import SvcHub
 
 if True:  # pylint: disable=using-constant-test
-    from typing import Any, Union
+    from typing import Any
 
 
 class MProcess(mp.Process):
@@ -43,9 +43,6 @@ class BrokerMp(object):
         self.procs = []
         self.mutex = threading.Lock()
 
-        self.retpend: dict[int, Any] = {}
-        self.retpend_mutex = threading.Lock()
-
         self.num_workers = self.args.j or CORES
         self.log("broker", "booting {} subprocesses".format(self.num_workers))
         for n in range(1, self.num_workers + 1):
@@ -57,13 +54,14 @@ class BrokerMp(object):
             self.procs.append(proc)
             proc.start()
 
-        Daemon(self.periodic, "mp-periodic")
-
     def shutdown(self) -> None:
         self.log("broker", "shutting down")
         for n, proc in enumerate(self.procs):
-            name = "mp-shut-%d-%d" % (n, len(self.procs))
-            Daemon(proc.q_pend.put, name, ((0, "shutdown", []),))
+            thr = threading.Thread(
+                target=proc.q_pend.put((0, "shutdown", [])),
+                name="mp-shutdown-{}-{}".format(n, len(self.procs)),
+            )
+            thr.start()
 
         with self.mutex:
             procs = self.procs
@@ -81,10 +79,6 @@ class BrokerMp(object):
         for _, proc in enumerate(self.procs):
             proc.q_pend.put((0, "reload", []))
 
-    def reload_sessions(self) -> None:
-        for _, proc in enumerate(self.procs):
-            proc.q_pend.put((0, "reload_sessions", []))
-
     def collector(self, proc: MProcess) -> None:
         """receive message from hub in other process"""
         while True:
@@ -95,10 +89,8 @@ class BrokerMp(object):
                 self.log(*args)
 
             elif dest == "retq":
-                with self.retpend_mutex:
-                    retq = self.retpend.pop(retq_id)
-
-                retq.put(args[0])
+                # response from previous ipc call
+                raise Exception("invalid broker_mp usage")
 
             else:
                 # new ipc invoking managed service in hub
@@ -115,7 +107,8 @@ class BrokerMp(object):
                 if retq_id:
                     proc.q_pend.put((retq_id, "retq", rv))
 
-    def ask(self, dest: str, *args: Any) -> Union[ExceptionalQueue, NotExQueue]:
+    def ask(self, dest: str, *args: Any) -> ExceptionalQueue:
+
         # new non-ipc invoking managed service in hub
         obj = self.hub
         for node in dest.split("."):
@@ -127,30 +120,17 @@ class BrokerMp(object):
         retq.put(rv)
         return retq
 
-    def wask(self, dest: str, *args: Any) -> list[Union[ExceptionalQueue, NotExQueue]]:
-        # call from hub to workers
-        ret = []
-        for p in self.procs:
-            retq = ExceptionalQueue(1)
-            retq_id = id(retq)
-            with self.retpend_mutex:
-                self.retpend[retq_id] = retq
-
-            p.q_pend.put((retq_id, dest, list(args)))
-            ret.append(retq)
-        return ret
-
     def say(self, dest: str, *args: Any) -> None:
         """
         send message to non-hub component in other process,
         returns a Queue object which eventually contains the response if want_retval
         (not-impl here since nothing uses it yet)
         """
-        if dest == "httpsrv.listen":
+        if dest == "listen":
             for p in self.procs:
                 p.q_pend.put((0, dest, [args[0], len(self.procs)]))
 
-        elif dest == "httpsrv.set_netdevs":
+        elif dest == "set_netdevs":
             for p in self.procs:
                 p.q_pend.put((0, dest, list(args)))
 
@@ -159,19 +139,3 @@ class BrokerMp(object):
 
         else:
             raise Exception("what is " + str(dest))
-
-    def periodic(self) -> None:
-        while True:
-            time.sleep(1)
-
-            tdli = {}
-            tdls = {}
-            qs = self.wask("httpsrv.read_dls")
-            for q in qs:
-                qr = q.get()
-                dli, dls = qr
-                tdli.update(dli)
-                tdls.update(dls)
-            tdl = (tdli, tdls)
-            for p in self.procs:
-                p.q_pend.put((0, "httpsrv.write_dls", tdl))

copyparty/broker_mpw.py

@@ -11,7 +11,7 @@ import queue
 
 from .__init__ import ANYWIN
 from .authsrv import AuthSrv
-from .broker_util import BrokerCli, ExceptionalQueue, NotExQueue
+from .broker_util import BrokerCli, ExceptionalQueue
 from .httpsrv import HttpSrv
 from .util import FAKE_MP, Daemon, HMaccas
 
@@ -82,40 +82,35 @@ class MpWorker(BrokerCli):
         while True:
             retq_id, dest, args = self.q_pend.get()
 
-            if dest == "retq":
-                # response from previous ipc call
-                with self.retpend_mutex:
-                    retq = self.retpend.pop(retq_id)
-
-                retq.put(args)
-                continue
-
+            # self.logw("work: [{}]".format(d[0]))
             if dest == "shutdown":
                 self.httpsrv.shutdown()
                 self.logw("ok bye")
                 sys.exit(0)
                 return
 
-            if dest == "reload":
+            elif dest == "reload":
                 self.logw("mpw.asrv reloading")
                 self.asrv.reload()
                 self.logw("mpw.asrv reloaded")
-                continue
 
-            if dest == "reload_sessions":
-                with self.asrv.mutex:
-                    self.asrv.load_sessions()
-                continue
+            elif dest == "listen":
+                self.httpsrv.listen(args[0], args[1])
 
-            obj = self
-            for node in dest.split("."):
-                obj = getattr(obj, node)
+            elif dest == "set_netdevs":
+                self.httpsrv.set_netdevs(args[0])
 
-            rv = obj(*args)  # type: ignore
-            if retq_id:
-                self.say("retq", rv, retq_id=retq_id)
+            elif dest == "retq":
+                # response from previous ipc call
+                with self.retpend_mutex:
+                    retq = self.retpend.pop(retq_id)
 
-    def ask(self, dest: str, *args: Any) -> Union[ExceptionalQueue, NotExQueue]:
+                retq.put(args)
+
+            else:
+                raise Exception("what is " + str(dest))
+
+    def ask(self, dest: str, *args: Any) -> ExceptionalQueue:
         retq = ExceptionalQueue(1)
         retq_id = id(retq)
         with self.retpend_mutex:
@@ -124,5 +119,5 @@ class MpWorker(BrokerCli):
         self.q_yield.put((retq_id, dest, list(args)))
         return retq
 
-    def say(self, dest: str, *args: Any, retq_id=0) -> None:
-        self.q_yield.put((retq_id, dest, list(args)))
+    def say(self, dest: str, *args: Any) -> None:
+        self.q_yield.put((0, dest, list(args)))

copyparty/broker_thr.py

@@ -5,7 +5,7 @@ import os
 import threading
 
 from .__init__ import TYPE_CHECKING
-from .broker_util import BrokerCli, ExceptionalQueue, NotExQueue
+from .broker_util import BrokerCli, ExceptionalQueue, try_exec
 from .httpsrv import HttpSrv
 from .util import HMaccas
 
@@ -13,7 +13,7 @@ if TYPE_CHECKING:
     from .svchub import SvcHub
 
 if True:  # pylint: disable=using-constant-test
-    from typing import Any, Union
+    from typing import Any
 
 
 class BrokerThr(BrokerCli):
@@ -34,7 +34,6 @@ class BrokerThr(BrokerCli):
         self.iphash = HMaccas(os.path.join(self.args.E.cfg, "iphash"), 8)
         self.httpsrv = HttpSrv(self, None)
         self.reload = self.noop
-        self.reload_sessions = self.noop
 
     def shutdown(self) -> None:
         # self.log("broker", "shutting down")
@@ -43,21 +42,26 @@ class BrokerThr(BrokerCli):
     def noop(self) -> None:
         pass
 
-    def ask(self, dest: str, *args: Any) -> Union[ExceptionalQueue, NotExQueue]:
+    def ask(self, dest: str, *args: Any) -> ExceptionalQueue:
 
         # new ipc invoking managed service in hub
         obj = self.hub
         for node in dest.split("."):
             obj = getattr(obj, node)
 
-        return NotExQueue(obj(*args))  # type: ignore
+        rv = try_exec(True, obj, *args)
+
+        # pretend we're broker_mp
+        retq = ExceptionalQueue(1)
+        retq.put(rv)
+        return retq
 
     def say(self, dest: str, *args: Any) -> None:
-        if dest == "httpsrv.listen":
+        if dest == "listen":
             self.httpsrv.listen(args[0], 1)
             return
 
-        if dest == "httpsrv.set_netdevs":
+        if dest == "set_netdevs":
             self.httpsrv.set_netdevs(args[0])
             return
 
@@ -66,4 +70,4 @@ class BrokerThr(BrokerCli):
         for node in dest.split("."):
             obj = getattr(obj, node)
 
-        obj(*args)  # type: ignore
+        try_exec(False, obj, *args)

copyparty/broker_util.py

@@ -28,23 +28,11 @@ class ExceptionalQueue(Queue, object):
                 if rv[1] == "pebkac":
                     raise Pebkac(*rv[2:])
                 else:
-                    raise rv[2]
+                    raise Exception(rv[2])
 
         return rv
 
 
-class NotExQueue(object):
-    """
-    BrokerThr uses this instead of ExceptionalQueue; 7x faster
-    """
-
-    def __init__(self, rv: Any) -> None:
-        self.rv = rv
-
-    def get(self) -> Any:
-        return self.rv
-
-
 class BrokerCli(object):
     """
     helps mypy understand httpsrv.broker but still fails a few levels deeper,
@@ -60,7 +48,7 @@ class BrokerCli(object):
     def __init__(self) -> None:
         pass
 
-    def ask(self, dest: str, *args: Any) -> Union[ExceptionalQueue, NotExQueue]:
+    def ask(self, dest: str, *args: Any) -> ExceptionalQueue:
         return ExceptionalQueue(1)
 
     def say(self, dest: str, *args: Any) -> None:
@@ -77,8 +65,8 @@ def try_exec(want_retval: Union[bool, int], func: Any, *args: list[Any]) -> Any:
 
         return ["exception", "pebkac", ex.code, str(ex)]
 
-    except Exception as ex:
+    except:
         if not want_retval:
             raise
 
-        return ["exception", "stack", ex]
+        return ["exception", "stack", traceback.format_exc()]

copyparty/cert.py

@@ -1,22 +1,17 @@
 import calendar
 import errno
+import filecmp
 import json
 import os
+import shutil
 import time
 
-from .__init__ import ANYWIN
-from .util import Netdev, atomic_move, load_resource, runcmd, wunlink
+from .util import Netdev, runcmd
 
-HAVE_CFSSL = not os.environ.get("PRTY_NO_CFSSL")
+HAVE_CFSSL = True
 
 if True:  # pylint: disable=using-constant-test
-    from .util import NamedLogger, RootLogger
-
-
-if ANYWIN:
-    VF = {"mv_re_t": 5, "rm_re_t": 5, "mv_re_r": 0.1, "rm_re_r": 0.1}
-else:
-    VF = {"mv_re_t": 0, "rm_re_t": 0}
+    from .util import RootLogger
 
 
 def ensure_cert(log: "RootLogger", args) -> None:
@@ -27,15 +22,13 @@ def ensure_cert(log: "RootLogger", args) -> None:
 
     i feel awful about this and so should they
     """
-    with load_resource(args.E, "res/insecure.pem") as f:
-        cert_insec = f.read()
+    cert_insec = os.path.join(args.E.mod, "res/insecure.pem")
     cert_appdata = os.path.join(args.E.cfg, "cert.pem")
     if not os.path.isfile(args.cert):
         if cert_appdata != args.cert:
             raise Exception("certificate file does not exist: " + args.cert)
 
-        with open(args.cert, "wb") as f:
-            f.write(cert_insec)
+        shutil.copy(cert_insec, args.cert)
 
     with open(args.cert, "rb") as f:
         buf = f.read()
@@ -50,9 +43,7 @@ def ensure_cert(log: "RootLogger", args) -> None:
             raise Exception(m + "private key must appear before server certificate")
 
     try:
-        with open(args.cert, "rb") as f:
-            active_cert = f.read()
-        if active_cert == cert_insec:
+        if filecmp.cmp(args.cert, cert_insec):
             t = "using default TLS certificate; https will be insecure:\033[36m {}"
             log("cert", t.format(args.cert), 3)
     except:
@@ -85,8 +76,6 @@ def _read_crt(args, fn):
 
 
 def _gen_ca(log: "RootLogger", args):
-    nlog: "NamedLogger" = lambda msg, c=0: log("cert-gen-ca", msg, c)
-
     expiry = _read_crt(args, "ca.pem")[0]
     if time.time() + args.crt_cdays * 60 * 60 * 24 * 0.1 < expiry:
         return
@@ -116,19 +105,13 @@ def _gen_ca(log: "RootLogger", args):
         raise Exception("failed to translate ca-cert: {}, {}".format(rc, se), 3)
 
     bname = os.path.join(args.crt_dir, "ca")
-    try:
-        wunlink(nlog, bname + ".key", VF)
-    except:
-        pass
-    atomic_move(nlog, bname + "-key.pem", bname + ".key", VF)
-    wunlink(nlog, bname + ".csr", VF)
+    os.rename(bname + "-key.pem", bname + ".key")
+    os.unlink(bname + ".csr")
 
     log("cert", "new ca OK", 2)
 
 
 def _gen_srv(log: "RootLogger", args, netdevs: dict[str, Netdev]):
-    nlog: "NamedLogger" = lambda msg, c=0: log("cert-gen-srv", msg, c)
-
     names = args.crt_ns.split(",") if args.crt_ns else []
     if not args.crt_exact:
         for n in names[:]:
@@ -153,22 +136,14 @@ def _gen_srv(log: "RootLogger", args, netdevs: dict[str, Netdev]):
             raise Exception("no useable cert found")
 
         expired = time.time() + args.crt_sdays * 60 * 60 * 24 * 0.5 > expiry
-        if expired:
-            raise Exception("old server-cert has expired")
-
+        cert_insec = os.path.join(args.E.mod, "res/insecure.pem")
         for n in names:
             if n not in inf["sans"]:
                 raise Exception("does not have {}".format(n))
-
-        with load_resource(args.E, "res/insecure.pem") as f:
-            cert_insec = f.read()
-
-        with open(args.cert, "rb") as f:
-            active_cert = f.read()
-
-        if active_cert and active_cert != cert_insec:
+        if expired:
+            raise Exception("old server-cert has expired")
+        if not filecmp.cmp(args.cert, cert_insec):
             return
-
     except Exception as ex:
         log("cert", "will create new server-cert; {}".format(ex))
 
@@ -210,11 +185,11 @@ def _gen_srv(log: "RootLogger", args, netdevs: dict[str, Netdev]):
 
     bname = os.path.join(args.crt_dir, "srv")
     try:
-        wunlink(nlog, bname + ".key", VF)
+        os.unlink(bname + ".key")
     except:
         pass
-    atomic_move(nlog, bname + "-key.pem", bname + ".key", VF)
-    wunlink(nlog, bname + ".csr", VF)
+    os.rename(bname + "-key.pem", bname + ".key")
+    os.unlink(bname + ".csr")
 
     with open(os.path.join(args.crt_dir, "ca.pem"), "rb") as f:
         ca = f.read()

copyparty/cfg.py

@@ -2,12 +2,9 @@
 from __future__ import print_function, unicode_literals
 
 # awk -F\" '/add_argument\("-[^-]/{print(substr($2,2))}' copyparty/__main__.py | sort | tr '\n' ' '
-zs = "a c e2d e2ds e2dsa e2t e2ts e2tsr e2v e2vp e2vu ed emp i j lo mcr mte mth mtm mtp nb nc nid nih nth nw p q s ss sss v z zv"
+zs = "a c e2d e2ds e2dsa e2t e2ts e2tsr e2v e2vp e2vu ed emp i j lo mcr mte mth mtm mtp nb nc nid nih nw p q s ss sss v z zv"
 onedash = set(zs.split())
 
-# verify that all volflags are documented here:
-# grep volflag= __main__.py | sed -r 's/.*volflag=//;s/\).*//' | sort | uniq | while IFS= read -r x; do grep -E "\"$x(=[^ \"]+)?\": \"" cfg.py || printf '%s\n' "$x"; done
-
 
 def vf_bmap() -> dict[str, str]:
     """argv-to-volflag: simple bools"""
@@ -15,19 +12,17 @@ def vf_bmap() -> dict[str, str]:
         "dav_auth": "davauth",
         "dav_rt": "davrt",
         "ed": "dots",
-        "hardlink_only": "hardlinkonly",
-        "no_clone": "noclone",
-        "no_dirsz": "nodirsz",
+        "never_symlink": "neversymlink",
+        "no_dedup": "copydupes",
         "no_dupe": "nodupe",
         "no_forget": "noforget",
-        "no_pipe": "nopipe",
         "no_robots": "norobots",
         "no_thumb": "dthumb",
         "no_vthumb": "dvthumb",
         "no_athumb": "dathumb",
+        "th_no_crop": "nocrop",
     }
     for k in (
-        "dedup",
         "dotsrch",
         "e2d",
         "e2ds",
@@ -40,23 +35,14 @@ def vf_bmap() -> dict[str, str]:
         "e2vp",
         "exp",
         "grid",
-        "gsel",
         "hardlink",
         "magic",
-        "no_db_ip",
         "no_sb_md",
         "no_sb_lg",
-        "nsort",
-        "og",
-        "og_no_head",
-        "og_s_title",
         "rand",
-        "rss",
-        "wo_up_readme",
         "xdev",
         "xlink",
         "xvol",
-        "zipmaxu",
     ):
         ret[k] = k
     return ret
@@ -68,48 +54,17 @@ def vf_vmap() -> dict[str, str]:
         "no_hash": "nohash",
         "no_idx": "noidx",
         "re_maxage": "scan",
-        "safe_dedup": "safededup",
         "th_convt": "convt",
         "th_size": "thsize",
-        "th_crop": "crop",
-        "th_x3": "th3x",
     }
     for k in (
-        "bup_ck",
         "dbd",
-        "forget_ip",
-        "hsortn",
-        "html_head",
         "lg_sbf",
         "md_sbf",
-        "lg_sba",
-        "md_sba",
-        "md_hist",
         "nrand",
-        "u2ow",
-        "og_desc",
-        "og_site",
-        "og_th",
-        "og_title",
-        "og_title_a",
-        "og_title_v",
-        "og_title_i",
-        "og_tpl",
-        "og_ua",
-        "put_ck",
-        "put_name",
-        "mv_retry",
-        "rm_retry",
         "sort",
-        "tcolor",
         "unlist",
-        "u2abort",
         "u2ts",
-        "ups_who",
-        "zip_who",
-        "zipmaxn",
-        "zipmaxs",
-        "zipmaxt",
     ):
         ret[k] = k
     return ret
@@ -121,16 +76,14 @@ def vf_cmap() -> dict[str, str]:
     for k in (
         "exp_lg",
         "exp_md",
-        "ext_th",
+        "html_head",
         "mte",
         "mth",
         "mtp",
-        "xac",
         "xad",
         "xar",
         "xau",
         "xban",
-        "xbc",
         "xbd",
         "xbr",
         "xbu",
@@ -157,22 +110,14 @@ permdescs = {
 
 flagcats = {
     "uploads, general": {
-        "dedup": "enable symlink-based file deduplication",
-        "hardlink": "enable hardlink-based file deduplication,\nwith fallback on symlinks when that is impossible",
-        "hardlinkonly": "dedup with hardlink only, never symlink;\nmake a full copy if hardlink is impossible",
-        "safededup": "verify on-disk data before using it for dedup",
-        "noclone": "take dupe data from clients, even if available on HDD",
-        "nodupe": "rejects existing files (instead of linking/cloning them)",
-        "sparse": "force use of sparse files, mainly for s3-backed storage",
-        "nosparse": "deny use of sparse files, mainly for slow storage",
+        "nodupe": "rejects existing files (instead of symlinking them)",
+        "hardlink": "does dedup with hardlinks instead of symlinks",
+        "neversymlink": "disables symlink fallback; full copy instead",
+        "copydupes": "disables dedup, always saves full copies of dupes",
         "daw": "enable full WebDAV write support (dangerous);\nPUT-operations will now \033[1;31mOVERWRITE\033[0;35m existing files",
         "nosub": "forces all uploads into the top folder of the vfs",
         "magic": "enables filetype detection for nameless uploads",
-        "put_name": "fallback filename for nameless uploads",
-        "put_ck": "default checksum-hasher for PUT/WebDAV uploads",
-        "bup_ck": "default checksum-hasher for bup/basic uploads",
-        "gz": "allows server-side gzip compression of uploads with ?gz",
-        "xz": "allows server-side lzma compression of uploads with ?xz",
+        "gz": "allows server-side gzip of uploads with ?gz (also c,xz)",
         "pk": "forces server-side compression, optional arg: xz,9",
     },
     "upload rules": {
@@ -180,13 +125,9 @@ flagcats = {
         "maxb=1g,300": "max 1 GiB over 5min (suffixes: b, k, m, g, t)",
         "vmaxb=1g": "total volume size max 1 GiB (suffixes: b, k, m, g, t)",
         "vmaxn=4k": "max 4096 files in volume (suffixes: b, k, m, g, t)",
-        "medialinks": "return medialinks for non-up2k uploads (not hotlinks)",
-        "wo_up_readme": "write-only users can upload logues without getting renamed",
         "rand": "force randomized filenames, 9 chars long by default",
         "nrand=N": "randomized filenames are N chars long",
-        "u2ow=N": "overwrite existing files? 0=no 1=if-older 2=always",
         "u2ts=fc": "[f]orce [c]lient-last-modified or [u]pload-time",
-        "u2abort=1": "allow aborting unfinished uploads? 0=no 1=strict 2=ip-chk 3=acct-chk",
         "sz=1k-3m": "allow filesizes between 1 KiB and 3MiB",
         "df=1g": "ensure 1 GiB free disk space",
     },
@@ -196,40 +137,31 @@ flagcats = {
         "lifetime=3600": "uploads are deleted after 1 hour",
     },
     "database, general": {
-        "e2d": "enable database; makes files searchable + enables upload-undo",
+        "e2d": "enable database; makes files searchable + enables upload dedup",
         "e2ds": "scan writable folders for new files on startup; also sets -e2d",
         "e2dsa": "scans all folders for new files on startup; also sets -e2d",
         "e2t": "enable multimedia indexing; makes it possible to search for tags",
         "e2ts": "scan existing files for tags on startup; also sets -e2t",
-        "e2tsr": "delete all metadata from DB (full rescan); also sets -e2ts",
+        "e2tsa": "delete all metadata from DB (full rescan); also sets -e2ts",
         "d2ts": "disables metadata collection for existing files",
-        "e2v": "verify integrity on startup by hashing files and comparing to db",
-        "e2vu": "when e2v fails, update the db (assume on-disk files are good)",
-        "e2vp": "when e2v fails, panic and quit copyparty",
         "d2ds": "disables onboot indexing, overrides -e2ds*",
         "d2t": "disables metadata collection, overrides -e2t*",
         "d2v": "disables file verification, overrides -e2v*",
         "d2d": "disables all database stuff, overrides -e2*",
         "hist=/tmp/cdb": "puts thumbnails and indexes at that location",
-        "dbpath=/tmp/cdb": "puts indexes at that location",
         "scan=60": "scan for new files every 60sec, same as --re-maxage",
         "nohash=\\.iso$": "skips hashing file contents if path matches *.iso",
         "noidx=\\.iso$": "fully ignores the contents at paths matching *.iso",
         "noforget": "don't forget files when deleted from disk",
-        "forget_ip=43200": "forget uploader-IP after 30 days (GDPR)",
-        "no_db_ip": "never store uploader-IP in the db; disables unpost",
         "fat32": "avoid excessive reindexing on android sdcardfs",
         "dbd=[acid|swal|wal|yolo]": "database speed-durability tradeoff",
-        "xlink": "cross-volume dupe detection / linking (dangerous)",
+        "xlink": "cross-volume dupe detection / linking",
         "xdev": "do not descend into other filesystems",
         "xvol": "do not follow symlinks leaving the volume root",
         "dotsrch": "show dotfiles in search results",
         "nodotsrch": "hide dotfiles in search results (default)",
-        "srch_excl": "exclude search results with URL matching this regex",
     },
     'database, audio tags\n"mte", "mth", "mtp", "mtm" all work the same as -mte, -mth, ...': {
-        "mte=artist,title": "media-tags to index/display",
-        "mth=fmt,res,ac": "media-tags to hide by default",
         "mtp=.bpm=f,audio-bpm.py": 'uses the "audio-bpm.py" program to\ngenerate ".bpm" tags from uploads (f = overwrite tags)',
         "mtp=ahash,vhash=media-hash.py": "collects two tags at once",
     },
@@ -238,12 +170,9 @@ flagcats = {
         "dvthumb": "disables video thumbnails",
         "dathumb": "disables audio thumbnails (spectrograms)",
         "dithumb": "disables image thumbnails",
-        "pngquant": "compress audio waveforms 33% better",
         "thsize": "thumbnail res; WxH",
-        "crop": "center-cropping (y/n/fy/fn)",
-        "th3x": "3x resolution (y/n/fy/fn)",
+        "nocrop": "disable center-cropping by default",
         "convt": "conversion timeout in seconds",
-        "ext_th=s=/b.png": "use /b.png as thumbnail for file-extension s",
     },
     "handlers\n(better explained in --help-handlers)": {
         "on404=PY": "handle 404s by executing PY file",
@@ -253,8 +182,6 @@ flagcats = {
         "xbu=CMD": "execute CMD before a file upload starts",
         "xau=CMD": "execute CMD after  a file upload finishes",
         "xiu=CMD": "execute CMD after  all uploads finish and volume is idle",
-        "xbc=CMD": "execute CMD before a file copy",
-        "xac=CMD": "execute CMD after  a file copy",
         "xbr=CMD": "execute CMD before a file rename/move",
         "xar=CMD": "execute CMD after  a file rename/move",
         "xbd=CMD": "execute CMD before a file delete",
@@ -264,14 +191,9 @@ flagcats = {
     },
     "client and ux": {
         "grid": "show grid/thumbnails by default",
-        "gsel": "select files in grid by ctrl-click",
         "sort": "default sort order",
-        "nsort": "natural-sort of leading digits in filenames",
-        "hsortn": "number of sort-rules to add to media URLs",
         "unlist": "dont list files matching REGEX",
-        "html_head=TXT": "includes TXT in the <head>, or @PATH for file at PATH",
-        "tcolor=#fc0": "theme color (a hint for webbrowsers, discord, etc.)",
-        "nodirsz": "don't show total folder size",
+        "html_head=TXT": "includes TXT in the <head>",
         "robots": "allows indexing by search engines (default)",
         "norobots": "kindly asks search engines to leave",
         "no_sb_md": "disable js sandbox for markdown files",
@@ -280,47 +202,12 @@ flagcats = {
         "sb_lg": "enable js sandbox for prologue/epilogue (default)",
         "md_sbf": "list of markdown-sandbox safeguards to disable",
         "lg_sbf": "list of *logue-sandbox safeguards to disable",
-        "md_sba": "value of iframe allow-prop for markdown-sandbox",
-        "lg_sba": "value of iframe allow-prop for *logue-sandbox",
         "nohtml": "return html and markdown as text/html",
     },
-    "opengraph (discord embeds)": {
-        "og": "enable OG (disables hotlinking)",
-        "og_site": "sitename; defaults to --name, disable with '-'",
-        "og_desc": "description text for all files; disable with '-'",
-        "og_th=jf": "thumbnail format; j / jf / jf3 / w / w3 / ...",
-        "og_title_a": "audio title format; default: {{ artist }} - {{ title }}",
-        "og_title_v": "video title format; default: {{ title }}",
-        "og_title_i": "image title format; default: {{ title }}",
-        "og_title=foo": "fallback title if there's nothing in the db",
-        "og_s_title": "force default title; do not read from tags",
-        "og_tpl": "custom html; see --og-tpl in --help",
-        "og_no_head": "you want to add tags manually with og_tpl",
-        "og_ua": "if defined: only send OG html if useragent matches this regex",
-    },
-    "textfiles": {
-        "md_hist": "where to put markdown backups; s=subfolder, v=volHist, n=nope",
-        "exp": "enable textfile expansion; see --help-exp",
-        "exp_md": "placeholders to expand in markdown files; see --help",
-        "exp_lg": "placeholders to expand in prologue/epilogue; see --help",
-    },
     "others": {
         "dots": "allow all users with read-access to\nenable the option to show dotfiles in listings",
         "fk=8": 'generates per-file accesskeys,\nwhich are then required at the "g" permission;\nkeys are invalidated if filesize or inode changes',
         "fka=8": 'generates slightly weaker per-file accesskeys,\nwhich are then required at the "g" permission;\nnot affected by filesize or inode numbers',
-        "dk=8": 'generates per-directory accesskeys,\nwhich are then required at the "g" permission;\nkeys are invalidated if filesize or inode changes',
-        "dks": "per-directory accesskeys allow browsing into subdirs",
-        "dky": 'allow seeing files (not folders) inside a specific folder\nwith "g" perm, and does not require a valid dirkey to do so',
-        "rss": "allow '?rss' URL suffix (experimental)",
-        "ups_who=2": "restrict viewing the list of recent uploads",
-        "zip_who=2": "restrict access to download-as-zip/tar",
-        "zipmaxn=9k": "reject download-as-zip if more than 9000 files",
-        "zipmaxs=2g": "reject download-as-zip if size over 2 GiB",
-        "zipmaxt=no": "reply with 'no' if download-as-zip exceeds max",
-        "zipmaxu": "zip-size-limit does not apply to authenticated users",
-        "nopipe": "disable race-the-beam (download unfinished uploads)",
-        "mv_retry": "ms-windows: timeout for renaming busy files",
-        "rm_retry": "ms-windows: timeout for deleting busy files",
         "davauth": "ask webdav clients to login for all folders",
         "davrt": "show lastmod time of symlink destination, not the link itself\n(note: this option is always enabled for recursive listings)",
     },
@@ -328,10 +215,3 @@ flagcats = {
 
 
 flagdescs = {k.split("=")[0]: v for tab in flagcats.values() for k, v in tab.items()}
-
-
-if True:  # so it gets removed in release-builds
-    for fun in [vf_bmap, vf_cmap, vf_vmap]:
-        for k in fun().values():
-            if k not in flagdescs:
-                raise Exception("undocumented volflag: " + k)

copyparty/dxml.py

@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import print_function, unicode_literals
-
 import importlib
 import sys
 import xml.etree.ElementTree as ET
@@ -11,10 +8,6 @@ if True:  # pylint: disable=using-constant-test
     from typing import Any, Optional
 
 
-class BadXML(Exception):
-    pass
-
-
 def get_ET() -> ET.XMLParser:
     pn = "xml.etree.ElementTree"
     cn = "_elementtree"
@@ -41,7 +34,7 @@ def get_ET() -> ET.XMLParser:
 XMLParser: ET.XMLParser = get_ET()
 
 
-class _DXMLParser(XMLParser):  # type: ignore
+class DXMLParser(XMLParser):  # type: ignore
     def __init__(self) -> None:
         tb = ET.TreeBuilder()
         super(DXMLParser, self).__init__(target=tb)
@@ -56,12 +49,8 @@ class _DXMLParser(XMLParser):  # type: ignore
         raise BadXML("{}, {}".format(a, ka))
 
 
-class _NG(XMLParser):  # type: ignore
-    def __int__(self) -> None:
-        raise BadXML("dxml selftest failed")
-
-
-DXMLParser = _DXMLParser
+class BadXML(Exception):
+    pass
 
 
 def parse_xml(txt: str) -> ET.Element:
@@ -70,40 +59,6 @@ def parse_xml(txt: str) -> ET.Element:
     return parser.close()  # type: ignore
 
 
-def selftest() -> bool:
-    qbe = r"""<!DOCTYPE d [
-<!ENTITY a "nice_bakuretsu">
-]>
-<root>&a;&a;&a;</root>"""
-
-    emb = r"""<!DOCTYPE d [
-<!ENTITY a SYSTEM "file:///etc/hostname">
-]>
-<root>&a;</root>"""
-
-    # future-proofing; there's never been any known vulns
-    # regarding DTDs and ET.XMLParser, but might as well
-    # block them since webdav-clients don't use them
-    dtd = r"""<!DOCTYPE d SYSTEM "a.dtd">
-<root>a</root>"""
-
-    for txt in (qbe, emb, dtd):
-        try:
-            parse_xml(txt)
-            t = "WARNING: dxml selftest failed:\n%s\n"
-            print(t % (txt,), file=sys.stderr)
-            return False
-        except BadXML:
-            pass
-
-    return True
-
-
-DXML_OK = selftest()
-if not DXML_OK:
-    DXMLParser = _NG
-
-
 def mktnod(name: str, text: str) -> ET.Element:
     el = ET.Element(name)
     el.text = text

copyparty/fsutil.py

@@ -1,7 +1,6 @@
 # coding: utf-8
 from __future__ import print_function, unicode_literals
 
-import argparse
 import os
 import re
 import time
@@ -9,50 +8,44 @@ import time
 from .__init__ import ANYWIN, MACOS
 from .authsrv import AXS, VFS
 from .bos import bos
-from .util import chkcmd, min_ex, undot
+from .util import chkcmd, min_ex
 
 if True:  # pylint: disable=using-constant-test
     from typing import Optional, Union
 
-    from .util import RootLogger, undot
+    from .util import RootLogger
 
 
 class Fstab(object):
-    def __init__(self, log: "RootLogger", args: argparse.Namespace):
+    def __init__(self, log: "RootLogger"):
         self.log_func = log
 
-        self.warned = False
         self.trusted = False
         self.tab: Optional[VFS] = None
-        self.oldtab: Optional[VFS] = None
-        self.srctab = "a"
         self.cache: dict[str, str] = {}
         self.age = 0.0
-        self.maxage = args.mtab_age
 
     def log(self, msg: str, c: Union[int, str] = 0) -> None:
         self.log_func("fstab", msg, c)
 
     def get(self, path: str) -> str:
-        now = time.time()
-        if now - self.age > self.maxage or len(self.cache) > 9000:
-            self.age = now
-            self.oldtab = self.tab or self.oldtab
+        if len(self.cache) > 9000:
+            self.age = time.time()
             self.tab = None
             self.cache = {}
 
         fs = "ext4"
-        msg = "failed to determine filesystem at %r; assuming %s\n%s"
+        msg = "failed to determine filesystem at [{}]; assuming {}\n{}"
 
         if ANYWIN:
             fs = "vfat"
             try:
                 path = self._winpath(path)
             except:
-                self.log(msg % (path, fs, min_ex()), 3)
+                self.log(msg.format(path, fs, min_ex()), 3)
                 return fs
 
-        path = undot(path)
+        path = path.lstrip("/")
         try:
             return self.cache[path]
         except:
@@ -61,11 +54,11 @@ class Fstab(object):
         try:
             fs = self.get_w32(path) if ANYWIN else self.get_unix(path)
         except:
-            self.log(msg % (path, fs, min_ex()), 3)
+            self.log(msg.format(path, fs, min_ex()), 3)
 
         fs = fs.lower()
         self.cache[path] = fs
-        self.log("found %s at %r" % (fs, path))
+        self.log("found {} at {}".format(fs, path))
         return fs
 
     def _winpath(self, path: str) -> str:
@@ -78,11 +71,11 @@ class Fstab(object):
             return vid
 
     def build_fallback(self) -> None:
-        self.tab = VFS(self.log_func, "idk", "/", "/", AXS(), {})
+        self.tab = VFS(self.log_func, "idk", "/", AXS(), {})
         self.trusted = False
 
     def build_tab(self) -> None:
-        self.log("inspecting mtab for changes")
+        self.log("building tab")
 
         sptn = r"^.*? on (.*) type ([^ ]+) \(.*"
         if MACOS:
@@ -91,7 +84,6 @@ class Fstab(object):
         ptn = re.compile(sptn)
         so, _ = chkcmd(["mount"])
         tab1: list[tuple[str, str]] = []
-        atab = []
         for ln in so.split("\n"):
             m = ptn.match(ln)
             if not m:
@@ -99,42 +91,30 @@ class Fstab(object):
 
             zs1, zs2 = m.groups()
             tab1.append((str(zs1), str(zs2)))
-            atab.append(ln)
-
-        # keep empirically-correct values if mounttab unchanged
-        srctab = "\n".join(sorted(atab))
-        if srctab == self.srctab:
-            self.tab = self.oldtab
-            return
-
-        self.log("mtab has changed; reevaluating support for sparse files")
 
         tab1.sort(key=lambda x: (len(x[0]), x[0]))
         path1, fs1 = tab1[0]
-        tab = VFS(self.log_func, fs1, path1, path1, AXS(), {})
+        tab = VFS(self.log_func, fs1, path1, AXS(), {})
         for path, fs in tab1[1:]:
-            zs = path.lstrip("/")
-            tab.add(fs, zs, zs)
+            tab.add(fs, path.lstrip("/"))
 
         self.tab = tab
-        self.srctab = srctab
 
     def relabel(self, path: str, nval: str) -> None:
-        assert self.tab  # !rm
+        assert self.tab
         self.cache = {}
         if ANYWIN:
             path = self._winpath(path)
 
-        path = undot(path)
+        path = path.lstrip("/")
         ptn = re.compile(r"^[^\\/]*")
         vn, rem = self.tab._find(path)
         if not self.trusted:
             # no mtab access; have to build as we go
             if "/" in rem:
-                zs = os.path.join(vn.vpath, rem.split("/")[0])
-                self.tab.add("idk", zs, zs)
+                self.tab.add("idk", os.path.join(vn.vpath, rem.split("/")[0]))
             if rem:
-                self.tab.add(nval, path, path)
+                self.tab.add(nval, path)
             else:
                 vn.realpath = nval
 
@@ -153,12 +133,10 @@ class Fstab(object):
                 self.trusted = True
             except:
                 # prisonparty or other restrictive environment
-                if not self.warned:
-                    self.warned = True
-                    self.log("failed to build tab:\n{}".format(min_ex()), 3)
+                self.log("failed to build tab:\n{}".format(min_ex()), 3)
                 self.build_fallback()
 
-        assert self.tab  # !rm
+        assert self.tab
         ret = self.tab._find(path)[0]
         if self.trusted or path == ret.vpath:
             return ret.realpath.split("/")[0]
@@ -169,6 +147,6 @@ class Fstab(object):
         if not self.tab:
             self.build_fallback()
 
-        assert self.tab  # !rm
+        assert self.tab
         ret = self.tab._find(path)[0]
         return ret.realpath

copyparty/ftpd.py

@@ -19,10 +19,7 @@ from .__init__ import PY2, TYPE_CHECKING
 from .authsrv import VFS
 from .bos import bos
 from .util import (
-    FN_EMB,
-    VF_CAREFUL,
     Daemon,
-    ODict,
     Pebkac,
     exclude_dotfiles,
     fsenc,
@@ -32,7 +29,6 @@ from .util import (
     runhook,
     sanitize_fn,
     vjoin,
-    wunlink,
 )
 
 if TYPE_CHECKING:
@@ -40,10 +36,7 @@ if TYPE_CHECKING:
 
 if True:  # pylint: disable=using-constant-test
     import typing
-    from typing import Any, Optional, Union
-
-if PY2:
-    range = xrange  # type: ignore
+    from typing import Any, Optional
 
 
 class FSE(FilesystemError):
@@ -77,7 +70,6 @@ class FtpAuth(DummyAuthorizer):
             else:
                 raise AuthenticationFailed("banned")
 
-        args = self.hub.args
         asrv = self.hub.asrv
         uname = "*"
         if username != "anonymous":
@@ -88,9 +80,6 @@ class FtpAuth(DummyAuthorizer):
                     uname = zs
                     break
 
-        if args.ipu and uname == "*":
-            uname = args.ipu_iu[args.ipu_nm.map(ip)]
-
         if not uname or not (asrv.vfs.aread.get(uname) or asrv.vfs.awrite.get(uname)):
             g = self.hub.gpwd
             if g.lim:
@@ -149,9 +138,6 @@ class FtpFs(AbstractedFS):
         self.listdirinfo = self.listdir
         self.chdir(".")
 
-    def log(self, msg: str, c: Union[int, str] = 0) -> None:
-        self.hub.log("ftpd", msg, c)
-
     def v2a(
         self,
         vpath: str,
@@ -168,19 +154,9 @@ class FtpFs(AbstractedFS):
                 t = "Unsupported characters in [{}]"
                 raise FSE(t.format(vpath), 1)
 
-            fn = sanitize_fn(fn or "", "")
+            fn = sanitize_fn(fn or "", "", [".prologue.html", ".epilogue.html"])
             vpath = vjoin(rd, fn)
             vfs, rem = self.hub.asrv.vfs.get(vpath, self.uname, r, w, m, d)
-            if (
-                w
-                and fn.lower() in FN_EMB
-                and self.h.uname not in vfs.axs.uread
-                and "wo_up_readme" not in vfs.flags
-            ):
-                fn = "_wo_" + fn
-                vpath = vjoin(rd, fn)
-                vfs, rem = self.hub.asrv.vfs.get(vpath, self.uname, r, w, m, d)
-
             if not vfs.realpath:
                 t = "No filesystem mounted at [{}]"
                 raise FSE(t.format(vpath))
@@ -230,38 +206,18 @@ class FtpFs(AbstractedFS):
         w = "w" in mode or "a" in mode or "+" in mode
 
         ap = self.rv2a(filename, r, w)[0]
-        self.validpath(ap)
         if w:
             try:
                 st = bos.stat(ap)
                 td = time.time() - st.st_mtime
-                need_unlink = True
             except:
-                need_unlink = False
                 td = 0
 
-        if w and need_unlink:
-            if td >= -1 and td <= self.args.ftp_wt:
-                # within permitted timeframe; unlink and accept
-                do_it = True
-            elif self.args.no_del or self.args.ftp_no_ow:
-                # file too old, or overwrite not allowed; reject
-                do_it = False
-            else:
-                # allow overwrite if user has delete permission
-                # (avoids win2000 freaking out and deleting the server copy without uploading its own)
-                try:
-                    self.rv2a(filename, False, True, False, True)
-                    do_it = True
-                except:
-                    do_it = False
+            if td < -1 or td > self.args.ftp_wt:
+                raise FSE("Cannot open existing file for writing")
 
-            if not do_it:
-                raise FSE("File already exists")
-
-            wunlink(self.log, ap, VF_CAREFUL)
-
-        return open(fsenc(ap), mode, self.args.iobuf)
+        self.validpath(ap)
+        return open(fsenc(ap), mode)
 
     def chdir(self, path: str) -> None:
         nwd = join(self.cwd, path)
@@ -307,7 +263,6 @@ class FtpFs(AbstractedFS):
                 self.uname,
                 not self.args.no_scandir,
                 [[True, False], [False, True]],
-                throw=True,
             )
             vfs_ls = [x[0] for x in vfs_ls1]
             vfs_ls.extend(vfs_virt.keys())
@@ -326,20 +281,9 @@ class FtpFs(AbstractedFS):
                 # display write-only folders as empty
                 return []
 
-            # return list of accessible volumes
-            ret = []
-            for vn in self.hub.asrv.vfs.all_vols.values():
-                if "/" in vn.vpath or not vn.vpath:
-                    continue  # only include toplevel-mounted vols
-
-                try:
-                    self.hub.asrv.vfs.get(vn.vpath, self.uname, True, False)
-                    ret.append(vn.vpath)
-                except:
-                    pass
-
-            ret.sort()
-            return ret
+            # return list of volumes
+            r = {x.split("/")[0]: 1 for x in self.hub.asrv.vfs.all_vols.keys()}
+            return list(sorted(list(r.keys())))
 
     def rmdir(self, path: str) -> None:
         ap = self.rv2a(path, d=True)[0]
@@ -355,7 +299,7 @@ class FtpFs(AbstractedFS):
 
         vp = join(self.cwd, path).lstrip("/")
         try:
-            self.hub.up2k.handle_rm(self.uname, self.h.cli_ip, [vp], [], False, False)
+            self.hub.up2k.handle_rm(self.uname, self.h.cli_ip, [vp], [], False)
         except Exception as ex:
             raise FSE(str(ex))
 
@@ -369,7 +313,7 @@ class FtpFs(AbstractedFS):
         svp = join(self.cwd, src).lstrip("/")
         dvp = join(self.cwd, dst).lstrip("/")
         try:
-            self.hub.up2k.handle_mv(self.uname, self.h.cli_ip, svp, dvp)
+            self.hub.up2k.handle_mv(self.uname, svp, dvp)
         except Exception as ex:
             raise FSE(str(ex))
 
@@ -465,7 +409,7 @@ class FtpHandler(FTPHandler):
         if cip.startswith("::ffff:"):
             cip = cip[7:]
 
-        if self.args.ftp_ipa_nm and not self.args.ftp_ipa_nm.map(cip):
+        if self.args.ftp_ipa_re and not self.args.ftp_ipa_re.match(cip):
             logging.warning("client rejected (--ftp-ipa): %s", cip)
             self.connected = False
             conn.close()
@@ -487,19 +431,15 @@ class FtpHandler(FTPHandler):
         xbu = vfs.flags.get("xbu")
         if xbu and not runhook(
             None,
-            None,
-            self.hub.up2k,
-            "xbu.ftpd",
             xbu,
             ap,
-            vp,
+            vfs.canonical(rem),
             "",
             self.uname,
-            self.hub.asrv.vfs.get_perms(vp, self.uname),
             0,
             0,
             self.cli_ip,
-            time.time(),
+            0,
             "",
         ):
             raise FSE("Upload blocked by xbu server config")
@@ -602,17 +542,9 @@ class Ftpd(object):
         if "::" in ips:
             ips.append("0.0.0.0")
 
-        ips = [x for x in ips if "unix:" not in x]
-
         if self.args.ftp4:
             ips = [x for x in ips if ":" not in x]
 
-        if not ips:
-            lgr.fatal("cannot start ftp-server; no compatible IPs in -i")
-            return
-
-        ips = list(ODict.fromkeys(ips))  # dedup
-
         ioloop = IOLoop()
         for ip in ips:
             for h, lp in hs:

copyparty/httpconn.py

@@ -9,9 +9,6 @@ import threading  # typechk
 import time
 
 try:
-    if os.environ.get("PRTY_NO_TLS"):
-        raise Exception()
-
     HAVE_SSL = True
     import ssl
 except:
@@ -26,7 +23,7 @@ from .mtag import HAVE_FFMPEG
 from .th_cli import ThumbCli
 from .th_srv import HAVE_PIL, HAVE_VIPS
 from .u2idx import U2idx
-from .util import HMaccas, NetMap, shut_socket
+from .util import HMaccas, shut_socket
 
 if True:  # pylint: disable=using-constant-test
     from typing import Optional, Pattern, Union
@@ -53,17 +50,11 @@ class HttpConn(object):
         self.addr = addr
         self.hsrv = hsrv
 
-        self.u2mutex: threading.Lock = hsrv.u2mutex  # mypy404
+        self.mutex: threading.Lock = hsrv.mutex  # mypy404
         self.args: argparse.Namespace = hsrv.args  # mypy404
         self.E: EnvParams = self.args.E
         self.asrv: AuthSrv = hsrv.asrv  # mypy404
         self.u2fh: Util.FHC = hsrv.u2fh  # mypy404
-        self.pipes: Util.CachedDict = hsrv.pipes  # mypy404
-        self.ipu_iu: Optional[dict[str, str]] = hsrv.ipu_iu
-        self.ipu_nm: Optional[NetMap] = hsrv.ipu_nm
-        self.ipa_nm: Optional[NetMap] = hsrv.ipa_nm
-        self.xff_nm: Optional[NetMap] = hsrv.xff_nm
-        self.xff_lan: NetMap = hsrv.xff_lan  # type: ignore
         self.iphash: HMaccas = hsrv.broker.iphash
         self.bans: dict[str, int] = hsrv.bans
         self.aclose: dict[str, int] = hsrv.aclose
@@ -105,6 +96,9 @@ class HttpConn(object):
         self.log_src = ("%s \033[%dm%d" % (ip, color, self.addr[1])).ljust(26)
         return self.log_src
 
+    def respath(self, res_name: str) -> str:
+        return os.path.join(self.E.mod, "web", res_name)
+
     def log(self, msg: str, c: Union[int, str] = 0) -> None:
         self.log_func(self.log_src, msg, c)
 
@@ -164,7 +158,6 @@ class HttpConn(object):
 
             self.log_src = self.log_src.replace("[36m", "[35m")
             try:
-                assert ssl  # type: ignore  # !rm
                 ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
                 ctx.load_cert_chain(self.args.cert)
                 if self.args.ssl_ver:
@@ -190,7 +183,7 @@ class HttpConn(object):
 
                 if self.args.ssl_dbg and hasattr(self.s, "shared_ciphers"):
                     ciphers = self.s.shared_ciphers()
-                    assert ciphers  # !rm
+                    assert ciphers
                     overlap = [str(y[::-1]) for y in ciphers]
                     self.log("TLS cipher overlap:" + "\n".join(overlap))
                     for k, v in [

copyparty/httpsrv.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 from __future__ import print_function, unicode_literals
 
-import hashlib
+import base64
 import math
 import os
 import re
@@ -12,7 +12,7 @@ import time
 
 import queue
 
-from .__init__ import ANYWIN, CORES, EXE, MACOS, PY2, TYPE_CHECKING, EnvParams, unicode
+from .__init__ import ANYWIN, CORES, EXE, MACOS, TYPE_CHECKING, EnvParams
 
 try:
     MNFE = ModuleNotFoundError
@@ -61,44 +61,27 @@ from .u2idx import U2idx
 from .util import (
     E_SCK,
     FHC,
-    CachedDict,
     Daemon,
     Garda,
     Magician,
     Netdev,
     NetMap,
-    build_netmap,
-    has_resource,
+    absreal,
     ipnorm,
-    load_ipu,
-    load_resource,
     min_ex,
     shut_socket,
     spack,
     start_log_thrs,
     start_stackmon,
-    ub64enc,
 )
 
 if TYPE_CHECKING:
-    from .authsrv import VFS
     from .broker_util import BrokerCli
     from .ssdp import SSDPr
 
 if True:  # pylint: disable=using-constant-test
     from typing import Any, Optional
 
-if PY2:
-    range = xrange  # type: ignore
-
-if not hasattr(socket, "AF_UNIX"):
-    setattr(socket, "AF_UNIX", -9001)
-
-
-def load_jinja2_resource(E: EnvParams, name: str):
-    with load_resource(E, "web/" + name, "r") as f:
-        return f.read()
-
 
 class HttpSrv(object):
     """
@@ -120,7 +103,7 @@ class HttpSrv(object):
         self.t0 = time.time()
         nsuf = "-n{}-i{:x}".format(nid, os.getpid()) if nid else ""
         self.magician = Magician()
-        self.nm = NetMap([], [])
+        self.nm = NetMap([], {})
         self.ssdp: Optional["SSDPr"] = None
         self.gpwd = Garda(self.args.ban_pw)
         self.g404 = Garda(self.args.ban_404)
@@ -131,16 +114,9 @@ class HttpSrv(object):
         self.bans: dict[str, int] = {}
         self.aclose: dict[str, int] = {}
 
-        dli: dict[str, tuple[float, int, "VFS", str, str]] = {}  # info
-        dls: dict[str, tuple[float, int]] = {}  # state
-        self.dli = self.tdli = dli
-        self.dls = self.tdls = dls
-        self.iiam = '<img src="%s.cpr/iiam.gif?cache=i" />' % (self.args.SRS,)
-
         self.bound: set[tuple[str, int]] = set()
         self.name = "hsrv" + nsuf
         self.mutex = threading.Lock()
-        self.u2mutex = threading.Lock()
         self.stopping = False
 
         self.tp_nthr = 0  # actual
@@ -152,8 +128,6 @@ class HttpSrv(object):
         self.t_periodic: Optional[threading.Thread] = None
 
         self.u2fh = FHC()
-        self.u2sc: dict[str, tuple[int, "hashlib._Hash"]] = {}
-        self.pipes = CachedDict(0.2)
         self.metrics = Metrics(self)
         self.nreq = 0
         self.nsus = 0
@@ -168,32 +142,18 @@ class HttpSrv(object):
         self.u2idx_free: dict[str, U2idx] = {}
         self.u2idx_n = 0
 
-        assert jinja2  # type: ignore  # !rm
         env = jinja2.Environment()
-        env.loader = jinja2.FunctionLoader(lambda f: load_jinja2_resource(self.E, f))
-        jn = [
-            "browser",
-            "browser2",
-            "cf",
-            "md",
-            "mde",
-            "msg",
-            "rups",
-            "shares",
-            "splash",
-            "svcs",
-        ]
+        env.loader = jinja2.FileSystemLoader(os.path.join(self.E.mod, "web"))
+        jn = ["splash", "svcs", "browser", "browser2", "msg", "md", "mde", "cf"]
         self.j2 = {x: env.get_template(x + ".html") for x in jn}
-        self.prism = has_resource(self.E, "web/deps/prism.js.gz")
+        zs = os.path.join(self.E.mod, "web", "deps", "prism.js.gz")
+        self.prism = os.path.exists(zs)
 
-        if self.args.ipu:
-            self.ipu_iu, self.ipu_nm = load_ipu(self.log, self.args.ipu)
-        else:
-            self.ipu_iu = self.ipu_nm = None
+        self.statics: set[str] = set()
+        self._build_statics()
 
-        self.ipa_nm = build_netmap(self.args.ipa)
-        self.xff_nm = build_netmap(self.args.xff_src)
-        self.xff_lan = build_netmap("lan")
+        self.ptn_cc = re.compile(r"[\x00-\x1f]")
+        self.ptn_hsafe = re.compile(r"[\x00-\x1f<>\"'&]")
 
         self.mallow = "GET HEAD POST PUT DELETE OPTIONS".split()
         if not self.args.no_dav:
@@ -209,9 +169,6 @@ class HttpSrv(object):
             self.start_threads(4)
 
         if nid:
-            self.tdli = {}
-            self.tdls = {}
-
             if self.args.stackmon:
                 start_stackmon(self.args.stackmon, nid)
 
@@ -228,12 +185,20 @@ class HttpSrv(object):
         except:
             pass
 
+    def _build_statics(self) -> None:
+        for dp, _, df in os.walk(os.path.join(self.E.mod, "web")):
+            for fn in df:
+                ap = absreal(os.path.join(dp, fn))
+                self.statics.add(ap)
+                if ap.endswith(".gz") or ap.endswith(".br"):
+                    self.statics.add(ap[:-3])
+
     def set_netdevs(self, netdevs: dict[str, Netdev]) -> None:
         ips = set()
         for ip, _ in self.bound:
             ips.add(ip)
 
-        self.nm = NetMap(list(ips), list(netdevs))
+        self.nm = NetMap(list(ips), netdevs)
 
     def start_threads(self, n: int) -> None:
         self.tp_nthr += n
@@ -248,14 +213,14 @@ class HttpSrv(object):
         if self.args.log_htp:
             self.log(self.name, "workers -= {} = {}".format(n, self.tp_nthr), 6)
 
-        assert self.tp_q  # !rm
+        assert self.tp_q
         for _ in range(n):
             self.tp_q.put(None)
 
     def periodic(self) -> None:
         while True:
             time.sleep(2 if self.tp_ncli or self.ncli else 10)
-            with self.u2mutex, self.mutex:
+            with self.mutex:
                 self.u2fh.clean()
                 if self.tp_q:
                     self.tp_ncli = max(self.ncli, self.tp_ncli - 2)
@@ -267,24 +232,15 @@ class HttpSrv(object):
                     return
 
     def listen(self, sck: socket.socket, nlisteners: int) -> None:
-        tcp = sck.family != socket.AF_UNIX
-
         if self.args.j != 1:
             # lost in the pickle; redefine
             if not ANYWIN or self.args.reuseaddr:
                 sck.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
-            if tcp:
-                sck.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-
+            sck.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
             sck.settimeout(None)  # < does not inherit, ^ opts above do
 
-        if tcp:
-            ip, port = sck.getsockname()[:2]
-        else:
-            ip = re.sub(r"\.[0-9]+$", "", sck.getsockname().split("/")[-1])
-            port = 0
-
+        ip, port = sck.getsockname()[:2]
         self.srvs.append(sck)
         self.bound.add((ip, port))
         self.nclimax = math.ceil(self.args.nc * 1.0 / nlisteners)
@@ -296,22 +252,16 @@ class HttpSrv(object):
 
     def thr_listen(self, srv_sck: socket.socket) -> None:
         """listens on a shared tcp server"""
+        ip, port = srv_sck.getsockname()[:2]
         fno = srv_sck.fileno()
-        if srv_sck.family == socket.AF_UNIX:
-            ip = re.sub(r"\.[0-9]+$", "", srv_sck.getsockname())
-            msg = "subscribed @ %s  f%d p%d" % (ip, fno, os.getpid())
-            ip = ip.split("/")[-1]
-            port = 0
-            tcp = False
-        else:
-            tcp = True
-            ip, port = srv_sck.getsockname()[:2]
-            hip = "[%s]" % (ip,) if ":" in ip else ip
-            msg = "subscribed @ %s:%d  f%d p%d" % (hip, port, fno, os.getpid())
-
+        hip = "[{}]".format(ip) if ":" in ip else ip
+        msg = "subscribed @ {}:{}  f{} p{}".format(hip, port, fno, os.getpid())
         self.log(self.name, msg)
 
-        Daemon(self.broker.say, "sig-hsrv-up1", ("cb_httpsrv_up",))
+        def fun() -> None:
+            self.broker.say("cb_httpsrv_up")
+
+        threading.Thread(target=fun, name="sig-hsrv-up1").start()
 
         while not self.stopping:
             if self.args.log_conn:
@@ -380,13 +330,11 @@ class HttpSrv(object):
 
             try:
                 sck, saddr = srv_sck.accept()
-                if tcp:
-                    cip = unicode(saddr[0])
-                    if cip.startswith("::ffff:"):
-                        cip = cip[7:]
-                    addr = (cip, saddr[1])
-                else:
-                    addr = ("127.8.3.7", sck.fileno())
+                cip, cport = saddr[:2]
+                if cip.startswith("::ffff:"):
+                    cip = cip[7:]
+
+                addr = (cip, cport)
             except (OSError, socket.error) as ex:
                 if self.stopping:
                     break
@@ -442,7 +390,7 @@ class HttpSrv(object):
         )
 
     def thr_poolw(self) -> None:
-        assert self.tp_q  # !rm
+        assert self.tp_q
         while True:
             task = self.tp_q.get()
             if not task:
@@ -554,8 +502,8 @@ class HttpSrv(object):
             except:
                 pass
 
-            # spack gives 4 lsb, take 3 lsb, get 4 ch
-            self.cb_v = ub64enc(spack(b">L", int(v))[1:]).decode("ascii")
+            v = base64.urlsafe_b64encode(spack(b">xxL", int(v)))
+            self.cb_v = v.decode("ascii")[-4:]
             self.cb_ts = time.time()
             return self.cb_v
 
@@ -586,32 +534,3 @@ class HttpSrv(object):
                 ident += "a"
 
             self.u2idx_free[ident] = u2idx
-
-    def read_dls(
-        self,
-    ) -> tuple[
-        dict[str, tuple[float, int, str, str, str]], dict[str, tuple[float, int]]
-    ]:
-        """
-        mp-broker asking for local dl-info + dl-state;
-        reduce overhead by sending just the vfs vpath
-        """
-        dli = {k: (a, b, c.vpath, d, e) for k, (a, b, c, d, e) in self.dli.items()}
-        return (dli, self.dls)
-
-    def write_dls(
-        self,
-        sdli: dict[str, tuple[float, int, str, str, str]],
-        dls: dict[str, tuple[float, int]],
-    ) -> None:
-        """
-        mp-broker pushing total dl-info + dl-state;
-        swap out the vfs vpath with the vfs node
-        """
-        dli: dict[str, tuple[float, int, "VFS", str, str]] = {}
-        for k, (a, b, c, d, e) in sdli.items():
-            vn = self.asrv.vfs.all_nodes[c]
-            dli[k] = (a, b, vn, d, e)
-
-        self.tdli = dli
-        self.tdls = dls

copyparty/ico.py

@@ -8,7 +8,7 @@ import re
 
 from .__init__ import PY2
 from .th_srv import HAVE_PIL, HAVE_PILF
-from .util import BytesIO, html_escape  # type: ignore
+from .util import BytesIO  # type: ignore
 
 
 class Ico(object):
@@ -31,9 +31,10 @@ class Ico(object):
 
         w = 100
         h = 30
-        if as_thumb:
+        if not self.args.th_no_crop and as_thumb:
             sw, sh = self.args.th_size.split("x")
             h = int(100.0 / (float(sw) / float(sh)))
+            w = 100
 
         if chrome:
             # cannot handle more than ~2000 unique SVGs
@@ -74,7 +75,7 @@ class Ico(object):
                 try:
                     _, _, tw, th = pb.textbbox((0, 0), ext)
                 except:
-                    tw, th = pb.textsize(ext)  # type: ignore
+                    tw, th = pb.textsize(ext)
 
                 tw += len(ext)
                 cw = tw // len(ext)
@@ -94,21 +95,10 @@ class Ico(object):
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 100 {}" xmlns="http://www.w3.org/2000/svg"><g>
 <rect width="100%" height="100%" fill="#{}" />
-<text x="50%" y="{}" dominant-baseline="middle" text-anchor="middle" xml:space="preserve"
+<text x="50%" y="50%" dominant-baseline="middle" text-anchor="middle" xml:space="preserve"
   fill="#{}" font-family="monospace" font-size="14px" style="letter-spacing:.5px">{}</text>
 </g></svg>
 """
-
-        txt = html_escape(ext, True)
-        if "\n" in txt:
-            lines = txt.split("\n")
-            n = len(lines)
-            y = "20%" if n == 2 else "10%" if n == 3 else "0"
-            zs = '<tspan x="50%%" dy="1.2em">%s</tspan>'
-            txt = "".join([zs % (x,) for x in lines])
-        else:
-            y = "50%"
-
-        svg = svg.format(h, c[:6], y, c[6:], txt)
+        svg = svg.format(h, c[:6], c[6:], ext)
 
         return "image/svg+xml", svg.encode("utf-8")

copyparty/mdns.py

@@ -25,7 +25,6 @@ from .stolen.dnslib import (
     DNSHeader,
     DNSQuestion,
     DNSRecord,
-    set_avahi_379,
 )
 from .util import CachedSet, Daemon, Netdev, list_ips, min_ex
 
@@ -73,9 +72,6 @@ class MDNS(MCast):
         self.ngen = ngen
         self.ttl = 300
 
-        if not self.args.zm_nwa_1:
-            set_avahi_379()
-
         zs = self.args.name + ".local."
         zs = zs.encode("ascii", "replace").decode("ascii", "replace")
         self.hn = "-".join(x for x in zs.split("?") if x) or (
@@ -296,22 +292,6 @@ class MDNS(MCast):
     def run2(self) -> None:
         last_hop = time.time()
         ihop = self.args.mc_hop
-
-        try:
-            if self.args.no_poll:
-                raise Exception()
-            fd2sck = {}
-            srvpoll = select.poll()
-            for sck in self.srv:
-                fd = sck.fileno()
-                fd2sck[fd] = sck
-                srvpoll.register(fd, select.POLLIN)
-        except Exception as ex:
-            srvpoll = None
-            if not self.args.no_poll:
-                t = "WARNING: failed to poll(), will use select() instead: %r"
-                self.log(t % (ex,), 3)
-
         while self.running:
             timeout = (
                 0.02 + random.random() * 0.07
@@ -320,13 +300,8 @@ class MDNS(MCast):
                 if self.unsolicited
                 else (last_hop + ihop if ihop else 180)
             )
-            if srvpoll:
-                pr = srvpoll.poll(timeout * 1000)
-                rx = [fd2sck[x[0]] for x in pr if x[1] & select.POLLIN]
-            else:
-                rdy = select.select(self.srv, [], [], timeout)
-                rx: list[socket.socket] = rdy[0]  # type: ignore
-
+            rdy = select.select(self.srv, [], [], timeout)
+            rx: list[socket.socket] = rdy[0]  # type: ignore
             self.rx4.cln()
             self.rx6.cln()
             buf = b""
@@ -340,9 +315,6 @@ class MDNS(MCast):
                         self.log("stopped", 2)
                         return
 
-                    if self.args.zm_no_pe:
-                        continue
-
                     t = "{} {} \033[33m|{}| {}\n{}".format(
                         self.srv[sck].name, addr, len(buf), repr(buf)[2:-1], min_ex()
                     )
@@ -368,7 +340,7 @@ class MDNS(MCast):
             except:
                 pass
 
-        self.srv.clear()
+        self.srv = {}
 
     def eat(self, buf: bytes, addr: tuple[str, int], sck: socket.socket) -> None:
         cip = addr[0]

copyparty/metrics.py

@@ -18,7 +18,7 @@ class Metrics(object):
 
     def tx(self, cli: "HttpCli") -> bool:
         if not cli.avol:
-            raise Pebkac(403, "'stats' not allowed for user " + cli.uname)
+            raise Pebkac(403, "not allowed for user " + cli.uname)
 
         args = cli.args
         if not args.stats:
@@ -72,9 +72,6 @@ class Metrics(object):
         v = "{:.3f}".format(self.hsrv.t0)
         addug("cpp_boot_unixtime", "seconds", v, t)
 
-        t = "number of active downloads"
-        addg("cpp_active_dl", str(len(self.hsrv.tdls)), t)
-
         t = "number of open http(s) client connections"
         addg("cpp_http_conns", str(self.hsrv.ncli), t)
 
@@ -91,7 +88,7 @@ class Metrics(object):
         addg("cpp_total_bans", str(self.hsrv.nban), t)
 
         if not args.nos_vst:
-            x = self.hsrv.broker.ask("up2k.get_state", True, "")
+            x = self.hsrv.broker.ask("up2k.get_state")
             vs = json.loads(x.get())
 
             nvidle = 0
@@ -131,7 +128,7 @@ class Metrics(object):
             addbh("cpp_disk_size_bytes", "total HDD size of volume")
             addbh("cpp_disk_free_bytes", "free HDD space in volume")
             for vpath, vol in allvols:
-                free, total, _ = get_df(vol.realpath, False)
+                free, total = get_df(vol.realpath)
                 if free is None or total is None:
                     continue
 
@@ -182,7 +179,7 @@ class Metrics(object):
             tnbytes = 0
             tnfiles = 0
             for vpath, vol in allvols:
-                cur = idx.get_cur(vol)
+                cur = idx.get_cur(vol.realpath)
                 if not cur:
                     continue
 
@@ -209,9 +206,6 @@ class Metrics(object):
             try:
                 x = self.hsrv.broker.ask("up2k.get_unfinished")
                 xs = x.get()
-                if not xs:
-                    raise Exception("up2k mutex acquisition timed out")
-
                 xj = json.loads(xs)
                 for ptop, (nbytes, nfiles) in xj.items():
                     tnbytes += nbytes

copyparty/mtag.py

@@ -4,45 +4,28 @@ from __future__ import print_function, unicode_literals
 import argparse
 import json
 import os
-import re
 import shutil
 import subprocess as sp
 import sys
-import tempfile
 
 from .__init__ import ANYWIN, EXE, PY2, WINDOWS, E, unicode
-from .authsrv import VFS
 from .bos import bos
 from .util import (
     FFMPEG_URL,
     REKOBO_LKEY,
-    VF_CAREFUL,
     fsenc,
-    gzip,
     min_ex,
     pybin,
     retchk,
     runcmd,
     sfsenc,
     uncyg,
-    wunlink,
 )
 
 if True:  # pylint: disable=using-constant-test
-    from typing import Any, Optional, Union
+    from typing import Any, Union
 
-    from .util import NamedLogger, RootLogger
-
-
-try:
-    if os.environ.get("PRTY_NO_MUTAGEN"):
-        raise Exception()
-
-    from mutagen import version  # noqa: F401
-
-    HAVE_MUTAGEN = True
-except:
-    HAVE_MUTAGEN = False
+    from .util import RootLogger
 
 
 def have_ff(scmd: str) -> bool:
@@ -61,11 +44,8 @@ def have_ff(scmd: str) -> bool:
         return bool(shutil.which(scmd))
 
 
-HAVE_FFMPEG = not os.environ.get("PRTY_NO_FFMPEG") and have_ff("ffmpeg")
-HAVE_FFPROBE = not os.environ.get("PRTY_NO_FFPROBE") and have_ff("ffprobe")
-
-CBZ_PICS = set("png jpg jpeg gif bmp tga tif tiff webp avif".split())
-CBZ_01 = re.compile(r"(^|[^0-9v])0+[01]\b")
+HAVE_FFMPEG = have_ff("ffmpeg")
+HAVE_FFPROBE = have_ff("ffprobe")
 
 
 class MParser(object):
@@ -127,79 +107,6 @@ class MParser(object):
             raise Exception()
 
 
-def au_unpk(
-    log: "NamedLogger", fmt_map: dict[str, str], abspath: str, vn: Optional[VFS] = None
-) -> str:
-    ret = ""
-    maxsz = 1024 * 1024 * 64
-    try:
-        ext = abspath.split(".")[-1].lower()
-        au, pk = fmt_map[ext].split(".")
-
-        fd, ret = tempfile.mkstemp("." + au)
-
-        if pk == "gz":
-            fi = gzip.GzipFile(abspath, mode="rb")
-
-        elif pk == "xz":
-            import lzma
-
-            fi = lzma.open(abspath, "rb")
-
-        elif pk == "zip":
-            import zipfile
-
-            zf = zipfile.ZipFile(abspath, "r")
-            zil = zf.infolist()
-            zil = [x for x in zil if x.filename.lower().split(".")[-1] == au]
-            if not zil:
-                raise Exception("no audio inside zip")
-            fi = zf.open(zil[0])
-
-        elif pk == "cbz":
-            import zipfile
-
-            zf = zipfile.ZipFile(abspath, "r")
-            znil = [(x.filename.lower(), x) for x in zf.infolist()]
-            nf = len(znil)
-            znil = [x for x in znil if x[0].split(".")[-1] in CBZ_PICS]
-            znil = [x for x in znil if "cover" in x[0]] or znil
-            znil = [x for x in znil if CBZ_01.search(x[0])] or znil
-            t = "cbz: %d files, %d hits" % (nf, len(znil))
-            if znil:
-                t += ", using " + znil[0][1].filename
-            log(t)
-            if not znil:
-                raise Exception("no images inside cbz")
-            fi = zf.open(znil[0][1])
-
-        else:
-            raise Exception("unknown compression %s" % (pk,))
-
-        fsz = 0
-        with os.fdopen(fd, "wb") as fo:
-            while True:
-                buf = fi.read(32768)
-                if not buf:
-                    break
-
-                fsz += len(buf)
-                if fsz > maxsz:
-                    raise Exception("zipbomb defused")
-
-                fo.write(buf)
-
-        return ret
-
-    except Exception as ex:
-        if ret:
-            t = "failed to decompress audio file %r: %r"
-            log(t % (abspath, ex))
-            wunlink(log, ret, vn.flags if vn else VF_CAREFUL)
-
-        return abspath
-
-
 def ffprobe(
     abspath: str, timeout: int = 60
 ) -> tuple[dict[str, tuple[int, Any]], dict[str, list[Any]]]:
@@ -374,14 +281,16 @@ class MTag(object):
         or_ffprobe = " or FFprobe"
 
         if self.backend == "mutagen":
-            self._get = self.get_mutagen
-            if not HAVE_MUTAGEN:
+            self.get = self.get_mutagen
+            try:
+                from mutagen import version  # noqa: F401
+            except:
                 self.log("could not load Mutagen, trying FFprobe instead", c=3)
                 self.backend = "ffprobe"
 
         if self.backend == "ffprobe":
             self.usable = self.can_ffprobe
-            self._get = self.get_ffprobe
+            self.get = self.get_ffprobe
             self.prefer_mt = True
 
             if not HAVE_FFPROBE:
@@ -501,7 +410,7 @@ class MTag(object):
                 sv = str(zv).split("/")[0].strip().lstrip("0")
                 ret[sk] = sv or 0
 
-        # normalize key notation to rekobo
+        # normalize key notation to rkeobo
         okey = ret.get("key")
         if okey:
             key = str(okey).replace(" ", "").replace("maj", "").replace("min", "m")
@@ -551,17 +460,6 @@ class MTag(object):
 
         return r1
 
-    def get(self, abspath: str) -> dict[str, Union[str, float]]:
-        ext = abspath.split(".")[-1].lower()
-        if ext not in self.args.au_unpk:
-            return self._get(abspath)
-
-        ap = au_unpk(self.log, self.args.au_unpk, abspath)
-        ret = self._get(ap)
-        if ap != abspath:
-            wunlink(self.log, ap, VF_CAREFUL)
-        return ret
-
     def get_mutagen(self, abspath: str) -> dict[str, Union[str, float]]:
         ret: dict[str, tuple[int, Any]] = {}
 
@@ -581,7 +479,7 @@ class MTag(object):
                 raise Exception()
         except Exception as ex:
             if self.args.mtag_v:
-                self.log("mutagen-err [%s] @ %r" % (ex, abspath), "90")
+                self.log("mutagen-err [{}] @ [{}]".format(ex, abspath), "90")
 
             return self.get_ffprobe(abspath) if self.can_ffprobe else {}
 
@@ -615,7 +513,7 @@ class MTag(object):
                 continue
 
             if k == ".aq":
-                v /= 1000  # type: ignore
+                v /= 1000
 
             if k == "ac" and v.startswith("mp4a.40."):
                 v = "aac"
@@ -653,18 +551,13 @@ class MTag(object):
             pypath = str(os.pathsep.join(zsl))
             env["PYTHONPATH"] = pypath
         except:
-            raise  # might be expected outside cpython
-
-        ext = abspath.split(".")[-1].lower()
-        if ext in self.args.au_unpk:
-            ap = au_unpk(self.log, self.args.au_unpk, abspath)
-        else:
-            ap = abspath
+            if not E.ox and not EXE:
+                raise
 
         ret: dict[str, Any] = {}
         for tagname, parser in sorted(parsers.items(), key=lambda x: (x[1].pri, x[0])):
             try:
-                cmd = [parser.bin, ap]
+                cmd = [parser.bin, abspath]
                 if parser.bin.endswith(".py"):
                     cmd = [pybin] + cmd
 
@@ -698,10 +591,7 @@ class MTag(object):
                             ret[tag] = zj[tag]
             except:
                 if self.args.mtag_v:
-                    t = "mtag error: tagname %r, parser %r, file %r => %r"
-                    self.log(t % (tagname, parser.bin, abspath, min_ex()), 6)
-
-        if ap != abspath:
-            wunlink(self.log, ap, VF_CAREFUL)
+                    t = "mtag error: tagname {}, parser {}, file {} => {}"
+                    self.log(t.format(tagname, parser.bin, abspath, min_ex()))
 
         return ret

copyparty/multicast.py

@@ -110,7 +110,7 @@ class MCast(object):
             )
 
         ips = [x for x in ips if x not in ("::1", "127.0.0.1")]
-        ips = find_prefix(ips, list(netdevs))
+        ips = find_prefix(ips, netdevs)
 
         on = self.on[:]
         off = self.off[:]
@@ -163,7 +163,6 @@ class MCast(object):
             sck.settimeout(None)
             sck.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             try:
-                # safe for this purpose; https://lwn.net/Articles/853637/
                 sck.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
             except:
                 pass
@@ -207,7 +206,6 @@ class MCast(object):
             except:
                 t = "announce failed on {} [{}]:\n{}"
                 self.log(t.format(netdev, ip, min_ex()), 3)
-                sck.close()
 
         if self.args.zm_msub:
             for s1 in self.srv.values():

copyparty/pwhash.py

@@ -4,33 +4,27 @@ from __future__ import print_function, unicode_literals
 import argparse
 import base64
 import hashlib
-import os
 import sys
 import threading
 
 from .__init__ import unicode
 
-try:
-    if os.environ.get("PRTY_NO_ARGON2"):
-        raise Exception()
-
-    HAVE_ARGON2 = True
-    from argon2 import exceptions as argon2ex
-except:
-    HAVE_ARGON2 = False
-
 
 class PWHash(object):
     def __init__(self, args: argparse.Namespace):
         self.args = args
 
-        zsl = args.ah_alg.split(",")
-        alg = zsl[0]
+        try:
+            alg, ac = args.ah_alg.split(",")
+        except:
+            alg = args.ah_alg
+            ac = {}
+
         if alg == "none":
             alg = ""
 
         self.alg = alg
-        self.ac = zsl[1:]
+        self.ac = ac
         if not alg:
             self.on = False
             self.hash = unicode
@@ -86,23 +80,17 @@ class PWHash(object):
         its = 2
         blksz = 8
         para = 4
-        ramcap = 0  # openssl 1.1 = 32 MiB
         try:
             cost = 2 << int(self.ac[0])
             its = int(self.ac[1])
             blksz = int(self.ac[2])
             para = int(self.ac[3])
-            ramcap = int(self.ac[4]) * 1024 * 1024
         except:
             pass
 
-        cfg = {"salt": self.salt, "n": cost, "r": blksz, "p": para, "dklen": 24}
-        if ramcap:
-            cfg["maxmem"] = ramcap
-
         ret = plain.encode("utf-8")
         for _ in range(its):
-            ret = hashlib.scrypt(ret, **cfg)
+            ret = hashlib.scrypt(ret, salt=self.salt, n=cost, r=blksz, p=para, dklen=24)
 
         return "+" + base64.urlsafe_b64encode(ret).decode("utf-8")
 

copyparty/smbd.py

@@ -12,7 +12,7 @@ from types import SimpleNamespace
 from .__init__ import ANYWIN, EXE, TYPE_CHECKING
 from .authsrv import LEELOO_DALLAS, VFS
 from .bos import bos
-from .util import Daemon, absreal, min_ex, pybin, runhook, vjoin
+from .util import Daemon, min_ex, pybin, runhook
 
 if True:  # pylint: disable=using-constant-test
     from typing import Any, Union
@@ -127,7 +127,7 @@ class SMB(object):
         self.log("smb", msg, c)
 
     def start(self) -> None:
-        Daemon(self.srv.start, "smbd")
+        Daemon(self.srv.start)
 
     def _auth_cb(self, *a, **ka):
         debug("auth-result: %s %s", a, ka)
@@ -151,8 +151,6 @@ class SMB(object):
     def _uname(self) -> str:
         if self.noacc:
             return LEELOO_DALLAS
-        if not self.asrv.acct:
-            return "*"
 
         try:
             # you found it! my single worst bit of code so far
@@ -189,9 +187,7 @@ class SMB(object):
 
         debug('%s("%s", %s) %s @%s\033[K\033[0m', caller, vpath, str(a), perms, uname)
         vfs, rem = self.asrv.vfs.get(vpath, uname, *perms)
-        if not vfs.realpath:
-            raise Exception("unmapped vfs")
-        return vfs, vjoin(vfs.realpath, rem)
+        return vfs, vfs.canonical(rem)
 
     def _listdir(self, vpath: str, *a: Any, **ka: Any) -> list[str]:
         vpath = vpath.replace("\\", "/").lstrip("/")
@@ -199,8 +195,6 @@ class SMB(object):
         uname = self._uname()
         # debug('listdir("%s", %s) @%s\033[K\033[0m', vpath, str(a), uname)
         vfs, rem = self.asrv.vfs.get(vpath, uname, False, False)
-        if not vfs.realpath:
-            raise Exception("unmapped vfs")
         _, vfs_ls, vfs_virt = vfs.ls(
             rem, uname, not self.args.no_scandir, [[False, False]]
         )
@@ -215,7 +209,7 @@ class SMB(object):
         sz = 112 * 2  # ['.', '..']
         for n, fn in enumerate(ls):
             if sz >= 64000:
-                t = "listing only %d of %d files (%d byte) in /%s for performance; see --smb-nwa-1"
+                t = "listing only %d of %d files (%d byte) in /%s; see impacket#1433"
                 warning(t, n, len(ls), sz, vpath)
                 break
 
@@ -244,26 +238,11 @@ class SMB(object):
                 t = "blocked write (no-write-acc %s): /%s @%s"
                 yeet(t % (vfs.axs.uwrite, vpath, uname))
 
-            ap = absreal(ap)
             xbu = vfs.flags.get("xbu")
             if xbu and not runhook(
-                self.nlog,
-                None,
-                self.hub.up2k,
-                "xbu.smb",
-                xbu,
-                ap,
-                vpath,
-                "",
-                "",
-                "",
-                0,
-                0,
-                "1.7.6.2",
-                time.time(),
-                "",
+                self.nlog, xbu, ap, vpath, "", "", 0, 0, "1.7.6.2", 0, ""
             ):
-                yeet("blocked by xbu server config: %r" % (vpath,))
+                yeet("blocked by xbu server config: " + vpath)
 
         ret = bos.open(ap, flags, *a, mode=chmod, **ka)
         if wr:
@@ -318,7 +297,7 @@ class SMB(object):
             t = "blocked rename (no-move-acc %s): /%s @%s"
             yeet(t % (vfs1.axs.umove, vp1, uname))
 
-        self.hub.up2k.handle_mv(uname, "1.7.6.2", vp1, vp2)
+        self.hub.up2k.handle_mv(uname, vp1, vp2)
         try:
             bos.makedirs(ap2)
         except:
@@ -361,7 +340,7 @@ class SMB(object):
             yeet("blocked delete (no-del-acc): " + vpath)
 
         vpath = vpath.replace("\\", "/").lstrip("/")
-        self.hub.up2k.handle_rm(uname, "1.7.6.2", [vpath], [], False, False)
+        self.hub.up2k.handle_rm(uname, "1.7.6.2", [vpath], [], False)
 
     def _utime(self, vpath: str, times: tuple[float, float]) -> None:
         if not self.args.smbw:

copyparty/ssdp.py

@@ -5,11 +5,11 @@ import errno
 import re
 import select
 import socket
-import time
+from email.utils import formatdate
 
 from .__init__ import TYPE_CHECKING
 from .multicast import MC_Sck, MCast
-from .util import CachedSet, formatdate, html_escape, min_ex
+from .util import CachedSet, html_escape, min_ex
 
 if TYPE_CHECKING:
     from .broker_util import BrokerCli
@@ -84,7 +84,7 @@ class SSDPr(object):
         name = self.args.doctitle
         zs = zs.strip().format(c(ubase), c(url), c(name), c(self.args.zsid))
         hc.reply(zs.encode("utf-8", "replace"))
-        return False  # close connection
+        return False  # close connectino
 
 
 class SSDPd(MCast):
@@ -141,29 +141,9 @@ class SSDPd(MCast):
         self.log("stopped", 2)
 
     def run2(self) -> None:
-        try:
-            if self.args.no_poll:
-                raise Exception()
-            fd2sck = {}
-            srvpoll = select.poll()
-            for sck in self.srv:
-                fd = sck.fileno()
-                fd2sck[fd] = sck
-                srvpoll.register(fd, select.POLLIN)
-        except Exception as ex:
-            srvpoll = None
-            if not self.args.no_poll:
-                t = "WARNING: failed to poll(), will use select() instead: %r"
-                self.log(t % (ex,), 3)
-
         while self.running:
-            if srvpoll:
-                pr = srvpoll.poll((self.args.z_chk or 180) * 1000)
-                rx = [fd2sck[x[0]] for x in pr if x[1] & select.POLLIN]
-            else:
-                rdy = select.select(self.srv, [], [], self.args.z_chk or 180)
-                rx: list[socket.socket] = rdy[0]  # type: ignore
-
+            rdy = select.select(self.srv, [], [], self.args.z_chk or 180)
+            rx: list[socket.socket] = rdy[0]  # type: ignore
             self.rxc.cln()
             buf = b""
             addr = ("0", 0)
@@ -188,7 +168,7 @@ class SSDPd(MCast):
             except:
                 pass
 
-        self.srv.clear()
+        self.srv = {}
 
     def eat(self, buf: bytes, addr: tuple[str, int]) -> None:
         cip = addr[0]
@@ -229,7 +209,7 @@ CONFIGID.UPNP.ORG: 1
 
 """
         v4 = srv.ip.replace("::ffff:", "")
-        zs = zs.format(formatdate(), v4, srv.hport, self.args.zsid)
+        zs = zs.format(formatdate(usegmt=True), v4, srv.hport, self.args.zsid)
         zb = zs[1:].replace("\n", "\r\n").encode("utf-8", "replace")
         srv.sck.sendto(zb, addr[:2])
 

copyparty/star.py

@@ -7,7 +7,6 @@ import tarfile
 
 from queue import Queue
 
-from .authsrv import AuthSrv
 from .bos import bos
 from .sutil import StreamArc, errdesc
 from .util import Daemon, fsenc, min_ex
@@ -45,12 +44,11 @@ class StreamTar(StreamArc):
     def __init__(
         self,
         log: "NamedLogger",
-        asrv: AuthSrv,
         fgen: Generator[dict[str, Any], None, None],
         cmp: str = "",
         **kwargs: Any
     ):
-        super(StreamTar, self).__init__(log, asrv, fgen)
+        super(StreamTar, self).__init__(log, fgen)
 
         self.ci = 0
         self.co = 0
@@ -128,7 +126,7 @@ class StreamTar(StreamArc):
         inf.gid = 0
 
         self.ci += inf.size
-        with open(fsenc(src), "rb", self.args.iobuf) as fo:
+        with open(fsenc(src), "rb", 512 * 1024) as fo:
             self.tar.addfile(inf, fo)
 
     def _gen(self) -> None:
@@ -148,7 +146,7 @@ class StreamTar(StreamArc):
                 errors.append((f["vp"], ex))
 
         if errors:
-            self.errf, txt = errdesc(self.asrv.vfs, errors)
+            self.errf, txt = errdesc(errors)
             self.log("\n".join(([repr(self.errf)] + txt[1:])))
             self.ser(self.errf)
 

copyparty/stolen/dnslib/dns.py

@@ -8,16 +8,10 @@ from itertools import chain
 from .bimap import Bimap, BimapError
 from .bit import get_bits, set_bits
 from .buffer import BufferError
-from .label import DNSBuffer, DNSLabel, set_avahi_379
+from .label import DNSBuffer, DNSLabel
 from .ranges import IP4, IP6, H, I, check_bytes
 
 
-try:
-    range = xrange
-except:
-    pass
-
-
 class DNSError(Exception):
     pass
 
@@ -426,7 +420,7 @@ class RR(object):
             if rdlength:
                 rdata = RDMAP.get(QTYPE.get(rtype), RD).parse(buffer, rdlength)
             else:
-                rdata = RD(b"a")
+                rdata = ""
             return cls(rname, rtype, rclass, ttl, rdata)
         except (BufferError, BimapError) as e:
             raise DNSError("Error unpacking RR [offset=%d]: %s" % (buffer.offset, e))

copyparty/stolen/dnslib/label.py

@@ -11,23 +11,6 @@ LDH = set(range(33, 127))
 ESCAPE = re.compile(r"\\([0-9][0-9][0-9])")
 
 
-avahi_379 = 0
-
-
-def set_avahi_379():
-    global avahi_379
-    avahi_379 = 1
-
-
-def log_avahi_379(args):
-    global avahi_379
-    if avahi_379 == 2:
-        return
-    avahi_379 = 2
-    t = "Invalid pointer in DNSLabel [offset=%d,pointer=%d,length=%d];\n\033[35m  NOTE: this is probably avahi-bug #379, packet corruption in Avahi's mDNS-reflection feature. Copyparty has a workaround and is OK, but other devices need either --zm4 or --zm6"
-    raise BufferError(t % args)
-
-
 class DNSLabelError(Exception):
     pass
 
@@ -113,11 +96,8 @@ class DNSBuffer(Buffer):
                     )
                 if pointer < self.offset:
                     self.offset = pointer
-                elif avahi_379:
-                    log_avahi_379((self.offset, pointer, len(self.data)))
-                    label.extend(b"a")
-                    break
                 else:
+
                     raise BufferError(
                         "Invalid pointer in DNSLabel [offset=%d,pointer=%d,length=%d]"
                         % (self.offset, pointer, len(self.data))

copyparty/stolen/ifaddr/__init__.py

@@ -11,21 +11,7 @@ import os
 
 from ._shared import IP, Adapter
 
-
-def nope(include_unconfigured=False):
-    return []
-
-
-try:
-    S390X = os.uname().machine == "s390x"
-except:
-    S390X = False
-
-
-if os.environ.get("PRTY_NO_IFADDR") or S390X:
-    # s390x deadlocks at libc.getifaddrs
-    get_adapters = nope
-elif os.name == "nt":
+if os.name == "nt":
     from ._win32 import get_adapters
 elif os.name == "posix":
     from ._posix import get_adapters

copyparty/stolen/ifaddr/_shared.py

@@ -17,7 +17,6 @@ if not PY2:
     U: Callable[[str], str] = str
 else:
     U = unicode  # noqa: F821  # pylint: disable=undefined-variable,self-assigning-variable
-    range = xrange  # noqa: F821  # pylint: disable=undefined-variable,self-assigning-variable
 
 
 class Adapter(object):

copyparty/stolen/qrcodegen.py

@@ -16,11 +16,6 @@ if True:  # pylint: disable=using-constant-test
 
     from typing import Callable, List, Optional, Tuple, Union
 
-try:
-    range = xrange
-except:
-    pass
-
 
 def num_char_count_bits(ver: int) -> int:
     return 16 if (ver + 7) // 17 else 8
@@ -594,20 +589,3 @@ def _get_bit(x: int, i: int) -> bool:
 
 class DataTooLongError(ValueError):
     pass
-
-
-def qr2svg(qr: QrCode, border: int) -> str:
-    parts: list[str] = []
-    for y in range(qr.size):
-        sy = border + y
-        for x in range(qr.size):
-            if qr.modules[y][x]:
-                parts.append("M%d,%dh1v1h-1z" % (border + x, sy))
-    t = """\
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 {0} {0}" stroke="none">
-<rect width="100%" height="100%" fill="#F7F7F7"/>
-<path d="{1}" fill="#111111"/>
-</svg>
-"""
-    return t.format(qr.size + border * 2, " ".join(parts))

copyparty/sutil.py

@@ -6,10 +6,9 @@ import tempfile
 from datetime import datetime
 
 from .__init__ import CORES
-from .authsrv import VFS, AuthSrv
 from .bos import bos
 from .th_cli import ThumbCli
-from .util import UTC, vjoin, vol_san
+from .util import UTC, vjoin
 
 if True:  # pylint: disable=using-constant-test
     from typing import Any, Generator, Optional
@@ -17,20 +16,14 @@ if True:  # pylint: disable=using-constant-test
     from .util import NamedLogger
 
 
-TAR_NO_OPUS = set("aac|m4a|mp3|oga|ogg|opus|wma".split("|"))
-
-
 class StreamArc(object):
     def __init__(
         self,
         log: "NamedLogger",
-        asrv: AuthSrv,
         fgen: Generator[dict[str, Any], None, None],
         **kwargs: Any
     ):
         self.log = log
-        self.asrv = asrv
-        self.args = asrv.args
         self.fgen = fgen
         self.stopped = False
 
@@ -85,7 +78,7 @@ def enthumb(
 ) -> dict[str, Any]:
     rem = f["vp"]
     ext = rem.rsplit(".", 1)[-1].lower()
-    if (fmt == "mp3" and ext == "mp3") or (fmt == "opus" and ext in TAR_NO_OPUS):
+    if fmt == "opus" and ext in "aac|m4a|mp3|ogg|opus|wma".split("|"):
         raise Exception()
 
     vp = vjoin(vtop, rem.split("/", 1)[1])
@@ -105,20 +98,15 @@ def enthumb(
     return f
 
 
-def errdesc(
-    vfs: VFS, errors: list[tuple[str, str]]
-) -> tuple[dict[str, Any], list[str]]:
+def errdesc(errors: list[tuple[str, str]]) -> tuple[dict[str, Any], list[str]]:
     report = ["copyparty failed to add the following files to the archive:", ""]
 
     for fn, err in errors:
-        report.extend([" file: %r" % (fn,), "error: %s" % (err,), ""])
-
-    btxt = "\r\n".join(report).encode("utf-8", "replace")
-    btxt = vol_san(list(vfs.all_vols.values()), btxt)
+        report.extend([" file: {}".format(fn), "error: {}".format(err), ""])
 
     with tempfile.NamedTemporaryFile(prefix="copyparty-", delete=False) as tf:
         tf_path = tf.name
-        tf.write(btxt)
+        tf.write("\r\n".join(report).encode("utf-8", "replace"))
 
     dt = datetime.now(UTC).strftime("%Y-%m%d-%H%M%S")
 

copyparty/svchub.py

@@ -2,7 +2,10 @@
 from __future__ import print_function, unicode_literals
 
 import argparse
+import base64
+import calendar
 import errno
+import gzip
 import logging
 import os
 import re
@@ -13,7 +16,7 @@ import string
 import sys
 import threading
 import time
-from datetime import datetime
+from datetime import datetime, timedelta
 
 # from inspect import currentframe
 # print(currentframe().f_lineno)
@@ -25,32 +28,18 @@ if True:  # pylint: disable=using-constant-test
     import typing
     from typing import Any, Optional, Union
 
-from .__init__ import ANYWIN, EXE, MACOS, PY2, TYPE_CHECKING, E, EnvParams, unicode
+from .__init__ import ANYWIN, EXE, MACOS, TYPE_CHECKING, EnvParams, unicode
 from .authsrv import BAD_CFG, AuthSrv
 from .cert import ensure_cert
-from .mtag import HAVE_FFMPEG, HAVE_FFPROBE, HAVE_MUTAGEN
-from .pwhash import HAVE_ARGON2
+from .mtag import HAVE_FFMPEG, HAVE_FFPROBE
 from .tcpsrv import TcpSrv
-from .th_srv import (
-    HAVE_AVIF,
-    HAVE_FFMPEG,
-    HAVE_FFPROBE,
-    HAVE_HEIF,
-    HAVE_PIL,
-    HAVE_VIPS,
-    HAVE_WEBP,
-    ThumbSrv,
-)
+from .th_srv import HAVE_PIL, HAVE_VIPS, HAVE_WEBP, ThumbSrv
 from .up2k import Up2k
 from .util import (
     DEF_EXP,
     DEF_MTE,
     DEF_MTH,
     FFMPEG_URL,
-    HAVE_PSUTIL,
-    HAVE_SQLITE3,
-    HAVE_ZMQ,
-    URL_BUG,
     UTC,
     VERSIONS,
     Daemon,
@@ -60,23 +49,14 @@ from .util import (
     ODict,
     alltrace,
     ansi_re,
-    build_netmap,
-    expat_ver,
-    gzip,
-    load_ipu,
-    lock_file,
     min_ex,
     mp,
     odfusion,
     pybin,
     start_log_thrs,
     start_stackmon,
-    ub64enc,
 )
 
-if HAVE_SQLITE3:
-    import sqlite3
-
 if TYPE_CHECKING:
     try:
         from .mdns import MDNS
@@ -84,13 +64,6 @@ if TYPE_CHECKING:
     except:
         pass
 
-if PY2:
-    range = xrange  # type: ignore
-
-
-VER_SESSION_DB = 1
-VER_SHARES_DB = 2
-
 
 class SvcHub(object):
     """
@@ -115,23 +88,20 @@ class SvcHub(object):
         self.argv = argv
         self.E: EnvParams = args.E
         self.no_ansi = args.no_ansi
-        self.tz = UTC if args.log_utc else None
         self.logf: Optional[typing.TextIO] = None
         self.logf_base_fn = ""
-        self.is_dut = False  # running in unittest; always False
         self.stop_req = False
         self.stopping = False
         self.stopped = False
         self.reload_req = False
-        self.reload_mutex = threading.Lock()
+        self.reloading = False
         self.stop_cond = threading.Condition()
         self.nsigs = 3
         self.retcode = 0
         self.httpsrv_up = 0
 
         self.log_mutex = threading.Lock()
-        self.cday = 0
-        self.cmon = 0
+        self.next_day = 0
         self.tstack = 0.0
 
         self.iphash = HMaccas(os.path.join(self.E.cfg, "iphash"), 8)
@@ -163,7 +133,7 @@ class SvcHub(object):
         if not self._process_config():
             raise Exception(BAD_CFG)
 
-        # for non-http clients (ftp, tftp)
+        # for non-http clients (ftp)
         self.bans: dict[str, int] = {}
         self.gpwd = Garda(self.args.ban_pw)
         self.g404 = Garda(self.args.ban_404)
@@ -184,8 +154,6 @@ class SvcHub(object):
         lg.handlers = [lh]
         lg.setLevel(logging.DEBUG)
 
-        self._check_env()
-
         if args.stackmon:
             start_stackmon(args.stackmon, 0)
 
@@ -194,80 +162,14 @@ class SvcHub(object):
 
         if not args.use_fpool and args.j != 1:
             args.no_fpool = True
-            t = "multithreading enabled with -j {}, so disabling fpool -- this can reduce upload performance on some filesystems, and make some antivirus-softwares "
-            c = 0
-            if ANYWIN:
-                t += "(especially Microsoft Defender) stress your CPU and HDD severely during big uploads"
-                c = 3
-            else:
-                t += "consume more resources (CPU/HDD) than normal"
-            self.log("root", t.format(args.j), c)
+            t = "multithreading enabled with -j {}, so disabling fpool -- this can reduce upload performance on some filesystems"
+            self.log("root", t.format(args.j))
 
         if not args.no_fpool and args.j != 1:
             t = "WARNING: ignoring --use-fpool because multithreading (-j{}) is enabled"
             self.log("root", t.format(args.j), c=3)
             args.no_fpool = True
 
-        for name, arg in (
-            ("iobuf", "iobuf"),
-            ("s-rd-sz", "s_rd_sz"),
-            ("s-wr-sz", "s_wr_sz"),
-        ):
-            zi = getattr(args, arg)
-            if zi < 32768:
-                t = "WARNING: expect very poor performance because you specified a very low value (%d) for --%s"
-                self.log("root", t % (zi, name), 3)
-                zi = 2
-            zi2 = 2 ** (zi - 1).bit_length()
-            if zi != zi2:
-                zi3 = 2 ** ((zi - 1).bit_length() - 1)
-                t = "WARNING: expect poor performance because --%s is not a power-of-two; consider using %d or %d instead of %d"
-                self.log("root", t % (name, zi2, zi3, zi), 3)
-
-        if args.s_rd_sz > args.iobuf:
-            t = "WARNING: --s-rd-sz (%d) is larger than --iobuf (%d); this may lead to reduced performance"
-            self.log("root", t % (args.s_rd_sz, args.iobuf), 3)
-
-        zs = ""
-        if args.th_ram_max < 0.22:
-            zs = "generate thumbnails"
-        elif args.th_ram_max < 1:
-            zs = "generate audio waveforms or spectrograms"
-        if zs:
-            t = "WARNING: --th-ram-max is very small (%.2f GiB); will not be able to %s"
-            self.log("root", t % (args.th_ram_max, zs), 3)
-
-        if args.chpw and args.idp_h_usr:
-            t = "ERROR: user-changeable passwords is incompatible with IdP/identity-providers; you must disable either --chpw or --idp-h-usr"
-            self.log("root", t, 1)
-            raise Exception(t)
-
-        noch = set()
-        for zs in args.chpw_no or []:
-            zsl = [x.strip() for x in zs.split(",")]
-            noch.update([x for x in zsl if x])
-        args.chpw_no = noch
-
-        if args.ipu:
-            iu, nm = load_ipu(self.log, args.ipu, True)
-            setattr(args, "ipu_iu", iu)
-            setattr(args, "ipu_nm", nm)
-
-        for zs in "ah_salt fk_salt dk_salt".split():
-            if getattr(args, "show_%s" % (zs,)):
-                self.log("root", "effective %s is %s" % (zs, getattr(args, zs)))
-
-        if args.ah_cli or args.ah_gen:
-            args.no_ses = True
-            args.shr = ""
-
-        if not self.args.no_ses:
-            self.setup_session_db()
-
-        args.shr1 = ""
-        if args.shr:
-            self.setup_share_db()
-
         bri = "zy"[args.theme % 2 :][:1]
         ch = "abcdefghijklmnopqrstuvwx"[int(args.theme / 2)]
         args.theme = "{0}{1} {0} {1}".format(ch, bri)
@@ -307,8 +209,6 @@ class SvcHub(object):
 
         self.up2k = Up2k(self)
 
-        self._feature_test()
-
         decs = {k: 1 for k in self.args.th_dec.split(",")}
         if not HAVE_VIPS:
             decs.pop("vips", None)
@@ -317,10 +217,6 @@ class SvcHub(object):
         if not HAVE_FFMPEG or not HAVE_FFPROBE:
             decs.pop("ff", None)
 
-        # compressed formats; "s3z=s3m.zip, s3gz=s3m.gz, ..."
-        zlss = [x.strip().lower().split("=", 1) for x in args.au_unpk.split(",")]
-        args.au_unpk = {x[0]: x[1] for x in zlss}
-
         self.args.th_dec = list(decs.keys())
         self.thumbsrv = None
         want_ff = False
@@ -357,13 +253,6 @@ class SvcHub(object):
         if want_ff and ANYWIN:
             self.log("thumb", "download FFmpeg to fix it:\033[0m " + FFMPEG_URL, 3)
 
-        if not args.no_acode:
-            if not re.match("^(0|[qv][0-9]|[0-9]{2,3}k)$", args.q_mp3.lower()):
-                t = "invalid mp3 transcoding quality [%s] specified; only supports [0] to disable, a CBR value such as [192k], or a CQ/CRF value such as [v2]"
-                raise Exception(t % (args.q_mp3,))
-        else:
-            args.au_unpk = {}
-
         args.th_poke = min(args.th_poke, args.th_maxage, args.ac_maxage)
 
         zms = ""
@@ -376,16 +265,9 @@ class SvcHub(object):
             from .ftpd import Ftpd
 
             self.ftpd: Optional[Ftpd] = None
+            Daemon(self.start_ftpd, "start_ftpd")
             zms += "f" if args.ftp else "F"
 
-        if args.tftp:
-            from .tftpd import Tftpd
-
-            self.tftpd: Optional[Tftpd] = None
-
-        if args.ftp or args.ftps or args.tftp:
-            Daemon(self.start_ftpd, "start_tftpd")
-
         if args.smb:
             # impacket.dcerpc is noisy about listen timeouts
             sto = socket.getdefaulttimeout()
@@ -413,241 +295,12 @@ class SvcHub(object):
 
         self.broker = Broker(self)
 
-        # create netmaps early to avoid firewall gaps,
-        # but the mutex blocks multiprocessing startup
-        for zs in "ipu_iu ftp_ipa_nm tftp_ipa_nm".split():
-            try:
-                getattr(args, zs).mutex = threading.Lock()
-            except:
-                pass
-
-    def setup_session_db(self) -> None:
-        if not HAVE_SQLITE3:
-            self.args.no_ses = True
-            t = "WARNING: sqlite3 not available; disabling sessions, will use plaintext passwords in cookies"
-            self.log("root", t, 3)
-            return
-
-        assert sqlite3  # type: ignore  # !rm
-
-        # policy:
-        # the sessions-db is whatever, if something looks broken then just nuke it
-
-        db_path = self.args.ses_db
-        db_lock = db_path + ".lock"
-        try:
-            create = not os.path.getsize(db_path)
-        except:
-            create = True
-        zs = "creating new" if create else "opening"
-        self.log("root", "%s sessions-db %s" % (zs, db_path))
-
-        for tries in range(2):
-            sver = 0
-            try:
-                db = sqlite3.connect(db_path)
-                cur = db.cursor()
-                try:
-                    zs = "select v from kv where k='sver'"
-                    sver = cur.execute(zs).fetchall()[0][0]
-                    if sver > VER_SESSION_DB:
-                        zs = "this version of copyparty only understands session-db v%d and older; the db is v%d"
-                        raise Exception(zs % (VER_SESSION_DB, sver))
-
-                    cur.execute("select count(*) from us").fetchone()
-                except:
-                    if sver:
-                        raise
-                    sver = 1
-                    self._create_session_db(cur)
-                err = self._verify_session_db(cur, sver, db_path)
-                if err:
-                    tries = 99
-                    self.args.no_ses = True
-                    self.log("root", err, 3)
-                break
-
-            except Exception as ex:
-                if tries or sver > VER_SESSION_DB:
-                    raise
-                t = "sessions-db is unusable; deleting and recreating: %r"
-                self.log("root", t % (ex,), 3)
-                try:
-                    cur.close()  # type: ignore
-                except:
-                    pass
-                try:
-                    db.close()  # type: ignore
-                except:
-                    pass
-                try:
-                    os.unlink(db_lock)
-                except:
-                    pass
-                os.unlink(db_path)
-
-    def _create_session_db(self, cur: "sqlite3.Cursor") -> None:
-        sch = [
-            r"create table kv (k text, v int)",
-            r"create table us (un text, si text, t0 int)",
-            # username, session-id, creation-time
-            r"create index us_un on us(un)",
-            r"create index us_si on us(si)",
-            r"create index us_t0 on us(t0)",
-            r"insert into kv values ('sver', 1)",
-        ]
-        for cmd in sch:
-            cur.execute(cmd)
-        self.log("root", "created new sessions-db")
-
-    def _verify_session_db(self, cur: "sqlite3.Cursor", sver: int, db_path: str) -> str:
-        # ensure writable (maybe owned by other user)
-        db = cur.connection
-
-        try:
-            zil = cur.execute("select v from kv where k='pid'").fetchall()
-            if len(zil) > 1:
-                raise Exception()
-            owner = zil[0][0]
-        except:
-            owner = 0
-
-        if not lock_file(db_path + ".lock"):
-            t = "the sessions-db [%s] is already in use by another copyparty instance (pid:%d). This is not supported; please provide another database with --ses-db or give this copyparty-instance its entirely separate config-folder by setting another path in the XDG_CONFIG_HOME env-var. You can also disable this safeguard by setting env-var PRTY_NO_DB_LOCK=1. Will now disable sessions and instead use plaintext passwords in cookies."
-            return t % (db_path, owner)
-
-        vars = (("pid", os.getpid()), ("ts", int(time.time() * 1000)))
-        if owner:
-            # wear-estimate: 2 cells; offsets 0x10, 0x50, 0x19720
-            for k, v in vars:
-                cur.execute("update kv set v=? where k=?", (v, k))
-        else:
-            # wear-estimate: 3~4 cells; offsets 0x10, 0x50, 0x19180, 0x19710, 0x36000, 0x360b0, 0x36b90
-            for k, v in vars:
-                cur.execute("insert into kv values(?, ?)", (k, v))
-
-        if sver < VER_SESSION_DB:
-            cur.execute("delete from kv where k='sver'")
-            cur.execute("insert into kv values('sver',?)", (VER_SESSION_DB,))
-
-        db.commit()
-        cur.close()
-        db.close()
-        return ""
-
-    def setup_share_db(self) -> None:
-        al = self.args
-        if not HAVE_SQLITE3:
-            self.log("root", "sqlite3 not available; disabling --shr", 1)
-            al.shr = ""
-            return
-
-        assert sqlite3  # type: ignore  # !rm
-
-        al.shr = al.shr.strip("/")
-        if "/" in al.shr or not al.shr:
-            t = "config error: --shr must be the name of a virtual toplevel directory to put shares inside"
-            self.log("root", t, 1)
-            raise Exception(t)
-
-        al.shr = "/%s/" % (al.shr,)
-        al.shr1 = al.shr[1:]
-
-        # policy:
-        # the shares-db is important, so panic if something is wrong
-
-        db_path = self.args.shr_db
-        db_lock = db_path + ".lock"
-        try:
-            create = not os.path.getsize(db_path)
-        except:
-            create = True
-        zs = "creating new" if create else "opening"
-        self.log("root", "%s shares-db %s" % (zs, db_path))
-
-        sver = 0
-        try:
-            db = sqlite3.connect(db_path)
-            cur = db.cursor()
-            if not create:
-                zs = "select v from kv where k='sver'"
-                sver = cur.execute(zs).fetchall()[0][0]
-                if sver > VER_SHARES_DB:
-                    zs = "this version of copyparty only understands shares-db v%d and older; the db is v%d"
-                    raise Exception(zs % (VER_SHARES_DB, sver))
-
-                cur.execute("select count(*) from sh").fetchone()
-        except Exception as ex:
-            t = "could not open shares-db; will now panic...\nthe following database must be repaired or deleted before you can launch copyparty:\n%s\n\nERROR: %s\n\nadditional details:\n%s\n"
-            self.log("root", t % (db_path, ex, min_ex()), 1)
-            raise
-
-        try:
-            zil = cur.execute("select v from kv where k='pid'").fetchall()
-            if len(zil) > 1:
-                raise Exception()
-            owner = zil[0][0]
-        except:
-            owner = 0
-
-        if not lock_file(db_lock):
-            t = "the shares-db [%s] is already in use by another copyparty instance (pid:%d). This is not supported; please provide another database with --shr-db or give this copyparty-instance its entirely separate config-folder by setting another path in the XDG_CONFIG_HOME env-var. You can also disable this safeguard by setting env-var PRTY_NO_DB_LOCK=1. Will now panic."
-            t = t % (db_path, owner)
-            self.log("root", t, 1)
-            raise Exception(t)
-
-        sch1 = [
-            r"create table kv (k text, v int)",
-            r"create table sh (k text, pw text, vp text, pr text, st int, un text, t0 int, t1 int)",
-            # sharekey, password, src, perms, numFiles, owner, created, expires
-        ]
-        sch2 = [
-            r"create table sf (k text, vp text)",
-            r"create index sf_k on sf(k)",
-            r"create index sh_k on sh(k)",
-            r"create index sh_t1 on sh(t1)",
-            r"insert into kv values ('sver', 2)",
-        ]
-
-        assert db  # type: ignore  # !rm
-        assert cur  # type: ignore  # !rm
-        if not sver:
-            sver = VER_SHARES_DB
-            for cmd in sch1 + sch2:
-                cur.execute(cmd)
-            self.log("root", "created new shares-db")
-
-        if sver == 1:
-            for cmd in sch2:
-                cur.execute(cmd)
-            cur.execute("update sh set st = 0")
-            self.log("root", "shares-db schema upgrade ok")
-
-        if sver < VER_SHARES_DB:
-            cur.execute("delete from kv where k='sver'")
-            cur.execute("insert into kv values('sver',?)", (VER_SHARES_DB,))
-
-        vars = (("pid", os.getpid()), ("ts", int(time.time() * 1000)))
-        if owner:
-            # wear-estimate: same as sessions-db
-            for k, v in vars:
-                cur.execute("update kv set v=? where k=?", (v, k))
-        else:
-            for k, v in vars:
-                cur.execute("insert into kv values(?, ?)", (k, v))
-
-        db.commit()
-        cur.close()
-        db.close()
-
     def start_ftpd(self) -> None:
         time.sleep(30)
+        if self.ftpd:
+            return
 
-        if hasattr(self, "ftpd") and not self.ftpd:
-            self.restart_ftpd()
-
-        if hasattr(self, "tftpd") and not self.tftpd:
-            self.restart_tftpd()
+        self.restart_ftpd()
 
     def restart_ftpd(self) -> None:
         if not hasattr(self, "ftpd"):
@@ -664,17 +317,6 @@ class SvcHub(object):
         self.ftpd = Ftpd(self)
         self.log("root", "started FTPd")
 
-    def restart_tftpd(self) -> None:
-        if not hasattr(self, "tftpd"):
-            return
-
-        from .tftpd import Tftpd
-
-        if self.tftpd:
-            return  # todo
-
-        self.tftpd = Tftpd(self)
-
     def thr_httpsrv_up(self) -> None:
         time.sleep(1 if self.args.ign_ebind_all else 5)
         expected = self.broker.num_workers * self.tcpsrv.nsrv
@@ -699,7 +341,7 @@ class SvcHub(object):
         self.sigterm()
 
     def sigterm(self) -> None:
-        self.signal_handler(signal.SIGTERM, None)
+        os.kill(os.getpid(), signal.SIGTERM)
 
     def cb_httpsrv_up(self) -> None:
         self.httpsrv_up += 1
@@ -724,101 +366,6 @@ class SvcHub(object):
 
         Daemon(self.sd_notify, "sd-notify")
 
-    def _feature_test(self) -> None:
-        fok = []
-        fng = []
-        t_ff = "transcode audio, create spectrograms, video thumbnails"
-        to_check = [
-            (HAVE_SQLITE3, "sqlite", "sessions and file/media indexing"),
-            (HAVE_PIL, "pillow", "image thumbnails (plenty fast)"),
-            (HAVE_VIPS, "vips", "image thumbnails (faster, eats more ram)"),
-            (HAVE_WEBP, "pillow-webp", "create thumbnails as webp files"),
-            (HAVE_FFMPEG, "ffmpeg", t_ff + ", good-but-slow image thumbnails"),
-            (HAVE_FFPROBE, "ffprobe", t_ff + ", read audio/media tags"),
-            (HAVE_MUTAGEN, "mutagen", "read audio tags (ffprobe is better but slower)"),
-            (HAVE_ARGON2, "argon2", "secure password hashing (advanced users only)"),
-            (HAVE_ZMQ, "pyzmq", "send zeromq messages from event-hooks"),
-            (HAVE_HEIF, "pillow-heif", "read .heif images with pillow (rarely useful)"),
-            (HAVE_AVIF, "pillow-avif", "read .avif images with pillow (rarely useful)"),
-        ]
-        if ANYWIN:
-            to_check += [
-                (HAVE_PSUTIL, "psutil", "improved plugin cleanup  (rarely useful)")
-            ]
-
-        verbose = self.args.deps
-        if verbose:
-            self.log("dependencies", "")
-
-        for have, feat, what in to_check:
-            lst = fok if have else fng
-            lst.append((feat, what))
-            if verbose:
-                zi = 2 if have else 5
-                sgot = "found" if have else "missing"
-                t = "%7s: %s \033[36m(%s)"
-                self.log("dependencies", t % (sgot, feat, what), zi)
-
-        if verbose:
-            self.log("dependencies", "")
-            return
-
-        sok = ", ".join(x[0] for x in fok)
-        sng = ", ".join(x[0] for x in fng)
-
-        t = ""
-        if sok:
-            t += "OK: \033[32m" + sok
-        if sng:
-            if t:
-                t += ", "
-            t += "\033[0mNG: \033[35m" + sng
-
-        t += "\033[0m, see --deps (this is fine btw)"
-        self.log("optional-dependencies", t, 6)
-
-    def _check_env(self) -> None:
-        al = self.args
-        try:
-            files = os.listdir(E.cfg)
-        except:
-            files = []
-
-        hits = [x for x in files if x.lower().endswith(".conf")]
-        if hits:
-            t = "WARNING: found config files in [%s]: %s\n  config files are not expected here, and will NOT be loaded (unless your setup is intentionally hella funky)"
-            self.log("root", t % (E.cfg, ", ".join(hits)), 3)
-
-        if self.args.no_bauth:
-            t = "WARNING: --no-bauth disables support for the Android app; you may want to use --bauth-last instead"
-            self.log("root", t, 3)
-            if self.args.bauth_last:
-                self.log("root", "WARNING: ignoring --bauth-last due to --no-bauth", 3)
-
-        have_tcp = False
-        for zs in al.i:
-            if not zs.startswith("unix:"):
-                have_tcp = True
-        if not have_tcp:
-            zb = False
-            zs = "z zm zm4 zm6 zmv zmvv zs zsv zv"
-            for zs in zs.split():
-                if getattr(al, zs, False):
-                    setattr(al, zs, False)
-                    zb = True
-            if zb:
-                t = "only listening on unix-sockets; cannot enable zeroconf/mdns/ssdp as requested"
-                self.log("root", t, 3)
-
-        if not self.args.no_dav:
-            from .dxml import DXML_OK
-
-            if not DXML_OK:
-                if not self.args.no_dav:
-                    self.args.no_dav = True
-                    t = "WARNING:\nDisabling WebDAV support because dxml selftest failed. Please report this bug;\n%s\n...and include the following information in the bug-report:\n%s | expat %s\n"
-                    self.log("root", t % (URL_BUG, VERSIONS, expat_ver()), 1)
-
     def _process_config(self) -> bool:
         al = self.args
 
@@ -861,10 +408,8 @@ class SvcHub(object):
         zsl = al.th_covers.split(",")
         zsl = [x.strip() for x in zsl]
         zsl = [x for x in zsl if x]
-        al.th_covers = zsl
-        al.th_coversd = zsl + ["." + x for x in zsl]
-        al.th_covers_set = set(al.th_covers)
-        al.th_coversd_set = set(al.th_coversd)
+        al.th_covers = set(zsl)
+        al.th_coversd = set(zsl + ["." + x for x in zsl])
 
         for k in "c".split(" "):
             vl = getattr(al, k)
@@ -874,27 +419,19 @@ class SvcHub(object):
             vl = [os.path.expandvars(os.path.expanduser(x)) for x in vl]
             setattr(al, k, vl)
 
-        for k in "lo hist dbpath ssl_log".split(" "):
+        for k in "lo hist ssl_log".split(" "):
             vs = getattr(al, k)
             if vs:
                 vs = os.path.expandvars(os.path.expanduser(vs))
                 setattr(al, k, vs)
 
-        zs = "dav_ua1 sus_urls nonsus_urls ua_nodoc ua_nozip"
-        for k in zs.split(" "):
+        for k in "sus_urls nonsus_urls".split(" "):
             vs = getattr(al, k)
             if not vs or vs == "no":
                 setattr(al, k, None)
             else:
                 setattr(al, k, re.compile(vs))
 
-        for k in "tftp_lsf".split(" "):
-            vs = getattr(al, k)
-            if not vs or vs == "no":
-                setattr(al, k, None)
-            else:
-                setattr(al, k, re.compile("^" + vs + "$"))
-
         if not al.sus_urls:
             al.ban_url = "no"
         elif al.ban_url == "no":
@@ -902,11 +439,11 @@ class SvcHub(object):
 
         al.xff_hdr = al.xff_hdr.lower()
         al.idp_h_usr = al.idp_h_usr.lower()
-        al.idp_h_grp = al.idp_h_grp.lower()
-        al.idp_h_key = al.idp_h_key.lower()
+        # al.idp_h_grp = al.idp_h_grp.lower()
 
-        al.ftp_ipa_nm = build_netmap(al.ftp_ipa or al.ipa, True)
-        al.tftp_ipa_nm = build_netmap(al.tftp_ipa or al.ipa, True)
+        al.xff_re = self._ipa2re(al.xff_src)
+        al.ipa_re = self._ipa2re(al.ipa)
+        al.ftp_ipa_re = self._ipa2re(al.ftp_ipa or al.ipa)
 
         mte = ODict.fromkeys(DEF_MTE.split(","), True)
         al.mte = odfusion(mte, al.mte)
@@ -918,59 +455,11 @@ class SvcHub(object):
         al.exp_md = odfusion(exp, al.exp_md.replace(" ", ","))
         al.exp_lg = odfusion(exp, al.exp_lg.replace(" ", ","))
 
-        for k in ["no_hash", "no_idx", "og_ua", "srch_excl"]:
+        for k in ["no_hash", "no_idx"]:
             ptn = getattr(self.args, k)
             if ptn:
                 setattr(self.args, k, re.compile(ptn))
 
-        for k in ["idp_gsep"]:
-            ptn = getattr(self.args, k)
-            if "]" in ptn:
-                ptn = "]" + ptn.replace("]", "")
-            if "[" in ptn:
-                ptn = ptn.replace("[", "") + "["
-            if "-" in ptn:
-                ptn = ptn.replace("-", "") + "-"
-
-            ptn = ptn.replace("\\", "\\\\").replace("^", "\\^")
-            setattr(self.args, k, re.compile("[%s]" % (ptn,)))
-
-        try:
-            zf1, zf2 = self.args.rm_retry.split("/")
-            self.args.rm_re_t = float(zf1)
-            self.args.rm_re_r = float(zf2)
-        except:
-            raise Exception("invalid --rm-retry [%s]" % (self.args.rm_retry,))
-
-        try:
-            zf1, zf2 = self.args.mv_retry.split("/")
-            self.args.mv_re_t = float(zf1)
-            self.args.mv_re_r = float(zf2)
-        except:
-            raise Exception("invalid --mv-retry [%s]" % (self.args.mv_retry,))
-
-        al.tcolor = al.tcolor.lstrip("#")
-        if len(al.tcolor) == 3:  # fc5 => ffcc55
-            al.tcolor = "".join([x * 2 for x in al.tcolor])
-
-        zs = al.u2sz
-        zsl = zs.split(",")
-        if len(zsl) not in (1, 3):
-            t = "invalid --u2sz; must be either one number, or a comma-separated list of three numbers (min,default,max)"
-            raise Exception(t)
-        if len(zsl) < 3:
-            zsl = ["1", zs, zs]
-        zi2 = 1
-        for zs in zsl:
-            zi = int(zs)
-            # arbitrary constraint (anything above 2 GiB is probably unintended)
-            if zi < 1 or zi > 2047:
-                raise Exception("invalid --u2sz; minimum is 1, max is 2047")
-            if zi < zi2:
-                raise Exception("invalid --u2sz; values must be equal or ascending")
-            zi2 = zi
-        al.u2sz = ",".join(zsl)
-
         return True
 
     def _ipa2re(self, txt) -> Optional[re.Pattern]:
@@ -1021,7 +510,7 @@ class SvcHub(object):
             self.args.nc = min(self.args.nc, soft // 2)
 
     def _logname(self) -> str:
-        dt = datetime.now(self.tz)
+        dt = datetime.now(UTC)
         fn = str(self.args.lo)
         for fs in "YmdHMS":
             fs = "%" + fs
@@ -1138,23 +627,22 @@ class SvcHub(object):
             except:
                 self.log("root", "ssdp startup failed;\n" + min_ex(), 3)
 
-    def reload(self, rescan_all_vols: bool, up2k: bool) -> str:
-        t = "config has been reloaded"
-        with self.reload_mutex:
-            self.log("root", "reloading config")
-            self.asrv.reload(9 if up2k else 4)
-            if up2k:
-                self.up2k.reload(rescan_all_vols)
-                t += "; volumes are now reinitializing"
-            else:
-                self.log("root", "reload done")
-            self.broker.reload()
-        return t
+    def reload(self) -> str:
+        if self.reloading:
+            return "cannot reload; already in progress"
 
-    def _reload_sessions(self) -> None:
-        with self.asrv.mutex:
-            self.asrv.load_sessions(True)
-        self.broker.reload_sessions()
+        self.reloading = True
+        Daemon(self._reload, "reloading")
+        return "reload initiated"
+
+    def _reload(self) -> None:
+        self.log("root", "reload scheduled")
+        with self.up2k.mutex:
+            self.asrv.reload()
+            self.up2k.reload()
+            self.broker.reload()
+
+        self.reloading = False
 
     def stop_thr(self) -> None:
         while not self.stop_req:
@@ -1163,7 +651,7 @@ class SvcHub(object):
 
             if self.reload_req:
                 self.reload_req = False
-                self.reload(True, True)
+                self.reload()
 
         self.shutdown()
 
@@ -1276,12 +764,12 @@ class SvcHub(object):
             return
 
         with self.log_mutex:
-            dt = datetime.now(self.tz)
+            zd = datetime.now(UTC)
             ts = self.log_dfmt % (
-                dt.year,
-                dt.month * 100 + dt.day,
-                (dt.hour * 100 + dt.minute) * 100 + dt.second,
-                dt.microsecond // self.log_div,
+                zd.year,
+                zd.month * 100 + zd.day,
+                (zd.hour * 100 + zd.minute) * 100 + zd.second,
+                zd.microsecond // self.log_div,
             )
 
             if c and not self.args.no_ansi:
@@ -1302,26 +790,41 @@ class SvcHub(object):
             if not self.args.no_logflush:
                 self.logf.flush()
 
-            if dt.day != self.cday or dt.month != self.cmon:
-                self._set_next_day(dt)
+            now = time.time()
+            if int(now) >= self.next_day:
+                self._set_next_day()
 
-    def _set_next_day(self, dt: datetime) -> None:
-        if self.cday and self.logf and self.logf_base_fn != self._logname():
+    def _set_next_day(self) -> None:
+        if self.next_day and self.logf and self.logf_base_fn != self._logname():
             self.logf.close()
             self._setup_logfile("")
 
-        self.cday = dt.day
-        self.cmon = dt.month
+        dt = datetime.now(UTC)
+
+        # 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)
+        try:
+            tt = dt.utctimetuple()
+        except:
+            # still makes me hella uncomfortable
+            tt = dt.timetuple()
+
+        self.next_day = calendar.timegm(tt)
 
     def _log_enabled(self, src: str, msg: str, c: Union[int, str] = 0) -> None:
         """handles logging from all components"""
         with self.log_mutex:
-            dt = datetime.now(self.tz)
-            if dt.day != self.cday or dt.month != self.cmon:
+            now = time.time()
+            if int(now) >= self.next_day:
+                dt = datetime.fromtimestamp(now, UTC)
                 zs = "{}\n" if self.no_ansi else "\033[36m{}\033[0m\n"
                 zs = zs.format(dt.strftime("%Y-%m-%d"))
                 print(zs, end="")
-                self._set_next_day(dt)
+                self._set_next_day()
                 if self.logf:
                     self.logf.write(zs)
 
@@ -1340,11 +843,12 @@ class SvcHub(object):
                 else:
                     msg = "%s%s\033[0m" % (c, msg)
 
+            zd = datetime.fromtimestamp(now, UTC)
             ts = self.log_efmt % (
-                dt.hour,
-                dt.minute,
-                dt.second,
-                dt.microsecond // self.log_div,
+                zd.hour,
+                zd.minute,
+                zd.second,
+                zd.microsecond // self.log_div,
             )
             msg = fmt % (ts, src, msg)
             try:
@@ -1372,7 +876,7 @@ class SvcHub(object):
                 raise
 
     def check_mp_support(self) -> str:
-        if MACOS and not os.environ.get("PRTY_FORCE_MP"):
+        if MACOS:
             return "multiprocessing is wonky on mac osx;"
         elif sys.version_info < (3, 3):
             return "need python 3.3 or newer for multiprocessing;"
@@ -1392,7 +896,7 @@ class SvcHub(object):
             return False
 
         try:
-            if mp.cpu_count() <= 1 and not os.environ.get("PRTY_FORCE_MP"):
+            if mp.cpu_count() <= 1:
                 raise Exception()
         except:
             self.log("svchub", "only one CPU detected; multiprocessing disabled")
@@ -1442,5 +946,5 @@ class SvcHub(object):
         zs = "{}\n{}".format(VERSIONS, alltrace())
         zb = zs.encode("utf-8", "replace")
         zb = gzip.compress(zb)
-        zs = ub64enc(zb).decode("ascii")
+        zs = base64.b64encode(zb).decode("ascii")
         self.log("stacks", zs)

copyparty/szip.py

@@ -4,11 +4,11 @@ from __future__ import print_function, unicode_literals
 import calendar
 import stat
 import time
+import zlib
 
-from .authsrv import AuthSrv
 from .bos import bos
 from .sutil import StreamArc, errdesc
-from .util import min_ex, sanitize_fn, spack, sunpack, yieldfile, zlib
+from .util import min_ex, sanitize_fn, spack, sunpack, yieldfile
 
 if True:  # pylint: disable=using-constant-test
     from typing import Any, Generator, Optional
@@ -36,7 +36,9 @@ def dostime2unix(buf: bytes) -> int:
 
 
 def unixtime2dos(ts: int) -> bytes:
-    dy, dm, dd, th, tm, ts, _, _, _ = time.gmtime(ts + 1)
+    tt = time.gmtime(ts + 1)
+    dy, dm, dd, th, tm, ts = list(tt)[:6]
+
     bd = ((dy - 1980) << 9) + (dm << 5) + dd
     bt = (th << 11) + (tm << 5) + ts // 2
     try:
@@ -54,7 +56,6 @@ def gen_fdesc(sz: int, crc32: int, z64: bool) -> bytes:
 
 def gen_hdr(
     h_pos: Optional[int],
-    z64: bool,
     fn: str,
     sz: int,
     lastmod: int,
@@ -71,6 +72,7 @@ def gen_hdr(
     # appnote 4.5 / zip 3.0 (2008) / unzip 6.0 (2009) says to add z64
     # extinfo for values which exceed H, but that becomes an off-by-one
     # (can't tell if it was clamped or exactly maxval), make it obvious
+    z64 = sz >= 0xFFFFFFFF
     z64v = [sz, sz] if z64 else []
     if h_pos and h_pos >= 0xFFFFFFFF:
         # central, also consider ptr to original header
@@ -99,12 +101,12 @@ def gen_hdr(
 
     # spec says to put zeros when !crc if bit3 (streaming)
     # however infozip does actual sz and it even works on winxp
-    # (same reasoning for z64 extradata later)
+    # (same reasning for z64 extradata later)
     vsz = 0xFFFFFFFF if z64 else sz
     ret += spack(b"<LL", vsz, vsz)
 
     # windows support (the "?" replace below too)
-    fn = sanitize_fn(fn, "/")
+    fn = sanitize_fn(fn, "/", [])
     bfn = fn.encode("utf-8" if utf8 else "cp437", "replace").replace(b"?", b"_")
 
     # add ntfs (0x24) and/or unix (0x10) extrafields for utc, add z64 if requested
@@ -216,13 +218,12 @@ class StreamZip(StreamArc):
     def __init__(
         self,
         log: "NamedLogger",
-        asrv: AuthSrv,
         fgen: Generator[dict[str, Any], None, None],
         utf8: bool = False,
         pre_crc: bool = False,
         **kwargs: Any
     ) -> None:
-        super(StreamZip, self).__init__(log, asrv, fgen)
+        super(StreamZip, self).__init__(log, fgen)
 
         self.utf8 = utf8
         self.pre_crc = pre_crc
@@ -244,24 +245,19 @@ class StreamZip(StreamArc):
 
         sz = st.st_size
         ts = st.st_mtime
-        h_pos = self.pos
 
         crc = 0
         if self.pre_crc:
-            for buf in yieldfile(src, self.args.iobuf):
+            for buf in yieldfile(src):
                 crc = zlib.crc32(buf, crc)
 
             crc &= 0xFFFFFFFF
 
-        # some unzip-programs expect a 64bit data-descriptor
-        # even if the only 32bit-exceeding value is the offset,
-        # so force that by placeholdering the filesize too
-        z64 = h_pos >= 0xFFFFFFFF or sz >= 0xFFFFFFFF
-
-        buf = gen_hdr(None, z64, name, sz, ts, self.utf8, crc, self.pre_crc)
+        h_pos = self.pos
+        buf = gen_hdr(None, name, sz, ts, self.utf8, crc, self.pre_crc)
         yield self._ct(buf)
 
-        for buf in yieldfile(src, self.args.iobuf):
+        for buf in yieldfile(src):
             if not self.pre_crc:
                 crc = zlib.crc32(buf, crc)
 
@@ -271,6 +267,8 @@ class StreamZip(StreamArc):
 
         self.items.append((name, sz, ts, crc, h_pos))
 
+        z64 = sz >= 4 * 1024 * 1024 * 1024
+
         if z64 or not self.pre_crc:
             buf = gen_fdesc(sz, crc, z64)
             yield self._ct(buf)
@@ -302,15 +300,14 @@ class StreamZip(StreamArc):
                 mbuf = b""
 
             if errors:
-                errf, txt = errdesc(self.asrv.vfs, errors)
+                errf, txt = errdesc(errors)
                 self.log("\n".join(([repr(errf)] + txt[1:])))
                 for x in self.ser(errf):
                     yield x
 
             cdir_pos = self.pos
             for name, sz, ts, crc, h_pos in self.items:
-                z64 = h_pos >= 0xFFFFFFFF or sz >= 0xFFFFFFFF
-                buf = gen_hdr(h_pos, z64, name, sz, ts, self.utf8, crc, self.pre_crc)
+                buf = gen_hdr(h_pos, name, sz, ts, self.utf8, crc, self.pre_crc)
                 mbuf += self._ct(buf)
                 if len(mbuf) >= 16384:
                     yield mbuf

copyparty/tcpsrv.py

@@ -15,25 +15,19 @@ from .util import (
     E_ADDR_IN_USE,
     E_ADDR_NOT_AVAIL,
     E_UNREACH,
-    HAVE_IPV6,
     IP6ALL,
-    VF_CAREFUL,
     Netdev,
-    atomic_move,
     min_ex,
     sunpack,
     termsize,
 )
 
 if True:
-    from typing import Generator, Union
+    from typing import Generator
 
 if TYPE_CHECKING:
     from .svchub import SvcHub
 
-if not hasattr(socket, "AF_UNIX"):
-    setattr(socket, "AF_UNIX", -9001)
-
 if not hasattr(socket, "IPPROTO_IPV6"):
     setattr(socket, "IPPROTO_IPV6", 41)
 
@@ -95,7 +89,7 @@ class TcpSrv(object):
                                 continue
 
                             # binding 0.0.0.0 after :: fails on dualstack
-                            # but is necessary on non-dualstack
+                            # but is necessary on non-dualstakc
                             if successful_binds:
                                 continue
 
@@ -117,10 +111,8 @@ class TcpSrv(object):
 
         eps = {
             "127.0.0.1": Netdev("127.0.0.1", 0, "", "local only"),
+            "::1": Netdev("::1", 0, "", "local only"),
         }
-        if HAVE_IPV6:
-            eps["::1"] = Netdev("::1", 0, "", "local only")
-
         nonlocals = [x for x in self.args.i if x not in [k.split("/")[0] for k in eps]]
         if nonlocals:
             try:
@@ -151,15 +143,9 @@ class TcpSrv(object):
             if just_ll or self.args.ll:
                 ll_ok.add(ip.split("/")[0])
 
-        listening_on = []
-        for ip, ports in sorted(ok.items()):
-            for port in sorted(ports):
-                listening_on.append("%s %s" % (ip, port))
-
         qr1: dict[str, list[int]] = {}
         qr2: dict[str, list[int]] = {}
         msgs = []
-        accessible_on = []
         title_tab: dict[str, dict[str, int]] = {}
         title_vars = [x[1:] for x in self.args.wintitle.split(" ") if x.startswith("$")]
         t = "available @ {}://{}:{}/  (\033[33m{}\033[0m)"
@@ -175,10 +161,6 @@ class TcpSrv(object):
                 ):
                     continue
 
-                zs = "%s %s" % (ip, port)
-                if zs not in accessible_on:
-                    accessible_on.append(zs)
-
                 proto = " http"
                 if self.args.http_only:
                     pass
@@ -229,52 +211,17 @@ class TcpSrv(object):
         else:
             print("\n", end="")
 
-        for fn, ls in (
-            (self.args.wr_h_eps, listening_on),
-            (self.args.wr_h_aon, accessible_on),
-        ):
-            if fn:
-                with open(fn, "wb") as f:
-                    f.write(("\n".join(ls)).encode("utf-8"))
-
         if self.args.qr or self.args.qrs:
             self.qr = self._qr(qr1, qr2)
 
-    def nlog(self, msg: str, c: Union[int, str] = 0) -> None:
-        self.log("tcpsrv", msg, c)
-
     def _listen(self, ip: str, port: int) -> None:
-        uds_perm = uds_gid = -1
-        if "unix:" in ip:
-            tcp = False
-            ipv = socket.AF_UNIX
-            uds = ip.split(":")
-            ip = uds[-1]
-            if len(uds) > 2:
-                uds_perm = int(uds[1], 8)
-            if len(uds) > 3:
-                try:
-                    uds_gid = int(uds[2])
-                except:
-                    import grp
-
-                    uds_gid = grp.getgrnam(uds[2]).gr_gid
-
-        elif ":" in ip:
-            tcp = True
-            ipv = socket.AF_INET6
-        else:
-            tcp = True
-            ipv = socket.AF_INET
-
+        ipv = socket.AF_INET6 if ":" in ip else socket.AF_INET
         srv = socket.socket(ipv, socket.SOCK_STREAM)
 
         if not ANYWIN or self.args.reuseaddr:
             srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
-        if tcp:
-            srv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-
+        srv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         srv.settimeout(None)  # < does not inherit, ^ opts above do
 
         try:
@@ -286,25 +233,8 @@ class TcpSrv(object):
             srv.setsockopt(socket.SOL_IP, socket.IP_FREEBIND, 1)
 
         try:
-            if tcp:
-                srv.bind((ip, port))
-            else:
-                if ANYWIN or self.args.rm_sck:
-                    if os.path.exists(ip):
-                        os.unlink(ip)
-                    srv.bind(ip)
-                else:
-                    tf = "%s.%d" % (ip, os.getpid())
-                    if os.path.exists(tf):
-                        os.unlink(tf)
-                    srv.bind(tf)
-                    if uds_gid != -1:
-                        os.chown(tf, -1, uds_gid)
-                    if uds_perm != -1:
-                        os.chmod(tf, uds_perm)
-                    atomic_move(self.nlog, tf, ip, VF_CAREFUL)
-
-            sport = srv.getsockname()[1] if tcp else port
+            srv.bind((ip, port))
+            sport = srv.getsockname()[1]
             if port != sport:
                 # linux 6.0.16 lets you bind a port which is in use
                 # except it just gives you a random port instead
@@ -316,23 +246,12 @@ class TcpSrv(object):
             except:
                 pass
 
-            e = ""
             if ex.errno in E_ADDR_IN_USE:
                 e = "\033[1;31mport {} is busy on interface {}\033[0m".format(port, ip)
-                if not tcp:
-                    e = "\033[1;31munix-socket {} is busy\033[0m".format(ip)
             elif ex.errno in E_ADDR_NOT_AVAIL:
                 e = "\033[1;31minterface {} does not exist\033[0m".format(ip)
-
-            if not e:
-                if not tcp:
-                    t = "\n\n\n  NOTE: this crash may be due to a unix-socket bug; try --rm-sck\n"
-                    self.log("tcpsrv", t, 2)
+            else:
                 raise
-
-            if not tcp and not self.args.rm_sck:
-                e += "; maybe this is a bug? try --rm-sck"
-
             raise Exception(e)
 
     def run(self) -> None:
@@ -340,14 +259,7 @@ class TcpSrv(object):
         bound: list[tuple[str, int]] = []
         srvs: list[socket.socket] = []
         for srv in self.srv:
-            if srv.family == socket.AF_UNIX:
-                tcp = False
-                ip = re.sub(r"\.[0-9]+$", "", srv.getsockname())
-                port = 0
-            else:
-                tcp = True
-                ip, port = srv.getsockname()[:2]
-
+            ip, port = srv.getsockname()[:2]
             if ip == IP6ALL:
                 ip = "::"  # jython
 
@@ -379,17 +291,13 @@ class TcpSrv(object):
             bound.append((ip, port))
             srvs.append(srv)
             fno = srv.fileno()
-            if tcp:
-                hip = "[{}]".format(ip) if ":" in ip else ip
-                msg = "listening @ {}:{}  f{} p{}".format(hip, port, fno, os.getpid())
-            else:
-                msg = "listening @ {}  f{} p{}".format(ip, fno, os.getpid())
-
+            hip = "[{}]".format(ip) if ":" in ip else ip
+            msg = "listening @ {}:{}  f{} p{}".format(hip, port, fno, os.getpid())
             self.log("tcpsrv", msg)
             if self.args.q:
                 print(msg)
 
-            self.hub.broker.say("httpsrv.listen", srv)
+            self.hub.broker.say("listen", srv)
 
         self.srv = srvs
         self.bound = bound
@@ -397,11 +305,10 @@ class TcpSrv(object):
         self._distribute_netdevs()
 
     def _distribute_netdevs(self):
-        self.hub.broker.say("httpsrv.set_netdevs", self.netdevs)
+        self.hub.broker.say("set_netdevs", self.netdevs)
         self.hub.start_zeroconf()
         gencert(self.log, self.args, self.netdevs)
         self.hub.restart_ftpd()
-        self.hub.restart_tftpd()
 
     def shutdown(self) -> None:
         self.stopping = True
@@ -420,25 +327,23 @@ class TcpSrv(object):
             if not netdevs:
                 continue
 
-            add = []
-            rem = []
+            added = "nothing"
+            removed = "nothing"
             for k, v in netdevs.items():
                 if k not in self.netdevs:
-                    add.append("\n\033[32m  added %s = %s" % (k, v))
+                    added = "{} = {}".format(k, v)
             for k, v in self.netdevs.items():
                 if k not in netdevs:
-                    rem.append("\n\033[33mremoved %s = %s" % (k, v))
+                    removed = "{} = {}".format(k, v)
 
-            t = "network change detected:%s%s"
-            self.log("tcpsrv", t % ("".join(add), "".join(rem)), 3)
+            t = "network change detected:\n  added {}\033[0;33m\nremoved {}"
+            self.log("tcpsrv", t.format(added, removed), 3)
             self.netdevs = netdevs
             self._distribute_netdevs()
 
     def detect_interfaces(self, listen_ips: list[str]) -> dict[str, Netdev]:
         from .stolen.ifaddr import get_adapters
 
-        listen_ips = [x for x in listen_ips if "unix:" not in x]
-
         nics = get_adapters(True)
         eps: dict[str, Netdev] = {}
         for nic in nics:
@@ -557,16 +462,10 @@ class TcpSrv(object):
         sys.stderr.flush()
 
     def _qr(self, t1: dict[str, list[int]], t2: dict[str, list[int]]) -> str:
-        t2c = {zs: zli for zs, zli in t2.items() if zs in ("127.0.0.1", "::1")}
-        t2b = {zs: zli for zs, zli in t2.items() if ":" in zs and zs not in t2c}
-        t2 = {zs: zli for zs, zli in t2.items() if zs not in t2b and zs not in t2c}
-        t2.update(t2b)  # first ipv4, then ipv6...
-        t2.update(t2c)  # ...and finally localhost
-
         ip = None
         ips = list(t1) + list(t2)
         qri = self.args.qri
-        if self.args.zm and not qri and ips:
+        if self.args.zm and not qri:
             name = self.args.name + ".local"
             t1[name] = next(v for v in (t1 or t2).values())
             ips = [name] + ips

copyparty/tftpd.py

@@ -1,478 +0,0 @@
-# coding: utf-8
-from __future__ import print_function, unicode_literals
-
-try:
-    from types import SimpleNamespace
-except:
-
-    class SimpleNamespace(object):
-        def __init__(self, **attr):
-            self.__dict__.update(attr)
-
-
-import logging
-import os
-import re
-import socket
-import stat
-import threading
-import time
-from datetime import datetime
-
-try:
-    import inspect
-except:
-    pass
-
-from partftpy import (
-    TftpContexts,
-    TftpPacketFactory,
-    TftpPacketTypes,
-    TftpServer,
-    TftpStates,
-)
-from partftpy.TftpShared import TftpException
-
-from .__init__ import EXE, PY2, TYPE_CHECKING
-from .authsrv import VFS
-from .bos import bos
-from .util import (
-    FN_EMB,
-    UTC,
-    BytesIO,
-    Daemon,
-    ODict,
-    exclude_dotfiles,
-    min_ex,
-    runhook,
-    undot,
-    vjoin,
-    vsplit,
-)
-
-if True:  # pylint: disable=using-constant-test
-    from typing import Any, Union
-
-if TYPE_CHECKING:
-    from .svchub import SvcHub
-
-if PY2:
-    range = xrange  # type: ignore
-
-
-lg = logging.getLogger("tftp")
-debug, info, warning, error = (lg.debug, lg.info, lg.warning, lg.error)
-
-
-def noop(*a, **ka) -> None:
-    pass
-
-
-def _serverInitial(self, pkt: Any, raddress: str, rport: int) -> bool:
-    info("connection from %s:%s", raddress, rport)
-    ret = _sinitial[0](self, pkt, raddress, rport)
-    nm = _hub[0].args.tftp_ipa_nm
-    if nm and not nm.map(raddress):
-        yeet("client rejected (--tftp-ipa): %s" % (raddress,))
-    return ret
-
-
-# patch ipa-check into partftpd (part 1/2)
-_hub: list["SvcHub"] = []
-_sinitial: list[Any] = []
-
-
-class Tftpd(object):
-    def __init__(self, hub: "SvcHub") -> None:
-        self.hub = hub
-        self.args = hub.args
-        self.asrv = hub.asrv
-        self.log = hub.log
-        self.mutex = threading.Lock()
-
-        _hub[:] = []
-        _hub.append(hub)
-
-        lg.setLevel(logging.DEBUG if self.args.tftpv else logging.INFO)
-        for x in ["partftpy", "partftpy.TftpStates", "partftpy.TftpServer"]:
-            lgr = logging.getLogger(x)
-            lgr.setLevel(logging.DEBUG if self.args.tftpv else logging.INFO)
-
-        if not self.args.tftpv and not self.args.tftpvv:
-            # contexts -> states -> packettypes -> shared
-            # contexts -> packetfactory
-            # packetfactory -> packettypes
-            Cs = [
-                TftpPacketTypes,
-                TftpPacketFactory,
-                TftpStates,
-                TftpContexts,
-                TftpServer,
-            ]
-            cbak = []
-            if not self.args.tftp_no_fast and not EXE and not PY2:
-                try:
-                    ptn = re.compile(r"(^\s*)log\.debug\(.*\)$")
-                    for C in Cs:
-                        cbak.append(C.__dict__)
-                        src1 = inspect.getsource(C).split("\n")
-                        src2 = "\n".join([ptn.sub("\\1pass", ln) for ln in src1])
-                        cfn = C.__spec__.origin
-                        exec (compile(src2, filename=cfn, mode="exec"), C.__dict__)
-                except Exception:
-                    t = "failed to optimize tftp code; run with --tftp-no-fast if there are issues:\n"
-                    self.log("tftp", t + min_ex(), 3)
-                    for n, zd in enumerate(cbak):
-                        Cs[n].__dict__ = zd
-
-            for C in Cs:
-                C.log.debug = noop
-
-        # patch ipa-check into partftpd (part 2/2)
-        _sinitial[:] = []
-        _sinitial.append(TftpStates.TftpServerState.serverInitial)
-        TftpStates.TftpServerState.serverInitial = _serverInitial
-
-        # patch vfs into partftpy
-        TftpContexts.open = self._open
-        TftpStates.open = self._open
-
-        fos = SimpleNamespace()
-        for k in os.__dict__:
-            try:
-                setattr(fos, k, getattr(os, k))
-            except:
-                pass
-        fos.access = self._access
-        fos.mkdir = self._mkdir
-        fos.unlink = self._unlink
-        fos.sep = "/"
-        TftpContexts.os = fos
-        TftpServer.os = fos
-        TftpStates.os = fos
-
-        fop = SimpleNamespace()
-        for k in os.path.__dict__:
-            try:
-                setattr(fop, k, getattr(os.path, k))
-            except:
-                pass
-        fop.abspath = self._p_abspath
-        fop.exists = self._p_exists
-        fop.isdir = self._p_isdir
-        fop.normpath = self._p_normpath
-        fos.path = fop
-
-        self._disarm(fos)
-
-        self.port = int(self.args.tftp)
-        self.srv = []
-        self.ips = []
-
-        ports = []
-        if self.args.tftp_pr:
-            p1, p2 = [int(x) for x in self.args.tftp_pr.split("-")]
-            ports = list(range(p1, p2 + 1))
-
-        ips = self.args.i
-        if "::" in ips:
-            ips.append("0.0.0.0")
-
-        ips = [x for x in ips if "unix:" not in x]
-
-        if self.args.tftp4:
-            ips = [x for x in ips if ":" not in x]
-
-        if not ips:
-            t = "cannot start tftp-server; no compatible IPs in -i"
-            self.nlog(t, 1)
-            return
-
-        ips = list(ODict.fromkeys(ips))  # dedup
-
-        for ip in ips:
-            name = "tftp_%s" % (ip,)
-            Daemon(self._start, name, [ip, ports])
-            time.sleep(0.2)  # give dualstack a chance
-
-    def nlog(self, msg: str, c: Union[int, str] = 0) -> None:
-        self.log("tftp", msg, c)
-
-    def _start(self, ip, ports):
-        fam = socket.AF_INET6 if ":" in ip else socket.AF_INET
-        have_been_alive = False
-        while True:
-            srv = TftpServer.TftpServer("/", self._ls)
-            with self.mutex:
-                self.srv.append(srv)
-                self.ips.append(ip)
-
-            try:
-                # this is the listen loop; it should block forever
-                srv.listen(ip, self.port, af_family=fam, ports=ports)
-            except:
-                with self.mutex:
-                    self.srv.remove(srv)
-                    self.ips.remove(ip)
-
-                try:
-                    srv.sock.close()
-                except:
-                    pass
-
-                try:
-                    bound = bool(srv.listenport)
-                except:
-                    bound = False
-
-                if bound:
-                    # this instance has managed to bind at least once
-                    have_been_alive = True
-
-                if have_been_alive:
-                    t = "tftp server [%s]:%d crashed; restarting in 3 sec:\n%s"
-                    error(t, ip, self.port, min_ex())
-                    time.sleep(3)
-                    continue
-
-                # server failed to start; could be due to dualstack (ipv6 managed to bind and this is ipv4)
-                if ip != "0.0.0.0" or "::" not in self.ips:
-                    # nope, it's fatal
-                    t = "tftp server [%s]:%d failed to start:\n%s"
-                    error(t, ip, self.port, min_ex())
-
-                # yep; ignore
-                # (TODO: move the "listening @ ..." infolog in partftpy to
-                #   after the bind attempt so it doesn't print twice)
-                return
-
-            info("tftp server [%s]:%d terminated", ip, self.port)
-            break
-
-    def stop(self):
-        with self.mutex:
-            srvs = self.srv[:]
-
-        for srv in srvs:
-            srv.stop()
-
-    def _v2a(
-        self, caller: str, vpath: str, perms: list, *a: Any
-    ) -> tuple[VFS, str, str]:
-        vpath = vpath.replace("\\", "/").lstrip("/")
-        if not perms:
-            perms = [True, True]
-
-        debug('%s("%s", %s) %s\033[K\033[0m', caller, vpath, str(a), perms)
-        vfs, rem = self.asrv.vfs.get(vpath, "*", *perms)
-        if perms[1] and "*" not in vfs.axs.uread and "wo_up_readme" not in vfs.flags:
-            zs, fn = vsplit(vpath)
-            if fn.lower() in FN_EMB:
-                vpath = vjoin(zs, "_wo_" + fn)
-                vfs, rem = self.asrv.vfs.get(vpath, "*", *perms)
-
-        if not vfs.realpath:
-            raise Exception("unmapped vfs")
-
-        return vfs, vpath, vfs.canonical(rem)
-
-    def _ls(self, vpath: str, raddress: str, rport: int, force=False) -> Any:
-        # generate file listing if vpath is dir.txt and return as file object
-        if not force:
-            vpath, fn = os.path.split(vpath.replace("\\", "/"))
-            ptn = self.args.tftp_lsf
-            if not ptn or not ptn.match(fn.lower()):
-                return None
-
-        tsdt = datetime.fromtimestamp
-        vn, rem = self.asrv.vfs.get(vpath, "*", True, False)
-        fsroot, vfs_ls, vfs_virt = vn.ls(
-            rem,
-            "*",
-            not self.args.no_scandir,
-            [[True, False]],
-            throw=True,
-        )
-        dnames = set([x[0] for x in vfs_ls if stat.S_ISDIR(x[1].st_mode)])
-        dirs1 = [(v.st_mtime, v.st_size, k + "/") for k, v in vfs_ls if k in dnames]
-        fils1 = [(v.st_mtime, v.st_size, k) for k, v in vfs_ls if k not in dnames]
-        real1 = dirs1 + fils1
-        realt = [(tsdt(max(0, mt), UTC), sz, fn) for mt, sz, fn in real1]
-        reals = [
-            (
-                "%04d-%02d-%02d %02d:%02d:%02d"
-                % (
-                    zd.year,
-                    zd.month,
-                    zd.day,
-                    zd.hour,
-                    zd.minute,
-                    zd.second,
-                ),
-                sz,
-                fn,
-            )
-            for zd, sz, fn in realt
-        ]
-        virs = [("????-??-?? ??:??:??", 0, k + "/") for k in vfs_virt.keys()]
-        ls = virs + reals
-
-        if "*" not in vn.axs.udot:
-            names = set(exclude_dotfiles([x[2] for x in ls]))
-            ls = [x for x in ls if x[2] in names]
-
-        try:
-            biggest = max([x[1] for x in ls])
-        except:
-            biggest = 0
-
-        perms = []
-        if "*" in vn.axs.uread:
-            perms.append("read")
-        if "*" in vn.axs.udot:
-            perms.append("hidden")
-        if "*" in vn.axs.uwrite:
-            if "*" in vn.axs.udel:
-                perms.append("overwrite")
-            else:
-                perms.append("write")
-
-        fmt = "{{}}  {{:{},}}  {{}}"
-        fmt = fmt.format(len("{:,}".format(biggest)))
-        retl = ["# permissions: %s" % (", ".join(perms),)]
-        retl += [fmt.format(*x) for x in ls]
-        ret = "\n".join(retl).encode("utf-8", "replace")
-        return BytesIO(ret + b"\n")
-
-    def _open(self, vpath: str, mode: str, *a: Any, **ka: Any) -> Any:
-        rd = wr = False
-        if mode == "rb":
-            rd = True
-        elif mode == "wb":
-            wr = True
-        else:
-            raise Exception("bad mode %s" % (mode,))
-
-        vfs, vpath, ap = self._v2a("open", vpath, [rd, wr])
-        if wr:
-            if "*" not in vfs.axs.uwrite:
-                yeet("blocked write; folder not world-writable: /%s" % (vpath,))
-
-            if bos.path.exists(ap) and "*" not in vfs.axs.udel:
-                yeet("blocked write; folder not world-deletable: /%s" % (vpath,))
-
-            xbu = vfs.flags.get("xbu")
-            if xbu and not runhook(
-                self.nlog,
-                None,
-                self.hub.up2k,
-                "xbu.tftpd",
-                xbu,
-                ap,
-                vpath,
-                "",
-                "",
-                "",
-                0,
-                0,
-                "8.3.8.7",
-                time.time(),
-                "",
-            ):
-                yeet("blocked by xbu server config: %r" % (vpath,))
-
-        if not self.args.tftp_nols and bos.path.isdir(ap):
-            return self._ls(vpath, "", 0, True)
-
-        if not a:
-            a = (self.args.iobuf,)
-
-        return open(ap, mode, *a, **ka)
-
-    def _mkdir(self, vpath: str, *a) -> None:
-        vfs, _, ap = self._v2a("mkdir", vpath, [False, True])
-        if "*" not in vfs.axs.uwrite:
-            yeet("blocked mkdir; folder not world-writable: /%s" % (vpath,))
-
-        return bos.mkdir(ap)
-
-    def _unlink(self, vpath: str) -> None:
-        # return bos.unlink(self._v2a("stat", vpath, *a)[1])
-        vfs, _, ap = self._v2a("delete", vpath, [True, False, False, True])
-
-        try:
-            inf = bos.stat(ap)
-        except:
-            return
-
-        if not stat.S_ISREG(inf.st_mode) or inf.st_size:
-            yeet("attempted delete of non-empty file")
-
-        vpath = vpath.replace("\\", "/").lstrip("/")
-        self.hub.up2k.handle_rm("*", "8.3.8.7", [vpath], [], False, False)
-
-    def _access(self, *a: Any) -> bool:
-        return True
-
-    def _p_abspath(self, vpath: str) -> str:
-        return "/" + undot(vpath)
-
-    def _p_normpath(self, *a: Any) -> str:
-        return ""
-
-    def _p_exists(self, vpath: str) -> bool:
-        try:
-            ap = self._v2a("p.exists", vpath, [False, False])[2]
-            bos.stat(ap)
-            return True
-        except:
-            return vpath == "/"
-
-    def _p_isdir(self, vpath: str) -> bool:
-        try:
-            st = bos.stat(self._v2a("p.isdir", vpath, [False, False])[2])
-            ret = stat.S_ISDIR(st.st_mode)
-            return ret
-        except:
-            return vpath == "/"
-
-    def _hook(self, *a: Any, **ka: Any) -> None:
-        src = inspect.currentframe().f_back.f_code.co_name
-        error("\033[31m%s:hook(%s)\033[0m", src, a)
-        raise Exception("nope")
-
-    def _disarm(self, fos: SimpleNamespace) -> None:
-        fos.chmod = self._hook
-        fos.chown = self._hook
-        fos.close = self._hook
-        fos.ftruncate = self._hook
-        fos.lchown = self._hook
-        fos.link = self._hook
-        fos.listdir = self._hook
-        fos.lstat = self._hook
-        fos.open = self._hook
-        fos.remove = self._hook
-        fos.rename = self._hook
-        fos.replace = self._hook
-        fos.scandir = self._hook
-        fos.stat = self._hook
-        fos.symlink = self._hook
-        fos.truncate = self._hook
-        fos.utime = self._hook
-        fos.walk = self._hook
-
-        fos.path.expanduser = self._hook
-        fos.path.expandvars = self._hook
-        fos.path.getatime = self._hook
-        fos.path.getctime = self._hook
-        fos.path.getmtime = self._hook
-        fos.path.getsize = self._hook
-        fos.path.isabs = self._hook
-        fos.path.isfile = self._hook
-        fos.path.islink = self._hook
-        fos.path.realpath = self._hook
-
-
-def yeet(msg: str) -> None:
-    warning(msg)
-    raise TftpException(msg)

copyparty/th_cli.py

@@ -1,15 +1,13 @@
 # coding: utf-8
 from __future__ import print_function, unicode_literals
 
-import errno
 import os
-import stat
 
 from .__init__ import TYPE_CHECKING
 from .authsrv import VFS
 from .bos import bos
-from .th_srv import EXTS_AC, HAVE_WEBP, thumb_path
-from .util import Cooldown, Pebkac
+from .th_srv import HAVE_WEBP, thumb_path
+from .util import Cooldown
 
 if True:  # pylint: disable=using-constant-test
     from typing import Optional, Union
@@ -18,9 +16,6 @@ if TYPE_CHECKING:
     from .httpsrv import HttpSrv
 
 
-IOERROR = "reading the file was denied by the server os; either due to filesystem permissions, selinux, apparmor, or similar:\n%r"
-
-
 class ThumbCli(object):
     def __init__(self, hsrv: "HttpSrv") -> None:
         self.broker = hsrv.broker
@@ -62,17 +57,12 @@ class ThumbCli(object):
         if is_vid and "dvthumb" in dbv.flags:
             return None
 
-        want_opus = fmt in EXTS_AC
+        want_opus = fmt in ("opus", "caf")
         is_au = ext in self.fmt_ffa
-        is_vau = want_opus and ext in self.fmt_ffv
-        if is_au or is_vau:
+        if is_au:
             if want_opus:
                 if self.args.no_acode:
                     return None
-                elif fmt == "caf" and self.args.no_caf:
-                    fmt = "mp3"
-                elif fmt == "owa" and self.args.no_owa:
-                    fmt = "mp3"
             else:
                 if "dathumb" in dbv.flags:
                     return None
@@ -88,48 +78,25 @@ class ThumbCli(object):
         if rem.startswith(".hist/th/") and rem.split(".")[-1] in ["webp", "jpg", "png"]:
             return os.path.join(ptop, rem)
 
-        if fmt[:1] in "jw":
-            sfmt = fmt[:1]
+        if fmt == "j" and self.args.th_no_jpg:
+            fmt = "w"
 
-            if sfmt == "j" and self.args.th_no_jpg:
-                sfmt = "w"
-
-            if sfmt == "w":
-                if (
-                    self.args.th_no_webp
-                    or (is_img and not self.can_webp)
-                    or (self.args.th_ff_jpg and (not is_img or preferred == "ff"))
-                ):
-                    sfmt = "j"
-
-            vf_crop = dbv.flags["crop"]
-            vf_th3x = dbv.flags["th3x"]
-
-            if "f" in vf_crop:
-                sfmt += "f" if "n" in vf_crop else ""
-            else:
-                sfmt += "f" if "f" in fmt else ""
-
-            if "f" in vf_th3x:
-                sfmt += "3" if "y" in vf_th3x else ""
-            else:
-                sfmt += "3" if "3" in fmt else ""
-
-            fmt = sfmt
-
-        elif fmt[:1] == "p" and not is_au and not is_vid:
-            t = "cannot thumbnail %r: png only allowed for waveforms"
-            self.log(t % (rem,), 6)
-            return None
+        if fmt == "w":
+            if (
+                self.args.th_no_webp
+                or (is_img and not self.can_webp)
+                or (self.args.th_ff_jpg and (not is_img or preferred == "ff"))
+            ):
+                fmt = "j"
 
         histpath = self.asrv.vfs.histtab.get(ptop)
         if not histpath:
-            self.log("no histpath for %r" % (ptop,))
+            self.log("no histpath for [{}]".format(ptop))
             return None
 
         tpath = thumb_path(histpath, rem, mtime, fmt, self.fmt_ffa)
         tpaths = [tpath]
-        if fmt[:1] == "w":
+        if fmt == "w":
             # also check for jpg (maybe webp is unavailable)
             tpaths.append(tpath.rsplit(".", 1)[0] + ".jpg")
 
@@ -162,22 +129,8 @@ class ThumbCli(object):
         if abort:
             return None
 
-        ap = os.path.join(ptop, rem)
-        try:
-            st = bos.stat(ap)
-            if not st.st_size or not stat.S_ISREG(st.st_mode):
-                return None
-
-            with open(ap, "rb", 4) as f:
-                if not f.read(4):
-                    raise Exception()
-        except OSError as ex:
-            if ex.errno == errno.ENOENT:
-                raise Pebkac(404)
-            else:
-                raise Pebkac(500, IOERROR % (ex,))
-        except Exception as ex:
-            raise Pebkac(500, IOERROR % (ex,))
+        if not bos.path.getsize(os.path.join(ptop, rem)):
+            return None
 
         x = self.broker.ask("thumbsrv.get", ptop, rem, mtime, fmt)
         return x.get()  # type: ignore

copyparty/th_srv.py

@@ -1,90 +1,64 @@
 # coding: utf-8
 from __future__ import print_function, unicode_literals
 
+import base64
 import hashlib
 import logging
 import os
-import re
 import shutil
 import subprocess as sp
-import tempfile
 import threading
 import time
 
 from queue import Queue
 
-from .__init__ import ANYWIN, PY2, TYPE_CHECKING
+from .__init__ import ANYWIN, TYPE_CHECKING
 from .authsrv import VFS
 from .bos import bos
-from .mtag import HAVE_FFMPEG, HAVE_FFPROBE, au_unpk, ffprobe
-from .util import BytesIO  # type: ignore
+from .mtag import HAVE_FFMPEG, HAVE_FFPROBE, ffprobe
 from .util import (
     FFMPEG_URL,
-    VF_CAREFUL,
+    BytesIO,  # type: ignore
     Cooldown,
     Daemon,
+    Pebkac,
     afsenc,
-    atomic_move,
     fsenc,
     min_ex,
     runcmd,
     statdir,
-    ub64enc,
     vsplit,
-    wunlink,
 )
 
 if True:  # pylint: disable=using-constant-test
-    from typing import Any, Optional, Union
+    from typing import Optional, Union
 
 if TYPE_CHECKING:
     from .svchub import SvcHub
 
-if PY2:
-    range = xrange  # type: ignore
-
 HAVE_PIL = False
 HAVE_PILF = False
 HAVE_HEIF = False
 HAVE_AVIF = False
 HAVE_WEBP = False
 
-EXTS_TH = set(["jpg", "webp", "png"])
-EXTS_AC = set(["opus", "owa", "caf", "mp3"])
-EXTS_SPEC_SAFE = set("aif aiff flac mp3 opus wav".split())
-
-PTN_TS = re.compile("^-?[0-9a-f]{8,10}$")
-
-
 try:
-    if os.environ.get("PRTY_NO_PIL"):
-        raise Exception()
-
     from PIL import ExifTags, Image, ImageFont, ImageOps
 
     HAVE_PIL = True
     try:
-        if os.environ.get("PRTY_NO_PILF"):
-            raise Exception()
-
         ImageFont.load_default(size=16)
         HAVE_PILF = True
     except:
         pass
 
     try:
-        if os.environ.get("PRTY_NO_PIL_WEBP"):
-            raise Exception()
-
         Image.new("RGB", (2, 2)).save(BytesIO(), format="webp")
         HAVE_WEBP = True
     except:
         pass
 
     try:
-        if os.environ.get("PRTY_NO_PIL_HEIF"):
-            raise Exception()
-
         from pyheif_pillow_opener import register_heif_opener
 
         register_heif_opener()
@@ -93,9 +67,6 @@ try:
         pass
 
     try:
-        if os.environ.get("PRTY_NO_PIL_AVIF"):
-            raise Exception()
-
         import pillow_avif  # noqa: F401  # pylint: disable=unused-import
 
         HAVE_AVIF = True
@@ -107,9 +78,6 @@ except:
     pass
 
 try:
-    if os.environ.get("PRTY_NO_VIPS"):
-        raise Exception()
-
     HAVE_VIPS = True
     import pyvips
 
@@ -118,9 +86,6 @@ except:
     HAVE_VIPS = False
 
 
-th_dir_cache = {}
-
-
 def thumb_path(histpath: str, rem: str, mtime: float, fmt: str, ffa: set[str]) -> str:
     # base16 = 16 = 256
     # b64-lc = 38 = 1444
@@ -131,25 +96,19 @@ def thumb_path(histpath: str, rem: str, mtime: float, fmt: str, ffa: set[str]) -
 
     # spectrograms are never cropped; strip fullsize flag
     ext = rem.split(".")[-1].lower()
-    if ext in ffa and fmt[:2] in ("wf", "jf"):
-        fmt = fmt.replace("f", "")
+    if ext in ffa and fmt in ("wf", "jf"):
+        fmt = fmt[:1]
 
-    dcache = th_dir_cache
-    rd_key = rd + "\n" + fmt
-    rd = dcache.get(rd_key)
-    if not rd:
-        h = hashlib.sha512(afsenc(rd_key)).digest()
-        b64 = ub64enc(h).decode("ascii")[:24]
-        rd = ("%s/%s/" % (b64[:2], b64[2:4])).lower() + b64
-        if len(dcache) > 9001:
-            dcache.clear()
-        dcache[rd_key] = rd
+    rd += "\n" + fmt
+    h = hashlib.sha512(afsenc(rd)).digest()
+    b64 = base64.urlsafe_b64encode(h).decode("ascii")[:24]
+    rd = ("%s/%s/" % (b64[:2], b64[2:4])).lower() + b64
 
     # could keep original filenames but this is safer re pathlen
     h = hashlib.sha512(afsenc(fn)).digest()
-    fn = ub64enc(h).decode("ascii")[:24]
+    fn = base64.urlsafe_b64encode(h).decode("ascii")[:24]
 
-    if fmt in EXTS_AC:
+    if fmt in ("opus", "caf"):
         cat = "ac"
     else:
         fc = fmt[:1]
@@ -170,15 +129,9 @@ class ThumbSrv(object):
 
         self.mutex = threading.Lock()
         self.busy: dict[str, list[threading.Condition]] = {}
-        self.untemp: dict[str, list[str]] = {}
-        self.ram: dict[str, float] = {}
-        self.memcond = threading.Condition(self.mutex)
         self.stopping = False
-        self.rm_nullthumbs = True  # forget failed conversions on startup
         self.nthr = max(1, self.args.th_mt)
 
-        self.exts_spec_unsafe = set(self.args.th_spec_cnv.split(","))
-
         self.q: Queue[Optional[tuple[str, str, str, VFS]]] = Queue(self.nthr * 4)
         for n in range(self.nthr):
             Daemon(self.worker, "thumb-{}-{}".format(n, self.nthr))
@@ -244,15 +197,14 @@ class ThumbSrv(object):
         with self.mutex:
             return not self.nthr
 
-    def getres(self, vn: VFS, fmt: str) -> tuple[int, int]:
-        mul = 3 if "3" in fmt else 1
+    def getres(self, vn: VFS) -> tuple[int, int]:
         w, h = vn.flags["thsize"].split("x")
-        return int(w) * mul, int(h) * mul
+        return int(w), int(h)
 
     def get(self, ptop: str, rem: str, mtime: float, fmt: str) -> Optional[str]:
         histpath = self.asrv.vfs.histtab.get(ptop)
         if not histpath:
-            self.log("no histpath for %r" % (ptop,))
+            self.log("no histpath for [{}]".format(ptop))
             return None
 
         tpath = thumb_path(histpath, rem, mtime, fmt, self.fmt_ffa)
@@ -262,7 +214,7 @@ class ThumbSrv(object):
         with self.mutex:
             try:
                 self.busy[tpath].append(cond)
-                self.log("joined waiting room for %r" % (tpath,))
+                self.log("wait {}".format(tpath))
             except:
                 thdir = os.path.dirname(tpath)
                 bos.makedirs(os.path.join(thdir, "w"))
@@ -279,11 +231,11 @@ class ThumbSrv(object):
             allvols = list(self.asrv.vfs.all_vols.values())
             vn = next((x for x in allvols if x.realpath == ptop), None)
             if not vn:
-                self.log("ptop %r not in %s" % (ptop, allvols), 3)
+                self.log("ptop [{}] not in {}".format(ptop, allvols), 3)
                 vn = self.asrv.vfs.all_aps[0][1]
 
             self.q.put((abspath, tpath, fmt, vn))
-            self.log("conv %r :%s \033[0m%r" % (tpath, fmt, abspath), 6)
+            self.log("conv {} :{} \033[0m{}".format(tpath, fmt, abspath), c=6)
 
         while not self.stopping:
             with self.mutex:
@@ -313,23 +265,6 @@ class ThumbSrv(object):
             "ffa": self.fmt_ffa,
         }
 
-    def wait4ram(self, need: float, ttpath: str) -> None:
-        ram = self.args.th_ram_max
-        if need > ram * 0.99:
-            t = "file too big; need %.2f GiB RAM, but --th-ram-max is only %.1f"
-            raise Exception(t % (need, ram))
-
-        while True:
-            with self.mutex:
-                used = sum([v for k, v in self.ram.items() if k != ttpath]) + need
-                if used < ram:
-                    # self.log("XXX self.ram: %s" % (self.ram,), 5)
-                    self.ram[ttpath] = need
-                    return
-            with self.memcond:
-                # self.log("at RAM limit; used %.2f GiB, need %.2f more" % (used-need, need), 1)
-                self.memcond.wait(3)
-
     def worker(self) -> None:
         while not self.stopping:
             task = self.q.get()
@@ -340,111 +275,72 @@ class ThumbSrv(object):
             ext = abspath.split(".")[-1].lower()
             png_ok = False
             funs = []
-
-            if ext in self.args.au_unpk:
-                ap_unpk = au_unpk(self.log, self.args.au_unpk, abspath, vn)
-            else:
-                ap_unpk = abspath
-
             if not bos.path.exists(tpath):
-                tex = tpath.rsplit(".", 1)[-1]
-                want_mp3 = tex == "mp3"
-                want_opus = tex in ("opus", "owa", "caf")
-                want_png = tex == "png"
-                want_au = want_mp3 or want_opus
                 for lib in self.args.th_dec:
-                    can_au = lib == "ff" and (
-                        ext in self.fmt_ffa or ext in self.fmt_ffv
-                    )
-
                     if lib == "pil" and ext in self.fmt_pil:
                         funs.append(self.conv_pil)
                     elif lib == "vips" and ext in self.fmt_vips:
                         funs.append(self.conv_vips)
-                    elif can_au and (want_png or want_au):
-                        if want_opus:
+                    elif lib == "ff" and ext in self.fmt_ffi or ext in self.fmt_ffv:
+                        funs.append(self.conv_ffmpeg)
+                    elif lib == "ff" and ext in self.fmt_ffa:
+                        if tpath.endswith(".opus") or tpath.endswith(".caf"):
                             funs.append(self.conv_opus)
-                        elif want_mp3:
-                            funs.append(self.conv_mp3)
-                        elif want_png:
+                        elif tpath.endswith(".png"):
                             funs.append(self.conv_waves)
                             png_ok = True
-                    elif lib == "ff" and (ext in self.fmt_ffi or ext in self.fmt_ffv):
-                        funs.append(self.conv_ffmpeg)
-                    elif lib == "ff" and ext in self.fmt_ffa and not want_au:
-                        funs.append(self.conv_spec)
+                        else:
+                            funs.append(self.conv_spec)
+
+            if not png_ok and tpath.endswith(".png"):
+                raise Pebkac(400, "png only allowed for waveforms")
 
             tdir, tfn = os.path.split(tpath)
             ttpath = os.path.join(tdir, "w", tfn)
             try:
-                wunlink(self.log, ttpath, vn.flags)
+                bos.unlink(ttpath)
             except:
                 pass
 
             for fun in funs:
                 try:
-                    if not png_ok and tpath.endswith(".png"):
-                        raise Exception("png only allowed for waveforms")
-
-                    fun(ap_unpk, ttpath, fmt, vn)
+                    fun(abspath, ttpath, fmt, vn)
                     break
                 except Exception as ex:
-                    msg = "%s could not create thumbnail of %r\n%s"
-                    msg = msg % (fun.__name__, abspath, min_ex())
+                    msg = "{} could not create thumbnail of {}\n{}"
+                    msg = msg.format(fun.__name__, abspath, min_ex())
                     c: Union[str, int] = 1 if "<Signals.SIG" in msg else "90"
                     self.log(msg, c)
                     if getattr(ex, "returncode", 0) != 321:
                         if fun == funs[-1]:
-                            try:
-                                with open(ttpath, "wb") as _:
-                                    pass
-                            except Exception as ex:
-                                t = "failed to create the file [%s]: %r"
-                                self.log(t % (ttpath, ex), 3)
+                            with open(ttpath, "wb") as _:
+                                pass
                     else:
                         # ffmpeg may spawn empty files on windows
                         try:
-                            wunlink(self.log, ttpath, vn.flags)
+                            os.unlink(ttpath)
                         except:
                             pass
 
-            if abspath != ap_unpk:
-                wunlink(self.log, ap_unpk, vn.flags)
-
             try:
-                atomic_move(self.log, ttpath, tpath, vn.flags)
-            except Exception as ex:
-                if not os.path.exists(tpath):
-                    t = "failed to move  [%s]  to  [%s]:  %r"
-                    self.log(t % (ttpath, tpath, ex), 3)
+                bos.rename(ttpath, tpath)
+            except:
                 pass
 
-            untemp = []
             with self.mutex:
                 subs = self.busy[tpath]
                 del self.busy[tpath]
-                self.ram.pop(ttpath, None)
-                untemp = self.untemp.pop(ttpath, None) or []
-
-            for ap in untemp:
-                try:
-                    wunlink(self.log, ap, VF_CAREFUL)
-                except:
-                    pass
 
             for x in subs:
                 with x:
                     x.notify_all()
 
-            with self.memcond:
-                self.memcond.notify_all()
-
         with self.mutex:
             self.nthr -= 1
 
     def fancy_pillow(self, im: "Image.Image", fmt: str, vn: VFS) -> "Image.Image":
         # exif_transpose is expensive (loads full image + unconditional copy)
-        res = self.getres(vn, fmt)
+        res = self.getres(vn)
         r = max(*res) * 2
         im.thumbnail((r, r), resample=Image.LANCZOS)
         try:
@@ -459,7 +355,7 @@ class ThumbSrv(object):
         if rot in rots:
             im = im.transpose(rots[rot])
 
-        if "f" in fmt:
+        if fmt.endswith("f"):
             im.thumbnail(res, resample=Image.LANCZOS)
         else:
             iw, ih = im.size
@@ -470,13 +366,12 @@ class ThumbSrv(object):
         return im
 
     def conv_pil(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
-        self.wait4ram(0.2, tpath)
         with Image.open(fsenc(abspath)) as im:
             try:
                 im = self.fancy_pillow(im, fmt, vn)
             except Exception as ex:
                 self.log("fancy_pillow {}".format(ex), "90")
-                im.thumbnail(self.getres(vn, fmt))
+                im.thumbnail(self.getres(vn))
 
             fmts = ["RGB", "L"]
             args = {"quality": 40}
@@ -500,12 +395,11 @@ class ThumbSrv(object):
             im.save(tpath, **args)
 
     def conv_vips(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
-        self.wait4ram(0.2, tpath)
         crops = ["centre", "none"]
-        if "f" in fmt:
+        if fmt.endswith("f"):
             crops = ["none"]
 
-        w, h = self.getres(vn, fmt)
+        w, h = self.getres(vn)
         kw = {"height": h, "size": "down", "intent": "relative"}
 
         for c in crops:
@@ -517,11 +411,10 @@ class ThumbSrv(object):
                 if c == crops[-1]:
                     raise
 
-        assert img  # type: ignore  # !rm
+        assert img  # type: ignore
         img.write_to_file(tpath, Q=40)
 
     def conv_ffmpeg(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
-        self.wait4ram(0.2, tpath)
         ret, _ = ffprobe(abspath, int(vn.flags["convt"] / 2))
         if not ret:
             return
@@ -534,12 +427,12 @@ class ThumbSrv(object):
             seek = [b"-ss", "{:.0f}".format(dur / 3).encode("utf-8")]
 
         scale = "scale={0}:{1}:force_original_aspect_ratio="
-        if "f" in fmt:
+        if fmt.endswith("f"):
             scale += "decrease,setsar=1:1"
         else:
             scale += "increase,crop={0}:{1},setsar=1:1"
 
-        res = self.getres(vn, fmt)
+        res = self.getres(vn)
         bscale = scale.format(*list(res)).encode("utf-8")
         # fmt: off
         cmd = [
@@ -624,21 +517,8 @@ class ThumbSrv(object):
         if "ac" not in ret:
             raise Exception("not audio")
 
-        # jt_versi.xm: 405M/839s
-        dur = ret[".dur"][1] if ".dur" in ret else 300
-        need = 0.2 + dur / 3000
-        speedup = b""
-        if need > self.args.th_ram_max * 0.7:
-            self.log("waves too big (need %.2f GiB); trying to optimize" % (need,))
-            need = 0.2 + dur / 4200  # only helps about this much...
-            speedup = b"aresample=8000,"
-        if need > self.args.th_ram_max * 0.96:
-            raise Exception("file too big; cannot waves")
-
-        self.wait4ram(need, tpath)
-
-        flt = b"[0:a:0]" + speedup
-        flt += (
+        flt = (
+            b"[0:a:0]"
             b"compand=.3|.3:1|1:-90/-60|-60/-40|-40/-30|-20/-20:6:0:-90:0.2"
             b",volume=2"
             b",showwavespic=s=2048x64:colors=white"
@@ -660,72 +540,12 @@ class ThumbSrv(object):
         cmd += [fsenc(tpath)]
         self._run_ff(cmd, vn)
 
-        if "pngquant" in vn.flags:
-            wtpath = tpath + ".png"
-            cmd = [
-                b"pngquant",
-                b"--strip",
-                b"--nofs",
-                b"--output",
-                fsenc(wtpath),
-                fsenc(tpath),
-            ]
-            ret = runcmd(cmd, timeout=vn.flags["convt"], nice=True, oom=400)[0]
-            if ret:
-                try:
-                    wunlink(self.log, wtpath, vn.flags)
-                except:
-                    pass
-            else:
-                atomic_move(self.log, wtpath, tpath, vn.flags)
-
     def conv_spec(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
         ret, _ = ffprobe(abspath, int(vn.flags["convt"] / 2))
         if "ac" not in ret:
             raise Exception("not audio")
 
-        fext = abspath.split(".")[-1].lower()
-
-        # https://trac.ffmpeg.org/ticket/10797
-        # expect 1 GiB every 600 seconds when duration is tricky;
-        # simple filetypes are generally safer so let's special-case those
-        coeff = 1800 if fext in EXTS_SPEC_SAFE else 600
-        dur = ret[".dur"][1] if ".dur" in ret else 900
-        need = 0.2 + dur / coeff
-        self.wait4ram(need, tpath)
-
-        infile = abspath
-        if dur >= 900 or fext in self.exts_spec_unsafe:
-            with tempfile.NamedTemporaryFile(suffix=".spec.flac", delete=False) as f:
-                f.write(b"h")
-                infile = f.name
-                try:
-                    self.untemp[tpath].append(infile)
-                except:
-                    self.untemp[tpath] = [infile]
-
-            # fmt: off
-            cmd = [
-                b"ffmpeg",
-                b"-nostdin",
-                b"-v", b"error",
-                b"-hide_banner",
-                b"-i", fsenc(abspath),
-                b"-map", b"0:a:0",
-                b"-ac", b"1",
-                b"-ar", b"48000",
-                b"-sample_fmt", b"s16",
-                b"-t", b"900",
-                b"-y", fsenc(infile),
-            ]
-            # fmt: on
-            self._run_ff(cmd, vn)
-
-        fc = "[0:a:0]aresample=48000{},showspectrumpic=s="
-        if "3" in fmt:
-            fc += "1280x1024,crop=1420:1056:70:48[o]"
-        else:
-            fc += "640x512,crop=780:544:70:48[o]"
+        fc = "[0:a:0]aresample=48000{},showspectrumpic=s=640x512,crop=780:544:70:50[o]"
 
         if self.args.th_ff_swr:
             fco = ":filter_size=128:cutoff=0.877"
@@ -740,7 +560,7 @@ class ThumbSrv(object):
             b"-nostdin",
             b"-v", b"error",
             b"-hide_banner",
-            b"-i", fsenc(infile),
+            b"-i", fsenc(abspath),
             b"-filter_complex", fc.encode("utf-8"),
             b"-map", b"[o]",
             b"-frames:v", b"1",
@@ -763,150 +583,54 @@ class ThumbSrv(object):
         cmd += [fsenc(tpath)]
         self._run_ff(cmd, vn)
 
-    def conv_mp3(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
-        quality = self.args.q_mp3.lower()
-        if self.args.no_acode or not quality:
-            raise Exception("disabled in server config")
-
-        self.wait4ram(0.2, tpath)
-        tags, rawtags = ffprobe(abspath, int(vn.flags["convt"] / 2))
-        if "ac" not in tags:
-            raise Exception("not audio")
-
-        if quality.endswith("k"):
-            qk = b"-b:a"
-            qv = quality.encode("ascii")
-        else:
-            qk = b"-q:a"
-            qv = quality[1:].encode("ascii")
-
-        # extremely conservative choices for output format
-        # (always 2ch 44k1) because if a device is old enough
-        # to not support opus then it's probably also super picky
-
-        # fmt: off
-        cmd = [
-            b"ffmpeg",
-            b"-nostdin",
-            b"-v", b"error",
-            b"-hide_banner",
-            b"-i", fsenc(abspath),
-        ] + self.big_tags(rawtags) + [
-            b"-map", b"0:a:0",
-            b"-ar", b"44100",
-            b"-ac", b"2",
-            b"-c:a", b"libmp3lame",
-            qk, qv,
-            fsenc(tpath)
-        ]
-        # fmt: on
-        self._run_ff(cmd, vn, oom=300)
-
     def conv_opus(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
-        if self.args.no_acode or not self.args.q_opus:
+        if self.args.no_acode:
             raise Exception("disabled in server config")
 
-        self.wait4ram(0.2, tpath)
-        tags, rawtags = ffprobe(abspath, int(vn.flags["convt"] / 2))
-        if "ac" not in tags:
+        ret, _ = ffprobe(abspath, int(vn.flags["convt"] / 2))
+        if "ac" not in ret:
             raise Exception("not audio")
 
-        sq = "%dk" % (self.args.q_opus,)
-        bq = sq.encode("ascii")
-        if tags["ac"][1] == "opus":
-            enc = "-c:a copy"
-        else:
-            enc = "-c:a libopus -b:a " + sq
-
-        fun = self._conv_caf if fmt == "caf" else self._conv_owa
-
-        fun(abspath, tpath, tags, rawtags, enc, bq, vn)
-
-    def _conv_owa(
-        self,
-        abspath: str,
-        tpath: str,
-        tags: dict[str, tuple[int, Any]],
-        rawtags: dict[str, list[Any]],
-        enc: str,
-        bq: bytes,
-        vn: VFS,
-    ) -> None:
-        if tpath.endswith(".owa"):
-            container = b"webm"
-            tagset = [b"-map_metadata", b"-1"]
-        else:
-            container = b"opus"
-            tagset = self.big_tags(rawtags)
-
-        self.log("conv2 %s [%s]" % (container, enc), 6)
-        benc = enc.encode("ascii").split(b" ")
-
-        # fmt: off
-        cmd = [
-            b"ffmpeg",
-            b"-nostdin",
-            b"-v", b"error",
-            b"-hide_banner",
-            b"-i", fsenc(abspath),
-        ] + tagset + [
-            b"-map", b"0:a:0",
-        ] + benc + [
-            b"-f", container,
-            fsenc(tpath)
-        ]
-        # fmt: on
-        self._run_ff(cmd, vn, oom=300)
-
-    def _conv_caf(
-        self,
-        abspath: str,
-        tpath: str,
-        tags: dict[str, tuple[int, Any]],
-        rawtags: dict[str, list[Any]],
-        enc: str,
-        bq: bytes,
-        vn: VFS,
-    ) -> None:
-        tmp_opus = tpath + ".opus"
         try:
-            wunlink(self.log, tmp_opus, vn.flags)
-        except:
-            pass
-
-        try:
-            dur = tags[".dur"][1]
+            dur = ret[".dur"][1]
         except:
             dur = 0
 
-        self.log("conv2 caf-tmp [%s]" % (enc,), 6)
-        benc = enc.encode("ascii").split(b" ")
+        src_opus = abspath.lower().endswith(".opus") or ret["ac"][1] == "opus"
+        want_caf = tpath.endswith(".caf")
+        tmp_opus = tpath
+        if want_caf:
+            tmp_opus = tpath + ".opus"
+            try:
+                bos.unlink(tmp_opus)
+            except:
+                pass
 
-        # fmt: off
-        cmd = [
-            b"ffmpeg",
-            b"-nostdin",
-            b"-v", b"error",
-            b"-hide_banner",
-            b"-i", fsenc(abspath),
-            b"-map_metadata", b"-1",
-            b"-map", b"0:a:0",
-        ] + benc + [
-            b"-f", b"opus",
-            fsenc(tmp_opus)
-        ]
-        # fmt: on
-        self._run_ff(cmd, vn, oom=300)
+        caf_src = abspath if src_opus else tmp_opus
+
+        if not want_caf or not src_opus:
+            # fmt: off
+            cmd = [
+                b"ffmpeg",
+                b"-nostdin",
+                b"-v", b"error",
+                b"-hide_banner",
+                b"-i", fsenc(abspath),
+                b"-map_metadata", b"-1",
+                b"-map", b"0:a:0",
+                b"-c:a", b"libopus",
+                b"-b:a", b"128k",
+                fsenc(tmp_opus)
+            ]
+            # fmt: on
+            self._run_ff(cmd, vn, oom=300)
 
         # iOS fails to play some "insufficiently complex" files
         # (average file shorter than 8 seconds), so of course we
         # fix that by mixing in some inaudible pink noise :^)
         # 6.3 sec seems like the cutoff so lets do 7, and
         # 7 sec of psyqui-musou.opus @ 3:50 is 174 KiB
-        sz = bos.path.getsize(tmp_opus)
-        if dur < 20 or sz < 256 * 1024:
-            zs = bq.decode("ascii")
-            self.log("conv2 caf-transcode; dur=%d sz=%d q=%s" % (dur, sz, zs), 6)
+        if want_caf and (dur < 20 or bos.path.getsize(caf_src) < 256 * 1024):
             # fmt: off
             cmd = [
                 b"ffmpeg",
@@ -918,23 +642,22 @@ class ThumbSrv(object):
                 b"-map_metadata", b"-1",
                 b"-ac", b"2",
                 b"-c:a", b"libopus",
-                b"-b:a", bq,
+                b"-b:a", b"128k",
                 b"-f", b"caf",
                 fsenc(tpath)
             ]
             # fmt: on
             self._run_ff(cmd, vn, oom=300)
 
-        else:
+        elif want_caf:
             # simple remux should be safe
-            self.log("conv2 caf-remux; dur=%d sz=%d" % (dur, sz), 6)
             # fmt: off
             cmd = [
                 b"ffmpeg",
                 b"-nostdin",
                 b"-v", b"error",
                 b"-hide_banner",
-                b"-i", fsenc(tmp_opus),
+                b"-i", fsenc(abspath if src_opus else tmp_opus),
                 b"-map_metadata", b"-1",
                 b"-map", b"0:a:0",
                 b"-c:a", b"copy",
@@ -944,20 +667,11 @@ class ThumbSrv(object):
             # fmt: on
             self._run_ff(cmd, vn, oom=300)
 
-        try:
-            wunlink(self.log, tmp_opus, vn.flags)
-        except:
-            pass
-
-    def big_tags(self, raw_tags: dict[str, list[str]]) -> list[bytes]:
-        ret = []
-        for k, vs in raw_tags.items():
-            for v in vs:
-                if len(str(v)) >= 1024:
-                    bv = k.encode("utf-8", "replace")
-                    ret += [b"-metadata", bv + b"="]
-                    break
-        return ret
+        if tmp_opus != tpath:
+            try:
+                bos.unlink(tmp_opus)
+            except:
+                pass
 
     def poke(self, tdir: str) -> None:
         if not self.poke_cd.poke(tdir):
@@ -974,6 +688,7 @@ class ThumbSrv(object):
     def cleaner(self) -> None:
         interval = self.args.th_clean
         while True:
+            time.sleep(interval)
             ndirs = 0
             for vol, histpath in self.asrv.vfs.histtab.items():
                 if histpath.startswith(vol):
@@ -981,14 +696,9 @@ class ThumbSrv(object):
                 else:
                     self.log("\033[Jcln {} ({})/\033[A".format(histpath, vol))
 
-                try:
-                    ndirs += self.clean(histpath)
-                except Exception as ex:
-                    self.log("\033[Jcln err in %s: %r" % (histpath, ex), 3)
+                ndirs += self.clean(histpath)
 
             self.log("\033[Jcln ok; rm {} dirs".format(ndirs))
-            self.rm_nullthumbs = False
-            time.sleep(interval)
 
     def clean(self, histpath: str) -> int:
         ret = 0
@@ -1003,15 +713,13 @@ class ThumbSrv(object):
 
     def _clean(self, cat: str, thumbpath: str) -> int:
         # self.log("cln {}".format(thumbpath))
-        exts = EXTS_TH if cat == "th" else EXTS_AC
+        exts = ["jpg", "webp", "png"] if cat == "th" else ["opus", "caf"]
         maxage = getattr(self.args, cat + "_maxage")
         now = time.time()
         prev_b64 = None
         prev_fp = ""
         try:
-            t1 = statdir(
-                self.log_func, not self.args.no_scandir, False, thumbpath, False
-            )
+            t1 = statdir(self.log_func, not self.args.no_scandir, False, thumbpath)
             ents = sorted(list(t1))
         except:
             return 0
@@ -1044,8 +752,6 @@ class ThumbSrv(object):
             # thumb file
             try:
                 b64, ts, ext = f.split(".")
-                if len(ts) > 8 and PTN_TS.match(ts):
-                    ts = "yeahokay"
                 if len(b64) != 24 or len(ts) != 8 or ext not in exts:
                     raise Exception()
             except:
@@ -1054,10 +760,6 @@ class ThumbSrv(object):
 
                 continue
 
-            if self.rm_nullthumbs and not inf.st_size:
-                bos.unlink(fp)
-                continue
-
             if b64 == prev_b64:
                 self.log("rm replaced [{}]".format(fp))
                 bos.unlink(prev_fp)

copyparty/u2idx.py

@@ -8,7 +8,7 @@ import threading
 import time
 from operator import itemgetter
 
-from .__init__ import ANYWIN, PY2, TYPE_CHECKING, unicode
+from .__init__ import ANYWIN, TYPE_CHECKING, unicode
 from .authsrv import LEELOO_DALLAS, VFS
 from .bos import bos
 from .up2k import up2k_wark_from_hashlist
@@ -38,9 +38,6 @@ if True:  # pylint: disable=using-constant-test
 if TYPE_CHECKING:
     from .httpsrv import HttpSrv
 
-if PY2:
-    range = xrange  # type: ignore
-
 
 class U2idx(object):
     def __init__(self, hsrv: "HttpSrv") -> None:
@@ -53,42 +50,18 @@ class U2idx(object):
             self.log("your python does not have sqlite3; searching will be disabled")
             return
 
-        assert sqlite3  # type: ignore  # !rm
-
         self.active_id = ""
         self.active_cur: Optional["sqlite3.Cursor"] = None
         self.cur: dict[str, "sqlite3.Cursor"] = {}
         self.mem_cur = sqlite3.connect(":memory:", check_same_thread=False).cursor()
         self.mem_cur.execute(r"create table a (b text)")
 
-        self.sh_cur: Optional["sqlite3.Cursor"] = None
-
         self.p_end = 0.0
         self.p_dur = 0.0
 
     def log(self, msg: str, c: Union[int, str] = 0) -> None:
         self.log_func("u2idx", msg, c)
 
-    def shutdown(self) -> None:
-        if not HAVE_SQLITE3:
-            return
-
-        for cur in self.cur.values():
-            db = cur.connection
-            try:
-                db.interrupt()
-            except:
-                pass
-
-            cur.close()
-            db.close()
-
-        for cur in (self.mem_cur, self.sh_cur):
-            if cur:
-                db = cur.connection
-                cur.close()
-                db.close()
-
     def fsearch(
         self, uname: str, vols: list[VFS], body: dict[str, Any]
     ) -> list[dict[str, Any]]:
@@ -104,39 +77,21 @@ class U2idx(object):
         uv: list[Union[str, int]] = [wark[:16], wark]
 
         try:
-            return self.run_query(uname, vols, uq, uv, False, True, 99999)[0]
+            return self.run_query(uname, vols, uq, uv, False, 99999)[0]
         except:
             raise Pebkac(500, min_ex())
 
-    def get_shr(self) -> Optional["sqlite3.Cursor"]:
-        if self.sh_cur:
-            return self.sh_cur
-
-        if not HAVE_SQLITE3 or not self.args.shr:
+    def get_cur(self, ptop: str) -> Optional["sqlite3.Cursor"]:
+        if not HAVE_SQLITE3:
             return None
 
-        assert sqlite3  # type: ignore  # !rm
-
-        db = sqlite3.connect(self.args.shr_db, timeout=2, check_same_thread=False)
-        cur = db.cursor()
-        cur.execute('pragma table_info("sh")').fetchall()
-        self.sh_cur = cur
-        return cur
-
-    def get_cur(self, vn: VFS) -> Optional["sqlite3.Cursor"]:
-        cur = self.cur.get(vn.realpath)
+        cur = self.cur.get(ptop)
         if cur:
             return cur
 
-        if not HAVE_SQLITE3 or "e2d" not in vn.flags:
-            return None
-
-        assert sqlite3  # type: ignore  # !rm
-
-        ptop = vn.realpath
-        histpath = self.asrv.vfs.dbpaths.get(ptop)
+        histpath = self.asrv.vfs.histtab.get(ptop)
         if not histpath:
-            self.log("no dbpath for %r" % (ptop,))
+            self.log("no histpath for [{}]".format(ptop))
             return None
 
         db_path = os.path.join(histpath, "up2k.db")
@@ -151,7 +106,7 @@ class U2idx(object):
                 db = sqlite3.connect(uri, timeout=2, uri=True, check_same_thread=False)
                 cur = db.cursor()
                 cur.execute('pragma table_info("up")').fetchone()
-                self.log("ro: %r" % (db_path,))
+                self.log("ro: {}".format(db_path))
             except:
                 self.log("could not open read-only: {}\n{}".format(uri, min_ex()))
                 # may not fail until the pragma so unset it
@@ -161,7 +116,7 @@ class U2idx(object):
             # on windows, this steals the write-lock from up2k.deferred_init --
             # seen on win 10.0.17763.2686, py 3.10.4, sqlite 3.37.2
             cur = sqlite3.connect(db_path, timeout=2, check_same_thread=False).cursor()
-            self.log("opened %r" % (db_path,))
+            self.log("opened {}".format(db_path))
 
         self.cur[ptop] = cur
         return cur
@@ -310,7 +265,7 @@ class U2idx(object):
                 q += " lower({}) {} ? ) ".format(field, oper)
 
         try:
-            return self.run_query(uname, vols, q, va, have_mt, True, lim)
+            return self.run_query(uname, vols, q, va, have_mt, lim)
         except Exception as ex:
             raise Pebkac(500, repr(ex))
 
@@ -321,11 +276,9 @@ class U2idx(object):
         uq: str,
         uv: list[Union[str, int]],
         have_mt: bool,
-        sort: bool,
         lim: int,
     ) -> tuple[list[dict[str, Any]], list[str], bool]:
-        dbg = self.args.srch_dbg
-        if dbg:
+        if self.args.srch_dbg:
             t = "searching across all %s volumes in which the user has 'r' (full read access):\n  %s"
             zs = "\n  ".join(["/%s = %s" % (x.vpath, x.realpath) for x in vols])
             self.log(t % (len(vols), zs), 5)
@@ -364,18 +317,18 @@ class U2idx(object):
             ptop = vol.realpath
             flags = vol.flags
 
-            cur = self.get_cur(vol)
+            cur = self.get_cur(ptop)
             if not cur:
                 continue
 
-            dots = flags.get("dotsrch") and uname in vol.axs.udot
-            zs = "srch_re_dots" if dots else "srch_re_nodot"
-            rex: re.Pattern = flags.get(zs)  # type: ignore
+            excl = []
+            for vp2 in self.asrv.vfs.all_vols.keys():
+                if vp2.startswith((vtop + "/").lstrip("/")) and vtop != vp2:
+                    excl.append(vp2[len(vtop) :].lstrip("/"))
 
-            if dbg:
-                t = "searching in volume /%s (%s), excluding %s"
-                self.log(t % (vtop, ptop, rex.pattern), 5)
-                rex_cfg: Optional[re.Pattern] = flags.get("srch_excl")
+            if self.args.srch_dbg:
+                t = "searching in volume /%s (%s), excludelist %s"
+                self.log(t % (vtop, ptop, excl), 5)
 
             self.active_cur = cur
 
@@ -388,6 +341,7 @@ class U2idx(object):
 
             sret = []
             fk = flags.get("fk")
+            dots = flags.get("dotsrch") and uname in vol.axs.udot
             fk_alg = 2 if "fka" in flags else 1
             c = cur.execute(uq, tuple(vuv))
             for hit in c:
@@ -396,23 +350,20 @@ class U2idx(object):
                 if rd.startswith("//") or fn.startswith("//"):
                     rd, fn = s3dec(rd, fn)
 
-                vp = vjoin(vjoin(vtop, rd), fn)
-
-                if vp in seen_rps:
+                if rd in excl or any([x for x in excl if rd.startswith(x + "/")]):
+                    if self.args.srch_dbg:
+                        zs = vjoin(vjoin(vtop, rd), fn)
+                        t = "database inconsistency in volume '/%s'; ignoring: %s"
+                        self.log(t % (vtop, zs), 1)
                     continue
 
-                if rex.search(vp):
-                    if dbg:
-                        if rex_cfg and rex_cfg.search(vp):  # type: ignore
-                            self.log("filtered by srch_excl: %s" % (vp,), 6)
-                        elif not dots and "/." in ("/" + vp):
-                            pass
-                        else:
-                            t = "database inconsistency in volume '/%s'; ignoring: %s"
-                            self.log(t % (vtop, vp), 1)
+                rp = quotep("/".join([x for x in [vtop, rd, fn] if x]))
+                if not dots and "/." in ("/" + rp):
+                    continue
+
+                if rp in seen_rps:
                     continue
 
-                rp = quotep(vp)
                 if not fk:
                     suf = ""
                 else:
@@ -434,7 +385,7 @@ class U2idx(object):
                 if lim < 0:
                     break
 
-                if dbg:
+                if self.args.srch_dbg:
                     t = "in volume '/%s': hit: %s"
                     self.log(t % (vtop, rp), 5)
 
@@ -464,15 +415,14 @@ class U2idx(object):
             ret.extend(sret)
             # print("[{}] {}".format(ptop, sret))
 
-            if dbg:
+            if self.args.srch_dbg:
                 t = "in volume '/%s': got %d hits, %d total so far"
                 self.log(t % (vtop, len(sret), len(ret)), 5)
 
         done_flag.append(True)
         self.active_id = ""
 
-        if sort:
-            ret.sort(key=itemgetter("rp"))
+        ret.sort(key=itemgetter("rp"))
 
         return ret, list(taglist.keys()), lim < 0 and not clamped
 
@@ -483,5 +433,5 @@ class U2idx(object):
                 return
 
         if identifier == self.active_id:
-            assert self.active_cur  # !rm
+            assert self.active_cur
             self.active_cur.connection.interrupt()

copyparty/web/baguettebox.js

@@ -17,10 +17,8 @@ window.baguetteBox = (function () {
             titleTag: false,
             async: false,
             preload: 2,
-            refocus: true,
             afterShow: null,
             afterHide: null,
-            duringHide: null,
             onChange: null,
         },
         overlay, slider, btnPrev, btnNext, btnHelp, btnAnim, btnRotL, btnRotR, btnSel, btnFull, btnVmode, btnClose,
@@ -29,10 +27,8 @@ window.baguetteBox = (function () {
         isOverlayVisible = false,
         touch = {},  // start-pos
         touchFlag = false,  // busy
-        scrollCSS = ['', ''],
-        scrollTimer = 0,
         re_i = /^[^?]+\.(a?png|avif|bmp|gif|heif|jpe?g|jfif|svg|webp)(\?|$)/i,
-        re_v = /^[^?]+\.(webm|mkv|mp4|m4v|mov)(\?|$)/i,
+        re_v = /^[^?]+\.(webm|mkv|mp4)(\?|$)/i,
         anims = ['slideIn', 'fadeIn', 'none'],
         data = {},  // all galleries
         imagesElements = [],
@@ -93,30 +89,6 @@ window.baguetteBox = (function () {
         touchendHandler();
     };
 
-    var overlayWheelHandler = function (e) {
-        if (!options.noScrollbars || anymod(e))
-            return;
-
-        ev(e);
-
-        var x = e.deltaX,
-            y = e.deltaY,
-            d = Math.abs(x) > Math.abs(y) ? x : y;
-
-        if (e.deltaMode)
-            d *= 10;
-
-        if (Date.now() - scrollTimer < (Math.abs(d) > 20 ? 100 : 300))
-            return;
-
-        scrollTimer = Date.now();
-
-        if (d > 0)
-            showNextImage();
-        else
-            showPreviousImage();
-    };
-
     var trapFocusInsideOverlay = function (e) {
         if (overlay.style.display === 'block' && (overlay.contains && !overlay.contains(e.target))) {
             e.stopPropagation();
@@ -172,7 +144,7 @@ window.baguetteBox = (function () {
             selectorData.galleries.push(gallery);
         });
 
-        return [selectorData.galleries, options];
+        return selectorData.galleries;
     }
 
     function clearCachedData() {
@@ -283,19 +255,19 @@ window.baguetteBox = (function () {
         if (anymod(e, true))
             return;
 
-        var k = (e.code || e.key) + '', v = vid(), pos = -1;
+        var k = e.code + '', v = vid(), pos = -1;
 
         if (k == "BracketLeft")
             setloop(1);
         else if (k == "BracketRight")
             setloop(2);
-        else if (e.shiftKey && k != "KeyR" && k != "R")
+        else if (e.shiftKey && k != 'KeyR')
             return;
-        else if (k == "ArrowLeft" || k == "KeyJ" || k == "Left" || k == "j")
+        else if (k == "ArrowLeft" || k == "KeyJ")
             showPreviousImage();
-        else if (k == "ArrowRight" || k == "KeyL" || k == "Right" || k == "l")
+        else if (k == "ArrowRight" || k == "KeyL")
             showNextImage();
-        else if (k == "Escape" || k == "Esc")
+        else if (k == "Escape")
             hideOverlay();
         else if (k == "Home")
             showFirstImage(e);
@@ -323,9 +295,9 @@ window.baguetteBox = (function () {
         }
         else if (k == "KeyF")
             tglfull();
-        else if (k == "KeyS" || k == "s")
+        else if (k == "KeyS")
             tglsel();
-        else if (k == "KeyR" || k == "r" || k == "R")
+        else if (k == "KeyR")
             rotn(e.shiftKey ? -1 : 1);
         else if (k == "KeyY")
             dlpic();
@@ -420,7 +392,8 @@ window.baguetteBox = (function () {
     }
 
     function dlpic() {
-        var url = addq(findfile()[3].href, 'cache');
+        var url = findfile()[3].href;
+        url += (url.indexOf('?') < 0 ? '?' : '&') + 'cache';
         dl_file(url);
     }
 
@@ -477,7 +450,6 @@ window.baguetteBox = (function () {
         bind(document, 'keyup', keyUpHandler);
         bind(document, 'fullscreenchange', onFSC);
         bind(overlay, 'click', overlayClickHandler);
-        bind(overlay, 'wheel', overlayWheelHandler);
         bind(btnPrev, 'click', showPreviousImage);
         bind(btnNext, 'click', showNextImage);
         bind(btnClose, 'click', hideOverlay);
@@ -500,7 +472,6 @@ window.baguetteBox = (function () {
         unbind(document, 'keyup', keyUpHandler);
         unbind(document, 'fullscreenchange', onFSC);
         unbind(overlay, 'click', overlayClickHandler);
-        unbind(overlay, 'wheel', overlayWheelHandler);
         unbind(btnPrev, 'click', showPreviousImage);
         unbind(btnNext, 'click', showNextImage);
         unbind(btnClose, 'click', hideOverlay);
@@ -568,12 +539,6 @@ window.baguetteBox = (function () {
 
     function showOverlay(chosenImageIndex) {
         if (options.noScrollbars) {
-            var a = document.documentElement.style.overflowY,
-                b = document.body.style.overflowY;
-
-            if (a != 'hidden' || b != 'scroll')
-                scrollCSS = [a, b];
-
             document.documentElement.style.overflowY = 'hidden';
             document.body.style.overflowY = 'scroll';
         }
@@ -617,33 +582,24 @@ window.baguetteBox = (function () {
         isOverlayVisible = true;
     }
 
-    function hideOverlay(e, dtor) {
+    function hideOverlay(e) {
         ev(e);
         playvid(false);
         removeFromCache('#files');
         if (options.noScrollbars) {
-            document.documentElement.style.overflowY = scrollCSS[0];
-            document.body.style.overflowY = scrollCSS[1];
+            document.documentElement.style.overflowY = 'auto';
+            document.body.style.overflowY = 'auto';
         }
-
-        try {
-            if (document.fullscreenElement)
-                document.exitFullscreen();
-        }
-        catch (ex) { }
-        isFullscreen = false;
-
-        if (toast.tag == 'bb-ded')
-            toast.hide();
-
-        if (dtor || overlay.style.display === 'none')
+        if (overlay.style.display === 'none')
             return;
 
-        if (options.duringHide)
-            options.duringHide();
-
         sethash('');
         unbindEvents();
+        try {
+            document.exitFullscreen();
+            isFullscreen = false;
+        }
+        catch (ex) { }
 
         // Fade out and hide the overlay
         overlay.className = '';
@@ -657,68 +613,9 @@ window.baguetteBox = (function () {
             if (options.afterHide)
                 options.afterHide();
 
-            options.refocus && documentLastFocus && documentLastFocus.focus();
+            documentLastFocus && documentLastFocus.focus();
             isOverlayVisible = false;
-            unvid();
-            unfig();
-        }, 250);
-    }
-
-    function unvid(keep) {
-        var vids = QSA('#bbox-overlay video');
-        for (var a = vids.length - 1; a >= 0; a--) {
-            var v = vids[a];
-            if (v == keep)
-                continue;
-
-            unbind(v, 'error', lerr);
-            v.src = '';
-            v.load();
-
-            var p = v.parentNode;
-            p.removeChild(v);
-            p.parentNode.removeChild(p);
-        }
-    }
-
-    function unfig(keep) {
-        var figs = QSA('#bbox-overlay figure'),
-            npre = options.preload || 0,
-            k = [];
-
-        if (keep === undefined)
-            keep = -9;
-
-        for (var a = keep - npre; a <= keep + npre; a++)
-            k.push('bbox-figure-' + a);
-
-        for (var a = figs.length - 1; a >= 0; a--) {
-            var f = figs[a];
-            if (!has(k, f.getAttribute('id')))
-                f.parentNode.removeChild(f);
-        }
-    }
-
-    function lerr() {
-        var t;
-        try {
-            t = this.getAttribute('src');
-            t = uricom_dec(t.split('/').pop().split('?')[0]);
-        }
-        catch (ex) { }
-
-        t = 'Failed to open ' + (t?t:'file');
-        console.log('bb-ded', t);
-        t += '\n\nEither the file is corrupt, or your browser does not understand the file format or codec';
-
-        try {
-            t += "\n\nerr#" + this.error.code + ", " + this.error.message;
-        }
-        catch (ex) { }
- 
-        this.ded = esc(t);
-        if (this === vidimg())
-            toast.err(20, this.ded, 'bb-ded');
+        }, 500);
     }
 
     function loadImage(index, callback) {
@@ -744,7 +641,7 @@ window.baguetteBox = (function () {
                 options.captions.call(currentGallery, imageElement) :
                 imageElement.getAttribute('data-caption') || imageElement.title;
 
-        imageSrc = addq(imageSrc, 'cache');
+        imageSrc += imageSrc.indexOf('?') < 0 ? '?cache' : '&cache';
 
         if (is_vid && index != currentIndex)
             return;  // no preload
@@ -765,8 +662,7 @@ window.baguetteBox = (function () {
         var image = mknod(is_vid ? 'video' : 'img');
         clmod(imageContainer, 'vid', is_vid);
 
-        bind(image, 'error', lerr);
-        bind(image, is_vid ? 'loadedmetadata' : 'load', function () {
+        image.addEventListener(is_vid ? 'loadedmetadata' : 'load', function () {
             // Remove loader element
             qsr('#baguette-img-' + index + ' .bbox-spinner');
             if (!options.async && callback)
@@ -774,11 +670,8 @@ window.baguetteBox = (function () {
         });
         image.setAttribute('src', imageSrc);
         if (is_vid) {
-            image.volume = clamp(fcfg_get('vol', dvol / 100), 0, 1);
             image.setAttribute('controls', 'controls');
             image.onended = vidEnd;
-            image.onplay = function () { show_buttons(1); };
-            image.onpause = function () { show_buttons(); };
         }
         image.alt = thumbnailElement ? thumbnailElement.alt || '' : '';
         if (options.titleTag && imageCaption)
@@ -786,9 +679,6 @@ window.baguetteBox = (function () {
 
         figure.appendChild(image);
 
-        if (is_vid && window.afilt)
-            afilt.apply(undefined, image);
-
         if (options.async && callback)
             callback();
     }
@@ -818,7 +708,6 @@ window.baguetteBox = (function () {
     }
 
     function show(index, gallery) {
-        gallery = gallery || currentGallery;
         if (!isOverlayVisible && index >= 0 && index < gallery.length) {
             prepareOverlay(gallery, options);
             showOverlay(index);
@@ -831,10 +720,12 @@ window.baguetteBox = (function () {
         if (index >= imagesElements.length)
             return bounceAnimation('right');
 
-        try {
-            vid().pause();
+        var v = vid();
+        if (v) {
+            v.src = '';
+            v.load();
+            v.parentNode.removeChild(v);
         }
-        catch (ex) { }
 
         currentIndex = index;
         loadImage(currentIndex, function () {
@@ -843,21 +734,6 @@ window.baguetteBox = (function () {
         });
         updateOffset();
 
-        var im = vidimg();
-        if (im && im.ded)
-            toast.err(20, im.ded, 'bb-ded');
-        else if (toast.tag == 'bb-ded')
-            toast.hide();
-
-        if (options.animation == 'none')
-            unvid(vid());
-        else
-            setTimeout(function () {
-                unvid(vid());
-            }, 100);
-
-        unfig(index);
-
         if (options.onChange)
             options.onChange(currentIndex, imagesElements.length);
 
@@ -1030,12 +906,6 @@ window.baguetteBox = (function () {
         }
     }
 
-    function show_buttons(v) {
-        clmod(ebi('bbox-btns'), 'off', v);
-        clmod(btnPrev, 'off', v);
-        clmod(btnNext, 'off', v);
-    }
-
     function bounceAnimation(direction) {
         slider.className = options.animation == 'slideIn' ? 'bounce-from-' + direction : 'eog';
         setTimeout(function () {
@@ -1099,7 +969,9 @@ window.baguetteBox = (function () {
             if (fx > 0.7)
                 return showNextImage();
 
-            show_buttons('t');
+            clmod(ebi('bbox-btns'), 'off', 't');
+            clmod(btnPrev, 'off', 't');
+            clmod(btnNext, 'off', 't');
 
             if (Date.now() - ctime <= 500 && !IPHONE)
                 tglfull();
@@ -1141,7 +1013,6 @@ window.baguetteBox = (function () {
     }
 
     function destroyPlugin() {
-        hideOverlay(undefined, true);
         unbindEvents();
         clearCachedData();
         document.getElementsByTagName('body')[0].removeChild(ebi('bbox-overlay'));

copyparty/web/browser.css

@@ -10,6 +10,7 @@
 	--fg2-max: #fff;
 	--fg-weak: #bbb;
 
+	--bg-u7: #555;
 	--bg-u6: #4c4c4c;
 	--bg-u5: #444;
 	--bg-u4: #383838;
@@ -27,8 +28,6 @@
 	--row-alt: #282828;
 
 	--scroll: #eb0;
-	--sel-fg: var(--bg-d1);
-	--sel-bg: var(--fg);
 
 	--a: #fc5;
 	--a-b: #c90;
@@ -42,14 +41,8 @@
 	--btn-h-bg: #805;
 	--btn-1-fg: #400;
 	--btn-1-bg: var(--a);
-	--btn-h-bs: var(--btn-bs);
-	--btn-h-bb: var(--btn-bb);
-	--btn-1-bs: var(--btn-bs);
-	--btn-1-bb: var(--btn-bb);
 	--btn-1h-fg: var(--btn-1-fg);
 	--btn-1h-bg: #fe8;
-	--btn-1h-bs: var(--btn-1-bs);
-	--btn-1h-bb: var(--btn-1-bb);
 	--chk-fg: var(--tab-alt);
 	--txt-sh: var(--bg-d2);
 	--txt-bg: var(--btn-bg);
@@ -64,7 +57,7 @@
 	--u2-tab-bg: linear-gradient(to bottom, var(--bg), var(--bg-u1));
 	--u2-tab-b1: rgba(128,128,128,0.8);
 	--u2-tab-1-fg: #fd7;
-	--u2-tab-1-bg: linear-gradient(to bottom, #353, var(--bg) 80%);
+	--u2-tab-1-bg: linear-gradient(to bottom, var(#353), var(--bg) 80%);
 	--u2-tab-1-b1: #7c5;
 	--u2-tab-1-b2: #583;
 	--u2-tab-1-sh: #280;
@@ -188,6 +181,7 @@ html.y {
 	--srv-1: #555;
 	--srv-2: #c83;
 	--srv-3: #c0a;
+	--srv-3b: rgba(255,68,204,0.6);
 
 	--tree-bg: #fff;
 
@@ -216,19 +210,22 @@ html.y {
 html.a {
 	--op-aa-sh: 0 0 .2em var(--bg-d3) inset;
 
-	--btn-bs: 0 0 .2em var(--bg-d3);
-}
-html.az {
-	--btn-1-bs: 0 0 .1em var(--fg) inset;
+	--u2-o-bg: #603;
+	--u2-o-b1: #a16;
+	--u2-o-sh: #a00;
+	--u2-o-h-bg: var(--u2-o-bg);
+	--u2-o-h-b1: #fb0;
+	--u2-o-h-sh: #fb0;
+	--u2-o-1-bg: #6a1;
+	--u2-o-1-b1: #efa;
+	--u2-o-1-sh: #0c0;
+	--u2-o-1h-bg: var(--u2-o-1-bg);
 }
 html.ay {
 	--op-aa-sh: 0 .1em .2em #ccc;
 	--op-aa-bg: var(--bg-max);
 }
 html.b {
-	--btn-bs: 0 .05em 0 var(--bg-d3) inset;
-	--btn-1-bs: 0 .05em 0 var(--btn-1h-bg) inset;
-
 	--tree-bg: var(--bg);
 
 	--g-bg: var(--bg);
@@ -245,13 +242,17 @@ html.b {
 	--u2-b1-bg: rgba(128,128,128,0.15);
 	--u2-b2-bg: var(--u2-b1-bg);
 
+	--u2-o-bg: var(--btn-bg);
+	--u2-o-h-bg: var(--btn-h-bg);
+	--u2-o-1-bg: var(--a);
+	--u2-o-1h-bg: var(--a-hil);
+
 	--f-sh1: 0.1;
 	--mp-b-bg: transparent;
 }
 html.bz {
 	--fg: #cce;
 	--fg-weak: #bbd;
-
 	--bg-u5: #3b3f58;
 	--bg-u4: #1e2130;
 	--bg-u3: #1e2130;
@@ -263,14 +264,11 @@ html.bz {
 
 	--row-alt: #181a27;
 
-	--a-b: #fb4;
-
 	--btn-bg: #202231;
 	--btn-h-bg: #2d2f45;
-	--btn-1-bg: #eb6;
-	--btn-1-fg: #000;
+	--btn-1-bg: #ba2959;
+	--btn-1-fg: #fff;
 	--btn-1h-fg: #000;
-	--btn-1h-bg: #ff9;
 	--txt-sh: a;
 
 	--u2-tab-b1: var(--bg-u5);
@@ -285,7 +283,6 @@ html.bz {
 	--f-h-b1: #34384e;
 	--mp-sh: #11121d;
 	/*--mp-b-bg: #2c3044;*/
-	--f-play-bg: var(--btn-1-bg);
 }
 html.by {
 	--bg: #f2f2f2;
@@ -306,7 +303,6 @@ html.by {
 }
 html.c {
 	font-weight: bold;
-
 	--fg: #fff;
 	--fg-weak: #cef;
 	--bg-u5: #409;
@@ -327,25 +323,15 @@ html.c {
 	--chk-fg: #d90;
 
 	--op-aa-bg: #f9dd22;
+	--u2-o-1-bg: #4cf;
 
 	--srv-1: #ea0;
 	--mp-b-bg: transparent;
 }
 html.cz {
 	--bgg: var(--bg-u2);
-
-	--sel-bg: var(--bg-u5);
-	--sel-fg: var(--fg);
-
-	--btn-bb: .2em solid #709;
-	--btn-bs: 0 .1em .6em rgba(255,0,185,0.5);
-	--btn-1-bb: .2em solid #e90;
-	--btn-1-bs: 0 .1em .8em rgba(255,205,0,0.9);
-
 	--srv-3: #fff;
-
 	--u2-tab-b1: var(--bg-d3);
-	--u2-tab-1-bg: a;
 }
 html.cy {
 	--fg: #fff;
@@ -357,8 +343,6 @@ html.cy {
 	--bg-d3: #f77;
 	--bg-d2: #ff0;
 
-	--sel-bg: #f77;
-
 	--a: #fff;
 	--a-hil: #fff;
 	--a-h-bg: #000;
@@ -372,25 +356,24 @@ html.cy {
 	--btn-h-fg: #fff;
 	--btn-1-bg: #ff0;
 	--btn-1-fg: #000;
-	--btn-bs: 0 .25em 0 #f00;
 	--chk-fg: #fd0;
 
-	--txt-bg: #000;
 	--srv-1: #f00;
 	--srv-3: #fff;
 	--op-aa-bg: #fff;
 
 	--u2-b1-bg: #f00;
 	--u2-b2-bg: #f00;
-
-	--g-sel-fg: #fff;
-	--g-sel-bg: #aaa;
-	--g-fsel-bg: #aaa;
+	--u2-o-bg: #ff0;
+	--u2-o-1-bg: #f00;
 }
 html.dz {
 	--fg: #4d4;
+	--fg-max: #fff;
+	--fg2-max: #fff;
 	--fg-weak: #2a2;
 
+	--bg-u7: #020;
 	--bg-u6: #020;
 	--bg-u5: #050;
 	--bg-u4: #020;
@@ -398,9 +381,11 @@ html.dz {
 	--bg-u2: #020;
 	--bg-u1: #020;
 	--bg: #010;
+	--bgg: var(--bg);
 	--bg-d1: #000;
 	--bg-d2: #020;
 	--bg-d3: #000;
+	--bg-max: #000;
 
 	--tab-alt: #6f6;
 	--row-alt: #030;
@@ -413,21 +398,48 @@ html.dz {
 	--a-dark: #afa;
 	--a-gray: #2a2;
 
+	--btn-fg: var(--a);
 	--btn-bg: rgba(64,128,64,0.15);
+	--btn-h-fg: var(--a-hil);
 	--btn-h-bg: #050;
 	--btn-1-fg: #000;
 	--btn-1-bg: #4f4;
+	--btn-1h-fg: var(--btn-1-fg);
 	--btn-1h-bg: #3f3;
-	--btn-bs: 0 0 0 .1em #080 inset;
-	--btn-1-bs: a;
+	--chk-fg: var(--tab-alt);
+	--txt-sh: var(--bg-d2);
+	--txt-bg: var(--btn-bg);
+
+	--op-aa-fg: var(--a);
+	--op-aa-bg: var(--bg-d2);
+	--op-a-sh: rgba(0,0,0,0.5);
 
 	--u2-btn-b1: var(--fg-weak);
 	--u2-sbtn-b1: var(--fg-weak);
+	--u2-txt-bg: var(--bg-u5);
+	--u2-tab-bg: linear-gradient(to bottom, var(--bg), var(--bg-u1));
 	--u2-tab-b1: var(--fg-weak);
 	--u2-tab-1-fg: #fff;
-	--u2-tab-1-bg: linear-gradient(to bottom, #151, var(--bg) 80%);
+	--u2-tab-1-bg: linear-gradient(to bottom, var(#353), var(--bg) 80%);
+	--u2-tab-1-b1: #7c5;
+	--u2-tab-1-b2: #583;
+	--u2-tab-1-sh: #280;
+	--u2-b-fg: #fff;
 	--u2-b1-bg: #3a3;
 	--u2-b2-bg: #3a3;
+	--u2-o-bg: var(--btn-bg);
+	--u2-o-b1: var(--bg-u5);
+	--u2-o-h-bg: var(--fg-weak);
+	--u2-o-1-bg: var(--fg-weak);
+	--u2-o-1-b1: var(--a);
+	--u2-o-1h-bg: var(--a);
+	--u2-inf-bg: #07a;
+	--u2-inf-b1: #0be;
+	--u2-ok-bg: #380;
+	--u2-ok-b1: #8e4;
+	--u2-err-bg: #900;
+	--u2-err-b1: #d06;
+	--ud-b1: #888;
 
 	--sort-1: #fff;
 	--sort-2: #3f3;
@@ -439,15 +451,49 @@ html.dz {
 
 	--tree-bg: #010;
 
+	--g-play-bg: #750;
+	--g-play-b1: #c90;
+	--g-play-b2: #da4;
+	--g-play-sh: #b83;
+
+	--g-sel-fg: #fff;
+	--g-sel-bg: #925;
 	--g-sel-b1: #c37;
 	--g-sel-sh: #b36;
+	--g-fsel-bg: #d39;
 	--g-fsel-b1: #d48;
+	--g-fsel-ts: #804;
+	--g-fg: var(--a-hil);
+	--g-bg: var(--bg-u2);
+	--g-b1: var(--bg-u4);
+	--g-b2: var(--bg-u5);
+	--g-g1: var(--bg-u2);
+	--g-g2: var(--bg-u5);
+	--g-f-bg: var(--bg-u4);
+	--g-f-b1: var(--bg-u5);
+	--g-f-fg: var(--a-hil);
+	--g-sh: rgba(0,0,0,0.3);
 
+	--f-sh1: 0.33;
+	--f-sh2: 0.02;
+	--f-sh3: 0.2;
 	--f-h-b1: #3b3;
 
+	--f-play-bg: #fc5;
+	--f-play-fg: #000;
+	--f-sel-sh: #fc0;
+	--f-gray: #999;
+
+	--fm-off: #f6c;
+	--mp-sh: var(--bg-d3);
+
+	--err-fg: #fff;
+	--err-bg: #a20;
+	--err-b1: #f00;
+	--err-ts: #500;
+
 	text-shadow: none;
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 }
 html.dy {
 	--fg: #000;
@@ -497,6 +543,10 @@ html.dy {
 	--u2-tab-1-bg: a;
 	--u2-b1-bg: #000;
 	--u2-b2-bg: #000;
+	--u2-o-h-bg: #999;
+	--u2-o-1h-bg: #999;
+	--u2-o-bg: #eee;
+	--u2-o-1-bg: #000;
 
 	--ud-b1: a;
 
@@ -537,11 +587,11 @@ html.dy {
 	line-height: 1.2em;
 }
 ::selection {
-	color: var(--sel-fg);
-	background: var(--sel-bg);
+	color: var(--bg-d1);
+	background: var(--fg);
 	text-shadow: none;
 }
-html,body,tr,th,td,#files,a,#blogout {
+html,body,tr,th,td,#files,a {
 	color: inherit;
 	background: none;
 	font-weight: inherit;
@@ -553,7 +603,6 @@ html {
 	color: var(--fg);
 	background: var(--bgg);
 	font-family: sans-serif;
-	font-family: var(--font-main), sans-serif;
 	text-shadow: 1px 1px 0px var(--bg-max);
 }
 html, body {
@@ -562,14 +611,12 @@ html, body {
 }
 pre, code, tt, #doc, #doc>code {
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 }
 .ayjump {
 	position: fixed;
 	overflow: hidden;
 	width: 0;
 	height: 0;
-	color: var(--bg);
 }
 html .ayjump:focus {
 	z-index: 80386;
@@ -624,15 +671,11 @@ html.y #path {
 #files tbody div a {
 	color: var(--tab-alt);
 }
-a, #blogout, #files tbody div a:last-child {
+a, #files tbody div a:last-child {
 	color: var(--a);
 	padding: .2em;
 	text-decoration: none;
 }
-#blogout {
-	margin: -.2em;
-}
-#blogout:hover,
 a:hover {
 	color: var(--a-hil);
 	background: var(--a-h-bg);
@@ -653,12 +696,12 @@ a:hover {
 .s0:after,
 .s1:after {
 	content: '⌄';
-	margin-left: -.15em;
+	margin-left: -.1em;
 }
 .s0r:after,
 .s1r:after {
 	content: '⌃';
-	margin-left: -.15em;
+	margin-left: -.1em;
 }
 .s0:after,
 .s0r:after {
@@ -669,7 +712,7 @@ a:hover {
 	color: var(--sort-2);
 }
 #files thead th:after {
-	margin-right: -.5em;
+	margin-right: -.7em;
 }
 #files tbody tr:hover td,
 #files tbody tr:hover td+td {
@@ -698,15 +741,6 @@ html #files.hhpick thead th {
 	word-wrap: break-word;
 	overflow: hidden;
 }
-#files tr.fade a {
-	color: #999;
-	color: rgba(255, 255, 255, 0.4);
-	font-style: italic;
-}
-html.y #files tr.fade a {
-	color: #999;
-	color: rgba(0, 0, 0, 0.4);
-}
 #files tr:nth-child(2n) td {
 	background: var(--row-alt);
 }
@@ -725,7 +759,6 @@ html.y #files tr.fade a {
 }
 #files tbody td:nth-child(3) {
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 	text-align: right;
 	padding-right: 1em;
 	white-space: nowrap;
@@ -785,11 +818,6 @@ html.y #path a:hover {
 .logue:empty {
 	display: none;
 }
-.logue.raw {
-	white-space: pre;
-	font-family: 'scp', 'consolas', monospace;
-	font-family: var(--font-mono), 'scp', 'consolas', monospace;
-}
 #doc>iframe,
 .logue>iframe {
 	background: var(--bgg);
@@ -833,7 +861,7 @@ html.y #path a:hover {
 	max-width: 52em;
 }
 .mdo.sb,
-.logue.mdo>iframe {
+#epi.logue.mdo>iframe {
 	max-width: 54em;
 }
 .mdo,
@@ -876,9 +904,6 @@ html.y #path a:hover {
 	color: var(--srv-3);
 	border-bottom: 1px solid var(--srv-3b);
 }
-#flogout {
-	display: inline;
-}
 #goh+span {
 	color: var(--bg-u5);
 	padding-left: .5em;
@@ -913,8 +938,6 @@ html.y #path a:hover {
 #files tbody tr.play a:hover {
 	color: var(--btn-1h-fg);
 	background: var(--btn-1h-bg);
-	box-shadow: var(--btn-1h-bs);
-	border-bottom: var(--btn-1h-bb);
 }
 #ggrid {
 	margin: -.2em -.5em;
@@ -923,7 +946,6 @@ html.y #path a:hover {
 	overflow: hidden;
 	display: block;
 	display: -webkit-box;
-	line-clamp: var(--grid-ln);
 	-webkit-line-clamp: var(--grid-ln);
 	-webkit-box-orient: vertical;
 	padding-top: .3em;
@@ -959,10 +981,6 @@ html.y #path a:hover {
 	margin: 0 auto;
 	display: block;
 }
-#ggrid.nocrop>a img {
-	max-height: 20em;
-	max-height: calc(var(--grid-sz)*2);
-}
 #ggrid>a.dir:before {
 	content: '📂';
 }
@@ -970,6 +988,9 @@ html.y #path a:hover {
 	color: var(--g-dfg);
 }
 #ggrid>a.au:before {
+	content: '💾';
+}
+html.np_open #ggrid>a.au:before {
 	content: '▶';
 }
 #ggrid>a:before {
@@ -1098,7 +1119,6 @@ html.y #widget.open {
 	width: 100%;
 	height: 100%;
 }
-#fshr,
 #wtgrid,
 #wtico {
 	position: relative;
@@ -1127,6 +1147,9 @@ html.y #widget.open {
 @keyframes spin {
 	100% {transform: rotate(360deg)}
 }
+@media (prefers-reduced-motion) {
+	@keyframes spin { }
+}
 @keyframes fadein {
 	0% {opacity: 0}
 	100% {opacity: 1}
@@ -1151,17 +1174,17 @@ html.y #widget.open {
 	background: #fff;
 	background: var(--bg-u3);
 }
-#wfs, #wfm, #wzip, #wnp, #wm3u {
+#wfs, #wfm, #wzip, #wnp {
 	display: none;
 }
-#wfs, #wzip, #wnp, #wm3u {
+#wfs, #wzip, #wnp {
 	margin-right: .2em;
 	padding-right: .2em;
 	border: 1px solid var(--bg-u5);
 	border-width: 0 .1em 0 0;
 }
-#wfm.act+#wzip1+#wzip,
-#wfm.act+#wzip1+#wzip+#wnp {
+#wfm.act+#wzip,
+#wfm.act+#wzip+#wnp {
 	margin-left: .2em;
 	padding-left: .2em;
 	border-left-width: .1em;
@@ -1175,18 +1198,14 @@ html.y #widget.open {
 	line-height: 1em;
 }
 #wtoggle.sel #wzip,
-#wtoggle.m3u #wm3u,
 #wtoggle.np #wnp {
 	display: inline-block;
 }
-#wtoggle.sel #wzip1,
 #wtoggle.sel.np #wnp {
 	display: none;
 }
 #wfm a,
 #wnp a,
-#wm3u a,
-#zip1,
 #wzip a {
 	font-size: .5em;
 	padding: 0 .3em;
@@ -1194,13 +1213,6 @@ html.y #widget.open {
 	position: relative;
 	display: inline-block;
 }
-#zip1 {
-	font-size: .38em;
-}
-#wm3u a {
-	margin: -.2em .1em;
-	font-size: .45em;
-}
 #wfs {
 	font-size: .36em;
 	text-align: right;
@@ -1209,22 +1221,13 @@ html.y #widget.open {
 	border-width: 0 .25em 0 0;
 }
 #wfm span,
-#wm3u span,
-#zip1 span,
 #wnp span {
 	font-size: .6em;
 	display: block;
 }
-#zip1 span {
-	font-size: .9em;
-}
 #wnp span {
 	font-size: .7em;
 }
-#wm3u span {
-	font-size: .77em;
-	padding-top: .2em;
-}
 #wfm a:not(.en) {
 	opacity: .3;
 	color: var(--fm-off);
@@ -1240,13 +1243,6 @@ html.y #widget.open {
 	0% {opacity:0}
 	100% {opacity:1}
 }
-#ggrid>a.glow {
-	animation: gexit .6s ease-out;
-}
-@keyframes gexit {
-	0% {box-shadow: 0 0 0 2em var(--a)}
-	100% {box-shadow: 0 0 0em 0em var(--a)}
-}
 #wzip a {
 	font-size: .4em;
 	margin: -.3em .1em;
@@ -1305,7 +1301,6 @@ html.y #widget.open {
 #widget.cmp #wtoggle {
 	font-size: 1.2em;
 }
-#widget.cmp #fshr,
 #widget.cmp #wtgrid {
 	display: none;
 }
@@ -1319,7 +1314,6 @@ html.y #widget.open {
 }
 #widget.cmp #barpos,
 #widget.cmp #barbuf {
-	height: 1.6em;
 	width: calc(100% - 11em);
 	border-radius: 0;
 	left: 5em;
@@ -1407,15 +1401,10 @@ input[type="checkbox"]+label {
 input[type="radio"]:checked+label,
 input[type="checkbox"]:checked+label {
 	color: #0e0;
-	color: var(--btn-1-bg);
-}
-input[type="checkbox"]:checked+label {
-	box-shadow: var(--btn-1-bs);
-	border-bottom: var(--btn-1-bb);
+	color: var(--a);
 }
 html.dz input {
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 }
 .opwide div>span>input+label {
 	padding: .3em 0 .3em .3em;
@@ -1589,13 +1578,10 @@ html {
 	color: var(--btn-fg);
 	background: #eee;
 	background: var(--btn-bg);
-	box-shadow: var(--btn-bs);
-	border-bottom: var(--btn-bb);
 	border-radius: .3em;
 	padding: .2em .4em;
 	font-size: 1.2em;
 	margin: .2em;
-	display: inline-block;
 	white-space: pre;
 	position: relative;
 	top: -.12em;
@@ -1604,14 +1590,20 @@ html.c .btn,
 html.a .btn {
 	border-radius: .2em;
 }
+html.cz .btn {
+	box-shadow: 0 .1em .6em rgba(255,0,185,0.5);
+	border-bottom: .2em solid #709;
+}
 html.dz .btn {
 	font-size: 1em;
+	box-shadow: 0 0 0 .1em #080 inset;
+}
+html.dz .tgl.btn.on {
+	box-shadow: 0 0 0 .1em var(--btn-1-bg) inset;
 }
 .btn:hover {
 	color: var(--btn-h-fg);
 	background: var(--btn-h-bg);
-	box-shadow: var(--btn-h-bs);
-	border-bottom: var(--btn-h-bb);
 }
 .tgl.btn.on {
 	background: #000;
@@ -1619,14 +1611,14 @@ html.dz .btn {
 	color: #fff;
 	color: var(--btn-1-fg);
 	text-shadow: none;
-	box-shadow: var(--btn-1-bs);
-	border-bottom: var(--btn-1-bb);
+}
+html.cz .tgl.btn.on {
+	box-shadow: 0 .1em .8em rgba(255,205,0,0.9);
+	border-bottom: .2em solid #e90;
 }
 .tgl.btn.on:hover {
-	color: var(--btn-1h-fg);
 	background: var(--btn-1h-bg);
-	box-shadow: var(--btn-1h-bs);
-	border-bottom: var(--btn-1h-bb);
+	color: var(--btn-1h-fg);
 }
 #detree {
 	padding: .3em .5em;
@@ -1661,24 +1653,10 @@ html.dz .btn {
 	color: var(--fg-max);
 }
 #tree ul a.hl {
-	color: #fff;
 	color: var(--btn-1-fg);
-	background: #000;
 	background: var(--btn-1-bg);
 	text-shadow: none;
 }
-#tree ul a.ld::before {
-	font-weight: bold;
-	font-family: sans-serif;
-	display: inline-block;
-	text-align: center;
-	width: 1em;
-	margin: 0 .3em 0 -1.3em;
-	color: var(--fg-max);
-	opacity: 0;
-	content: '◠';
-	animation: .5s linear infinite forwards spin, ease .25s 1 forwards fadein;
-}
 #tree ul a.par {
 	color: var(--fg-max);
 }
@@ -1710,29 +1688,19 @@ html.y #tree.nowrap .ntree a+a:hover {
 }
 .ntree a:first-child {
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 	font-size: 1.2em;
 	line-height: 0;
 }
 .dumb_loader_thing {
-	display: block;
+	display: inline-block;
 	margin: 1em .3em 1em 1em;
 	padding: 0 1.2em 0 0;
 	font-size: 4em;
-	min-width: 1em;
-	min-height: 1em;
 	opacity: 0;
 	animation: 1s linear .15s infinite forwards spin, .2s ease .15s 1 forwards fadein;
-	position: fixed;
-	top: .3em;
+	position: absolute;
 	z-index: 9;
 }
-#dlt_t {
-	left: 0;
-}
-#dlt_f {
-	right: .5em;
-}
 #files .cfg {
 	display: none;
 	font-size: 2em;
@@ -1747,7 +1715,6 @@ html.y #tree.nowrap .ntree a+a:hover {
 }
 #files th span {
 	position: relative;
-	white-space: nowrap;
 }
 #files>thead>tr>th.min,
 #files td.min {
@@ -1785,6 +1752,9 @@ html.y #tree.nowrap .ntree a+a:hover {
 	margin: .7em 0 .7em .5em;
 	padding-left: .5em;
 }
+.opwide>div>div>a {
+	line-height: 2em;
+}
 .opwide>div>h3 {
 	color: var(--fg-weak);
 	margin: 0 .4em;
@@ -1799,7 +1769,6 @@ html.y #tree.nowrap .ntree a+a:hover {
 	padding: 0;
 }
 #thumbs,
-#au_prescan,
 #au_fullpre,
 #au_os_seek,
 #au_osd_cv,
@@ -1807,8 +1776,7 @@ html.y #tree.nowrap .ntree a+a:hover {
 	opacity: .3;
 }
 #griden.on+#thumbs,
-#au_preload.on+#au_prescan,
-#au_preload.on+#au_prescan+#au_fullpre,
+#au_preload.on+#au_fullpre,
 #au_os_ctl.on+#au_os_seek,
 #au_os_ctl.on+#au_os_seek+#au_osd_cv,
 #u2turbo.on+#u2tdate {
@@ -1848,11 +1816,6 @@ html.y #tree.nowrap .ntree a+a:hover {
 	margin: 0;
 	padding: 0;
 }
-#unpost td:nth-child(3),
-#unpost td:nth-child(4) {
-	text-align: right;
-}
-#shui,
 #rui {
 	background: #fff;
 	background: var(--bg);
@@ -1868,51 +1831,34 @@ html.y #tree.nowrap .ntree a+a:hover {
 	padding: 1em;
 	z-index: 765;
 }
-#shui div+div,
 #rui div+div {
 	margin-top: 1em;
 }
-#shui table,
 #rui table {
 	width: 100%;
 	border-collapse: collapse;
 }
-#shui button {
-	margin: 0 1em 0 0;
-}
-#shui .btn {
-	font-size: 1em;
-}
-#shui td {
-	padding: .8em 0;
-}
-#shui td+td,
 #rui td+td {
 	padding: .2em 0 .2em .5em;
 }
 #rn_vadv input {
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 }
-#shui td+td,
 #rui td+td,
-#shui td input[type="text"],
 #rui td input[type="text"] {
 	width: 100%;
 }
-#shui td.exs input[type="text"] {
-	width: 3em;
-}
 #rn_f.m td:first-child {
 	white-space: nowrap;
 }
 #rn_f.m td+td {
 	width: 50%;
 }
-#rn_f .err td,
-#rn_f .err input[readonly],
-#rui .ng input[readonly] {
-	color: var(--err-fg);
+#rn_f .err td {
+	background: var(--err-bg);
+	color: var(--fg-max);
+}
+#rn_f .err input[readonly] {
 	background: var(--err-bg);
 }
 #rui input[readonly] {
@@ -1960,7 +1906,6 @@ html.y #doc {
 #doc.mdo {
 	white-space: normal;
 	font-family: sans-serif;
-	font-family: var(--font-main), sans-serif;
 }
 #doc.prism * {
 	line-height: 1.5em;
@@ -2020,7 +1965,6 @@ a.btn,
 }
 #hkhelp td:first-child {
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 }
 html.noscroll,
 html.noscroll .sbar {
@@ -2230,7 +2174,6 @@ html.y #bbox-overlay figcaption a {
 }
 #bbox-halp {
 	color: var(--fg-max);
-	background: #fff;
 	background: var(--bg);
 	position: absolute;
 	top: 0;
@@ -2530,7 +2473,6 @@ html.y #bbox-overlay figcaption a {
 }
 #op_up2k.srch td.prog {
 	font-family: sans-serif;
-	font-family: var(--font-main), sans-serif;
 	font-size: 1em;
 	width: auto;
 }
@@ -2545,7 +2487,6 @@ html.y #bbox-overlay figcaption a {
 	white-space: nowrap;
 	display: inline-block;
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 }
 #u2etas.o {
 	width: 20em;
@@ -2615,7 +2556,6 @@ html.y #bbox-overlay figcaption a {
 #u2cards span {
 	color: var(--fg-max);
 	font-family: 'scp', monospace;
-	font-family: var(--font-mono), 'scp', monospace;
 }
 #u2cards > a:nth-child(4) > span {
 	display: inline-block;
@@ -2696,25 +2636,23 @@ html.b #u2conf a.b:hover {
 #u2conf input[type="checkbox"]:checked+label {
 	position: relative;
 	cursor: pointer;
-	background: var(--btn-bg);
-	box-shadow: var(--btn-bs);
-	border-bottom: var(--btn-bb);
+	background: var(--u2-o-bg);
+	border-bottom: .2em solid var(--u2-o-b1);
+	box-shadow: 0 .1em .3em var(--u2-o-sh) inset;
 	text-shadow: 1px 1px 1px #000, 1px -1px 1px #000, -1px -1px 1px #000, -1px 1px 1px #000;
 }
 #u2conf input[type="checkbox"]:checked+label {
-	background: var(--btn-1-bg);
-	box-shadow: var(--btn-1-bs);
-	border-bottom: var(--btn-1-bb);
+	background: var(--u2-o-1-bg);
+	border-bottom: .2em solid var(--u2-o-1-b1);
+	box-shadow: 0 .1em .5em var(--u2-o-1-sh);
 }
 #u2conf input[type="checkbox"]+label:hover {
-	background: var(--btn-h-bg);
-	box-shadow: var(--btn-h-bs);
-	border-bottom: var(--btn-h-bb);
+	box-shadow: 0 .1em .3em var(--u2-o-h-sh);
+	border-color: var(--u2-o-h-b1);
+	background: var(--u2-o-h-bg);
 }
 #u2conf input[type="checkbox"]:checked+label:hover {
-	background: var(--btn-1h-bg);
-	box-shadow: var(--btn-1h-bs);
-	border-bottom: var(--btn-1h-bb);
+	background: var(--u2-o-1h-bg);
 }
 #op_up2k.srch #u2conf td:nth-child(2)>*,
 #op_up2k.srch #u2conf td:nth-child(3)>* {
@@ -2783,7 +2721,6 @@ html.b #u2conf a.b:hover {
 }
 .prog {
 	font-family: 'scp', monospace, monospace;
-	font-family: var(--font-mono), 'scp', monospace, monospace;
 }
 #u2tab span.inf,
 #u2tab span.ok,
@@ -2814,7 +2751,6 @@ html.b #u2conf a.b:hover {
 	padding-left: .2em;
 }
 .fsearch_explain {
-	color: var(--a-dark);
 	padding-left: .7em;
 	font-size: 1.1em;
 	line-height: 0;
@@ -3104,30 +3040,18 @@ html.by #u2cards a.act {
 
 
 
+html.cy #wrap {
+	color: #000;
+}
 html.cy .mdo a {
 	background: #f00;
 }
-html.cy #wrap,
-html.cy #acc_info a,
 html.cy #op_up2k,
 html.cy #files,
 html.cy #files a,
 html.cy #files tbody div a:last-child {
 	color: #000;
 }
-html.cy #u2tab a,
-html.cy #u2cards a {
-	color: #f00;
-}
-html.cy #unpost a {
-	color: #ff0;
-}
-html.cy #barbuf {
-	filter: hue-rotate(267deg) brightness(0.8) contrast(4);
-}
-html.cy #pvol {
-	filter: hue-rotate(4deg) contrast(2.2);
-}
 
 
 
@@ -3205,7 +3129,7 @@ html.d #treepar {
 		margin-top: 1.7em;
 	}
 }
-@supports (display: grid) and (gap: 1em) {
+@supports (display: grid) {
 	#ggrid {
 		display: grid;
 		margin: 0em 0.25em;
@@ -3230,24 +3154,3 @@ html.d #treepar {
 		padding: 0.2em;
 	}
 }
-
-
-
-
-
-@media (prefers-reduced-motion) {
-	@keyframes spin { }
-	@keyframes gexit { }
-	@keyframes bounce { }
-	@keyframes bounceFromLeft { }
-	@keyframes bounceFromRight { }
-
-	#ggrid>a:before,
-	#widget.anim,
-	#u2tabw,
-	.dropdesc,
-	.dropdesc b,
-	.dropdesc>div>div {
-		transition: none;
-	}
-}

copyparty/web/browser.html

@@ -6,10 +6,10 @@
 	<title>{{ title }}</title>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=0.8, minimum-scale=0.6">
-	<meta name="theme-color" content="#{{ tcolor }}">
+	<meta name="theme-color" content="#333">
+{{ html_head }}
 	<link rel="stylesheet" media="screen" href="{{ r }}/.cpr/ui.css?_={{ ts }}">
 	<link rel="stylesheet" media="screen" href="{{ r }}/.cpr/browser.css?_={{ ts }}">
-{{ html_head }}
 	{%- if css %}
 	<link rel="stylesheet" media="screen" href="{{ css }}_={{ ts }}">
 	{%- endif %}
@@ -67,14 +67,14 @@
 	<div id="op_up2k" class="opview"></div>
 
 	<div id="op_cfg" class="opview opbox opwide"></div>
-
+	
 	<h1 id="path">
 		<a href="#" id="entree">🌲</a>
 		{%- for n in vpnodes %}
 		<a href="{{ r }}/{{ n[0] }}">{{ n[1] }}</a>
 		{%- endfor %}
 	</h1>
-
+	
 	<div id="tree"></div>
 
 <div id="wrap">
@@ -108,42 +108,47 @@
 
 {%- for f in files %}
 <tr><td>{{ f.lead }}</td><td><a href="{{ f.href }}">{{ f.name|e }}</a></td><td>{{ f.sz }}</td>
-{%- if f.tags is defined %}
-	{%- for k in taglist %}<td>{{ f.tags[k] }}</td>{%- endfor %}
-{%- endif %}<td>{{ f.ext }}</td><td>{{ f.dt }}</td></tr>
+	{%- if f.tags is defined %}
+		{%- for k in taglist %}
+<td>{{ f.tags[k] }}</td>
+		{%- endfor %}
+	{%- endif %}
+<td>{{ f.ext }}</td><td>{{ f.dt }}</td></tr>
 {%- endfor %}
 
 		</tbody>
 	</table>
-
+	
 	<div id="epi" class="logue">{{ "" if sb_lg else logues[1] }}</div>
 
 	<h2 id="wfp"><a href="{{ r }}/?h" id="goh">control-panel</a></h2>
-
+	
 	<a href="#" id="repl">π</a>
 
 </div>
 
+	{%- if srv_info %}
 	<div id="srv_info"><span>{{ srv_info }}</span></div>
+	{%- endif %}
 
 	<div id="widget"></div>
 
 	<script>
-		var SR = "{{ r }}",
-			CGV1 = {{ cgv1 }},
+		var SR = {{ r|tojson }},
 			CGV = {{ cgv|tojson }},
 			TS = "{{ ts }}",
 			dtheme = "{{ dtheme }}",
 			srvinf = "{{ srv_info }}",
+			s_name = "{{ s_name }}",
 			lang = "{{ lang }}",
 			dfavico = "{{ favico }}",
-			have_tags_idx = {{ have_tags_idx }},
+			have_tags_idx = {{ have_tags_idx|tojson }},
 			sb_lg = "{{ sb_lg }}",
+			txt_ext = "{{ txt_ext }}",
 			logues = {{ logues|tojson if sb_lg else "[]" }},
 			ls0 = {{ ls0|tojson }};
 
-		var STG = window.localStorage;
-		document.documentElement.className = (STG && STG.cpp_thm) || dtheme;
+		document.documentElement.className = localStorage.cpp_thm || dtheme;
 	</script>
 	<script src="{{ r }}/.cpr/util.js?_={{ ts }}"></script>
 	<script src="{{ r }}/.cpr/baguettebox.js?_={{ ts }}"></script>
@@ -155,4 +160,3 @@
 </body>
 
 </html>
-

copyparty/web/browser2.html

@@ -6,6 +6,7 @@
 	<title>{{ title }}</title>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=0.8">
+{{ html_head }}
 	<style>
 		html{font-family:sans-serif}
 		td{border:1px solid #999;border-width:1px 1px 0 0;padding:0 5px}
@@ -51,13 +52,12 @@
 
 		</tbody>
 	</table>
-
+	
 	{%- if logues[1] %}
 	<div>{{ logues[1] }}</div><br />
 	{%- endif %}
-
+	
 	<h2><a href="{{ r }}/{{ url_suf }}{{ url_suf and '&amp;' or '?' }}h">control-panel</a></h2>
 
 </body>
 </html>
-