v0.9.13

copyparty/__version__.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-VERSION = (0, 9, 11)
+VERSION = (0, 9, 13)
 CODENAME = "the strongest music server"
 BUILD_DT = (2021, 3, 23)
 

copyparty/httpcli.py

@@ -1295,7 +1295,7 @@ class HttpCli(object):
 
                 tags = {}
                 f["tags"] = tags
-                
+
                 if not r:
                     continue
 
@@ -1306,7 +1306,7 @@ class HttpCli(object):
                     tags[k] = v
 
         if icur:
-            taglist = [k for k in vn.flags["mte"].split(",") if k in taglist]
+            taglist = [k for k in vn.flags.get("mte", "").split(",") if k in taglist]
             for f in dirs:
                 f["tags"] = {}
 
@@ -1379,7 +1379,9 @@ class HttpCli(object):
             ts=ts,
             perms=json.dumps(perms),
             taglist=taglist,
-            tag_order=json.dumps(vn.flags["mte"].split(",")),
+            tag_order=json.dumps(
+                vn.flags["mte"].split(",") if "mte" in vn.flags else []
+            ),
             have_up2k_idx=("e2d" in vn.flags),
             have_tags_idx=("e2t" in vn.flags),
             logues=logues,

copyparty/up2k.py

@@ -288,9 +288,9 @@ class Up2k(object):
         self.pp.n = next(dbw[0].execute("select count(w) from up"))[0]
 
         excl = [
-            vol.realpath + d.vpath[len(vol.vpath) :]
+            vol.realpath + "/" + d.vpath[len(vol.vpath) :].lstrip("/")
             for d in all_vols
-            if d.vpath.startswith(vol.vpath + "/")
+            if d != vol and (d.vpath.startswith(vol.vpath + "/") or not vol.vpath)
         ]
         n_add = self._build_dir(dbw, top, set(excl), top)
         n_rm = self._drop_lost(dbw[0], top)