mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 17:12:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

let controlpanel rescan button override lack of e2dsa

Browse source
This commit is contained in:
ed 2023-02-26 18:27:10 +00:00
parent 604e5dfaaf
commit 4de028fc3b
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copyparty/httpcli.py
View file

@ -2939,7 +2939,7 @@ class HttpCli(object):
vn, _ = self.asrv.vfs.get(self.vpath, self.uname, True, True) 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) x = self.conn.hsrv.broker.ask("up2k.rescan", *args)
err = x.get() err = x.get()

18
copyparty/up2k.py
View file

@ -188,11 +188,11 @@ class Up2k(object):
self.gid += 1 self.gid += 1
self.log("reload #{} initiated".format(self.gid)) self.log("reload #{} initiated".format(self.gid))
all_vols = self.asrv.vfs.all_vols 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: def deferred_init(self) -> None:
all_vols = self.asrv.vfs.all_vols 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: if self.stop:
# up-mt consistency not guaranteed if init is interrupted; # up-mt consistency not guaranteed if init is interrupted;
@ -263,11 +263,13 @@ class Up2k(object):
} }
return json.dumps(ret, indent=4) 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: if not wait and self.pp:
return "cannot initiate; scan is already in progress" return "cannot initiate; scan is already in progress"
args = (all_vols, scan_vols) args = (all_vols, scan_vols, fscan)
Daemon( Daemon(
self.init_indexes, self.init_indexes,
"up2k-rescan-{}".format(scan_vols[0] if scan_vols else "all"), "up2k-rescan-{}".format(scan_vols[0] if scan_vols else "all"),
@ -342,7 +344,7 @@ class Up2k(object):
if vols: if vols:
cooldown = now + 10 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: if err:
for v in vols: for v in vols:
self.need_rescan.add(v) self.need_rescan.add(v)
@ -504,7 +506,9 @@ class Up2k(object):
return True, ret 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 gid = self.gid
while self.pp and gid == self.gid: while self.pp and gid == self.gid:
time.sleep(0.1) time.sleep(0.1)
@ -590,7 +594,7 @@ class Up2k(object):
if "e2d" in vol.flags: if "e2d" in vol.flags:
have_e2d = True have_e2d = True
if "e2ds" in vol.flags: if "e2ds" in vol.flags or fscan:
self.volstate[vol.vpath] = "busy (hashing files)" self.volstate[vol.vpath] = "busy (hashing files)"
_, vac = self._build_file_index(vol, list(all_vols.values())) _, vac = self._build_file_index(vol, list(all_vols.values()))
if vac: if vac: