Merge branch '9001:hovudstraum' into hovudstraum

README.md

@@ -152,6 +152,7 @@ just run **[copyparty-sfx.py](https://github.com/9001/copyparty/releases/latest/
 * or install [on arch](#arch-package) ╱ [on NixOS](#nixos-module) ╱ [through nix](#nix-package)
 * or if you are on android, [install copyparty in termux](#install-on-android)
 * or maybe you have a [synology nas / dsm](./docs/synology-dsm.md)
+* or if you have [uv](https://docs.astral.sh/uv/) installed, run `uv tool run copyparty`
 * or if your computer is messed up and nothing else works, [try the pyz](#zipapp)
 * or if your OS is dead, give the [bootable flashdrive / cd-rom](https://a.ocv.me/pub/stuff/edcd001/enterprise-edition/) a spin
 * or if you don't trust copyparty yet and want to isolate it a little, then...

contrib/nixos/modules/copyparty.nix

@@ -22,7 +22,7 @@ let
   mkValueString =
     value:
     if isList value then
-      (concatStringsSep ", " (map mkValueString value))
+      (concatStringsSep "," (map mkValueString value))
     else if isAttrs value then
       "\n" + (mkAttrsString value)
     else

copyparty/httpcli.py

@@ -911,7 +911,7 @@ class HttpCli(object):
         if status == 304:
             self.out_headers.pop("Content-Length", None)
             self.out_headers.pop("Content-Type", None)
-            self.out_headerlist.clear()
+            self.out_headerlist[:] = []
             if self.k304():
                 self.keepalive = False
         else:

copyparty/up2k.py

@@ -2827,7 +2827,7 @@ class Up2k(object):
         # v5a -> v5b
         # store rd+fn rather than warks to support nohash vols
         try:
-            cur.execute("select ws, rd, fn from iu limit 1").fetchone()
+            cur.execute("select c, w, rd, fn from iu limit 1").fetchone()
             return
         except:
             pass

docs/devnotes.md

@@ -415,6 +415,8 @@ to get started, first `cd` into the `scripts` folder
 
 * if you want to build the `.pyz` standalone "binary", now run `./make-pyz.sh`
 
+* if you want to build the `tar.gz` for use in a linux-distro package, now run `./make-tgz-release.sh theVersionNumber`
+
 * if you want to build a pypi package, now run `./make-pypi-release.sh d`
 
 * if you want to build a docker-image, you have two options: