v1.3.9

copyparty/__main__.py

@@ -675,7 +675,7 @@ def main(argv: Optional[list[str]] = None) -> None:
     if argv is None:
         argv = sys.argv
 
-    f = '\033[36mcopyparty v{} "\033[35m{}\033[36m" ({})\n{}\033[0;36m\n   sqlite v{} | jinja2 v{} | pyftpd v{}\n\033[0m\n'
+    f = '\033[36mcopyparty v{} "\033[35m{}\033[36m" ({})\n{}\033[0;36m\n   sqlite v{} | jinja2 v{} | pyftpd v{}\n\033[0m'
     f = f.format(
         S_VERSION,
         CODENAME,

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (1, 3, 8)
+VERSION = (1, 3, 9)
 CODENAME = "god dag"
-BUILD_DT = (2022, 7, 27)
+BUILD_DT = (2022, 8, 4)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/authsrv.py

@@ -1036,7 +1036,7 @@ class AuthSrv(object):
                 vol.flags["fk"] = int(fk) if fk is not True else 8
                 have_fk = True
 
-        if have_fk and re.match("^[0-9\.]+$", self.args.fk_salt):
+        if have_fk and re.match(r"^[0-9\.]+$", self.args.fk_salt):
             self.log("filekey salt: {}".format(self.args.fk_salt))
 
         for vol in vfs.all_vols.values():

copyparty/fsutil.py

@@ -6,12 +6,12 @@ import re
 import time
 
 from .__init__ import ANYWIN, MACOS
-from .bos import bos
 from .authsrv import AXS, VFS
+from .bos import bos
 from .util import chkcmd, min_ex
 
 try:
-    from typing import Any, Optional, Union
+    from typing import Optional, Union
 
     from .util import RootLogger
 except:

copyparty/svchub.py

@@ -20,7 +20,7 @@ try:
     from types import FrameType
 
     import typing
-    from typing import Optional, Union
+    from typing import Any, Optional, Union
 except:
     pass
 
@@ -467,7 +467,7 @@ class SvcHub(object):
             if self.logf:
                 self.logf.write(msg)
 
-    def pr(self, *a, **ka):
+    def pr(self, *a: Any, **ka: Any) -> None:
         with self.log_mutex:
             print(*a, **ka)
 

copyparty/up2k.py

@@ -32,8 +32,8 @@ from .util import (
     ProgressPrinter,
     absreal,
     atomic_move,
-    djoin,
     db_ex_chk,
+    djoin,
     fsenc,
     min_ex,
     quotep,
@@ -143,7 +143,8 @@ class Up2k(object):
             if self.sqlite_ver < (3, 9):
                 self.no_expr_idx = True
         else:
-            self.log("could not initialize sqlite3, will use in-memory registry only")
+            t = "could not initialize sqlite3, will use in-memory registry only"
+            self.log(t, 3)
 
         if ANYWIN:
             # usually fails to set lastmod too quickly

copyparty/util.py

@@ -84,8 +84,6 @@ else:
     from urllib import quote  # pylint: disable=no-name-in-module
     from urllib import unquote  # pylint: disable=no-name-in-module
 
-_: Any = (mp, BytesIO, quote, unquote)
-__all__ = ["mp", "BytesIO", "quote", "unquote"]
 
 try:
     struct.unpack(b">i", b"idgi")
@@ -258,6 +256,10 @@ VERSIONS = "copyparty v{} ({})\n{}\n   sqlite v{} | jinja v{} | pyftpd v{}".form
 )
 
 
+_: Any = (mp, BytesIO, quote, unquote, SQLITE_VER, JINJA_VER, PYFTPD_VER)
+__all__ = ["mp", "BytesIO", "quote", "unquote", "SQLITE_VER", "JINJA_VER", "PYFTPD_VER"]
+
+
 class Cooldown(object):
     def __init__(self, maxage: float) -> None:
         self.maxage = maxage

copyparty/web/browser.js

@@ -824,7 +824,7 @@ ebi('op_cfg').innerHTML = (
 	'		<a id="griden" class="tgl btn" href="#" tt="' + L.wt_grid + '">田 the grid</a>\n' +
 	'		<a id="thumbs" class="tgl btn" href="#" tt="' + L.ct_thumb + '">🖼️ thumbs</a>\n' +
 	'		<a id="dotfiles" class="tgl btn" href="#" tt="' + L.ct_dots + '">dotfiles</a>\n' +
-	'		<a id="dir1st" class="tgl btn" href="#" tt="' + L.ct_dir1st + '">↑ dirs</a>\n' +
+	'		<a id="dir1st" class="tgl btn" href="#" tt="' + L.ct_dir1st + '">📁 first</a>\n' +
 	'		<a id="ireadme" class="tgl btn" href="#" tt="' + L.ct_readme + '">📜 readme</a>\n' +
 	'	</div>\n' +
 	'</div>\n' +