From 4de028fc3bdbee42bb530b3a52bbd7b5835c1af6 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Sun, 26 Feb 2023 18:27:10 +0000
Subject: [PATCH] let controlpanel rescan button override lack of e2dsa

---
 copyparty/httpcli.py |  2 +-
 copyparty/up2k.py    | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/copyparty/httpcli.py b/copyparty/httpcli.py
index 298807bf..efe6d028 100644
--- a/copyparty/httpcli.py
+++ b/copyparty/httpcli.py
@@ -2939,7 +2939,7 @@ class HttpCli(object):
 
         vn, _ = self.asrv.vfs.get(self.vpath, self.uname, True, True)
 
-        args = [self.asrv.vfs.all_vols, [vn.vpath], False]
+        args = [self.asrv.vfs.all_vols, [vn.vpath], False, True]
 
         x = self.conn.hsrv.broker.ask("up2k.rescan", *args)
         err = x.get()
diff --git a/copyparty/up2k.py b/copyparty/up2k.py
index 32a21c89..0286c2d5 100644
--- a/copyparty/up2k.py
+++ b/copyparty/up2k.py
@@ -188,11 +188,11 @@ class Up2k(object):
         self.gid += 1
         self.log("reload #{} initiated".format(self.gid))
         all_vols = self.asrv.vfs.all_vols
-        self.rescan(all_vols, list(all_vols.keys()), True)
+        self.rescan(all_vols, list(all_vols.keys()), True, False)
 
     def deferred_init(self) -> None:
         all_vols = self.asrv.vfs.all_vols
-        have_e2d = self.init_indexes(all_vols, [])
+        have_e2d = self.init_indexes(all_vols, [], False)
 
         if self.stop:
             # up-mt consistency not guaranteed if init is interrupted;
@@ -263,11 +263,13 @@ class Up2k(object):
         }
         return json.dumps(ret, indent=4)
 
-    def rescan(self, all_vols: dict[str, VFS], scan_vols: list[str], wait: bool) -> str:
+    def rescan(
+        self, all_vols: dict[str, VFS], scan_vols: list[str], wait: bool, fscan: bool
+    ) -> str:
         if not wait and self.pp:
             return "cannot initiate; scan is already in progress"
 
-        args = (all_vols, scan_vols)
+        args = (all_vols, scan_vols, fscan)
         Daemon(
             self.init_indexes,
             "up2k-rescan-{}".format(scan_vols[0] if scan_vols else "all"),
@@ -342,7 +344,7 @@ class Up2k(object):
 
             if vols:
                 cooldown = now + 10
-                err = self.rescan(self.asrv.vfs.all_vols, vols, False)
+                err = self.rescan(self.asrv.vfs.all_vols, vols, False, False)
                 if err:
                     for v in vols:
                         self.need_rescan.add(v)
@@ -504,7 +506,9 @@ class Up2k(object):
 
         return True, ret
 
-    def init_indexes(self, all_vols: dict[str, VFS], scan_vols: list[str]) -> bool:
+    def init_indexes(
+        self, all_vols: dict[str, VFS], scan_vols: list[str], fscan: bool
+    ) -> bool:
         gid = self.gid
         while self.pp and gid == self.gid:
             time.sleep(0.1)
@@ -590,7 +594,7 @@ class Up2k(object):
             if "e2d" in vol.flags:
                 have_e2d = True
 
-            if "e2ds" in vol.flags:
+            if "e2ds" in vol.flags or fscan:
                 self.volstate[vol.vpath] = "busy (hashing files)"
                 _, vac = self._build_file_index(vol, list(all_vols.values()))
                 if vac: