Fix server exit hang on MacOS, cleanup, include directories in zips, natural sort.

cista-front/src/components/HeaderSelected.vue

@@ -138,7 +138,8 @@ const download = async () => {
     }
   }
   // Otherwise, zip and download
-  linkdl(`/zip/${Array.from(sel.keys).join('+')}/download.zip`)
+  const name = sel.keys.length === 1 ? sel.docs[sel.keys[0]].name : 'download'
+  linkdl(`/zip/${Array.from(sel.keys).join('+')}/${name}.zip`)
   documentStore.selected.clear()
 }
 </script>

cista-front/src/components/UploadButton.vue

@@ -55,11 +55,16 @@ async function sendChunk(file: File, start: number, end: number) {
   }
 }
 
-async function uploadFileChangeHandler(event: Event) {
+async function uploadHandler(event: Event) {
   const target = event.target as HTMLInputElement
   const chunkSize = 1 << 20
-  if (target && target.files && target.files.length > 0) {
+  if (!target?.files?.length) {
-    const file = target.files[0]
+    documentStore.error = 'No files selected'
+    return
+  }
+  for (const idx in target.files) {
+    const file = target.files[idx]
+    console.log('Uploading', file)
     const numChunks = Math.ceil(file.size / chunkSize)
     const document = documentStore.pushUploadingDocuments(file.name)
     open('bottomRight')
@@ -78,14 +83,14 @@ async function uploadFileChangeHandler(event: Event) {
   <template>
     <input
       ref="fileUploadButton"
-      @change="uploadFileChangeHandler"
+      @change="uploadHandler"
       class="upload-input"
       type="file"
       multiple
     />
     <input
       ref="folderUploadButton"
-      @change="uploadFileChangeHandler"
+      @change="uploadHandler"
       class="upload-input"
       type="file"
       webkitdirectory

cista/app.py

@@ -1,16 +1,22 @@
 import asyncio
+import datetime
 import mimetypes
+from collections import deque
 from concurrent.futures import ThreadPoolExecutor
 from importlib.resources import files
+from pathlib import Path
+from stat import S_IFDIR, S_IFREG
 from urllib.parse import unquote
 from wsgiref.handlers import format_date_time
 
 import brotli
 import sanic.helpers
 from blake3 import blake3
+from natsort import natsorted, ns
 from sanic import Blueprint, Sanic, empty, raw
 from sanic.exceptions import Forbidden, NotFound
 from sanic.log import logging
+from stream_zip import ZIP_AUTO, stream_zip
 
 from cista import auth, config, session, watching
 from cista.api import bp
@@ -168,14 +174,6 @@ async def wwwroot(req, path=""):
     return raw(data, headers=headers)
 
 
-import datetime
-from collections import deque
-from pathlib import Path
-from stat import S_IFREG
-
-from stream_zip import ZIP_AUTO, stream_zip
-
-
 @app.get("/zip/<keys>/<zipfile:ext=zip>")
 async def zip_download(req, keys, zipfile, ext):
     """Download a zip archive of the given keys"""
@@ -190,17 +188,13 @@ async def zip_download(req, keys, zipfile, ext):
                 rel = None
                 if relpar or attr.key in wanted:
                     rel = [*relpar, name] if relpar else [name]
-                    wanted.remove(attr.key)
+                    wanted.discard(attr.key)
-                if isinstance(attr, DirEntry):
+                isdir = isinstance(attr, DirEntry)
+                if isdir:
                     q.append((loc, rel, attr.dir))
-                elif rel:
+                if rel:
                     files.append(
-                        (
+                        ("/".join(rel), Path(watching.rootpath.joinpath(*loc)))
-                            "/".join(rel),
-                            Path(watching.rootpath.joinpath(*loc)),
-                            attr.mtime,
-                            attr.size,
-                        )
                     )
 
     if not files:
@@ -211,13 +205,16 @@ async def zip_download(req, keys, zipfile, ext):
     if wanted:
         raise NotFound("Files not found", context={"missing": wanted})
 
-    for rel, p, mtime, size in files:
+    files = natsorted(files, key=lambda f: f[0], alg=ns.IGNORECASE)
-        if not p.is_file():
-            raise NotFound(f"File not found {rel}")
 
     def local_files(files):
-        for rel, p, mtime, size in files:
+        for rel, p in files:
-            modified = datetime.datetime.fromtimestamp(mtime, datetime.UTC)
+            s = p.stat()
+            size = s.st_size
+            modified = datetime.datetime.fromtimestamp(s.st_mtime, datetime.UTC)
+            if p.is_dir():
+                yield rel, modified, S_IFDIR | 0o755, ZIP_AUTO(size), b""
+            else:
                 yield rel, modified, S_IFREG | 0o644, ZIP_AUTO(size), contents(p)
 
     def contents(name):

cista/auth.py

@@ -71,7 +71,7 @@ def verify(request, *, privileged=False):
             raise Forbidden("Access Forbidden: Only for privileged users")
     elif config.config.public or request.ctx.user:
         return
-    raise Unauthorized("Login required", "cookie", context={"redirect": "/login"})
+    raise Unauthorized("Login required", "cookie")
 
 
 bp = Blueprint("auth")

cista/serve.py

@@ -30,7 +30,10 @@ def run(*, dev=False):
         reload_dir={confdir, wwwroot},
         access_log=True,
     )  # type: ignore
+    if dev:
         Sanic.serve()
+    else:
+        Sanic.serve_single()
 
 
 def check_cert(certdir, domain):

cista/util/filename.py

@@ -10,4 +10,7 @@ def sanitize(filename: str) -> str:
     filename = filename.replace("\\", "-")
     filename = sanitize_filepath(filename)
     filename = filename.strip("/")
-    return PurePosixPath(filename).as_posix()
+    p = PurePosixPath(filename)
+    if any(n.startswith(".") for n in p.parts):
+        raise ValueError("Filenames starting with dot are not allowed")
+    return p.as_posix()

cista/watching.py

@@ -1,10 +1,10 @@
 import asyncio
 import shutil
+import sys
 import threading
 import time
 from pathlib import Path, PurePosixPath
 
-import inotify.adapters
 import msgspec
 from sanic.log import logging
 
@@ -31,6 +31,7 @@ disk_usage = None
 
 def watcher_thread(loop):
     global disk_usage, rootpath
+    import inotify.adapters
 
     while True:
         rootpath = config.config.path
@@ -39,7 +40,6 @@ def watcher_thread(loop):
         with tree_lock:
             # Initialize the tree from filesystem
             tree[""] = walk(rootpath)
-        print(" ".join(tree[""].dir.keys()))
         msg = format_tree()
         if msg != old:
             asyncio.run_coroutine_threadsafe(broadcast(msg), loop)
@@ -74,6 +74,28 @@ def watcher_thread(loop):
         i = None  # Free the inotify object
 
 
+def watcher_thread_poll(loop):
+    global disk_usage, rootpath
+
+    while not quit:
+        rootpath = config.config.path
+        old = format_tree() if tree[""] else None
+        with tree_lock:
+            # Initialize the tree from filesystem
+            tree[""] = walk(rootpath)
+        msg = format_tree()
+        if msg != old:
+            asyncio.run_coroutine_threadsafe(broadcast(msg), loop)
+
+        # Disk usage update
+        du = shutil.disk_usage(rootpath)
+        if du != disk_usage:
+            disk_usage = du
+            asyncio.run_coroutine_threadsafe(broadcast(format_du()), loop)
+
+        time.sleep(1.0)
+
+
 def format_du():
     return msgspec.json.encode(
         {
@@ -201,7 +223,10 @@ async def broadcast(msg):
 
 async def start(app, loop):
     config.load_config()
-    app.ctx.watcher = threading.Thread(target=watcher_thread, args=[loop])
+    app.ctx.watcher = threading.Thread(
+        target=watcher_thread if sys.platform == "linux" else watcher_thread_poll,
+        args=[loop],
+    )
     app.ctx.watcher.start()
 
 

pyproject.toml

@@ -20,11 +20,12 @@ dependencies = [
     "docopt",
     "inotify",
     "msgspec",
+    "natsort",
     "pathvalidate",
     "pyjwt",
     "sanic",
-    "tomli_w",
     "stream-zip",
+    "tomli_w",
 ]
 
 [project.urls]