restore mechanism does now rename the source

no more state file 'restore.done'
directory name: restore -> restore-runing -> restore-done
This commit is contained in:
zolliker committed 2026-10-22 09:06:28 +02:00
1 parent 7d6cde8053
commit e4feb3112d
1 file changed
+4 -4
+4 -4
View File
@@ -65,7 +65,7 @@ def restore() -> bool:
# "/./" marks where the relative path starts, so with -R each subtree
# lands under $HOME with its original relative path
cmd = ["rsync", "-aR", *exclude_args(), "-e", SSH_OPTS,
*[f"{CENTRAL}:{REMOTE_DIR}/restore/./{d}" for d in get_dirs()], f"{HOME}/"]
*[f"{CENTRAL}:{REMOTE_DIR}/restore-running/./{d}" for d in get_dirs()], f"{HOME}/"]
return subprocess.run(cmd).returncode == 0
@@ -77,13 +77,13 @@ def cmd_restore():
except Exception as e:
log(repr(e))
time.sleep(1)
dorestore = f"{REMOTE_DIR}/do.restore"
if ssh(f"ls {dorestore}") is None:
if ssh(f"ls {REMOTE_DIR}/restore") is None:
log("no restore needed")
else:
ssh(f"mv {REMOTE_DIR}/restore {REMOTE_DIR}/restore-running")
if restore():
log("restore done")
ssh(f"rm {dorestore}")
ssh(f"mv {REMOTE_DIR}/restore-running {REMOTE_DIR}/restore-done")
return True
else:
log("restore failed")