From bacb335e3812e02e467d948fe2c3fbe2917395e2 Mon Sep 17 00:00:00 2001 From: hbrain Date: Thu, 4 Jun 2026 21:58:14 +0000 Subject: [PATCH] Change web root path on webserver --- mvlog_worker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mvlog_worker.py b/mvlog_worker.py index 097465b..ca50f04 100755 --- a/mvlog_worker.py +++ b/mvlog_worker.py @@ -29,6 +29,7 @@ LOCK_NAME = ".movmaker-lock" ENABLED_NAME = ".movmaker-enabled" PREVIEW_NAME = ".movmaker-preview" HIDDEN_NAME = ".mvlog-hidden" +PERMALINK_NAME = ".mvlog-permalink" ARTICLE_ID_NAME = ".mvlog-id" INTRO_LOGO_ALPHA = "0.5" MVLOG_WORKER_RECOMMENDED_INTERVAL_MINUTES = 5 @@ -97,7 +98,7 @@ entries = [] for dirpath, dirnames, filenames in os.walk(root): dirnames[:] = [d for d in dirnames if d != '.movmaker-lock'] for name in filenames: - if name in {'.movmaker-state.json', '.movmaker-enabled', '.movmaker-preview', '.mvlog-hidden', '.mvlog-id', '.mvlog-hide-map'}: + if name in {'.movmaker-state.json', '.movmaker-enabled', '.movmaker-preview', '.mvlog-hidden', '.mvlog-permalink', '.mvlog-id', '.mvlog-hide-map'}: continue path = os.path.join(dirpath, name) rel = os.path.relpath(path, root) @@ -171,7 +172,7 @@ def write_state(host: str | None, job_dir: str, state: dict) -> None: def copy_job_from_remote(host: str, job_dir: str, local_input: Path) -> None: local_input.mkdir(parents=True, exist_ok=True) remote_cmd = ( - f"tar --exclude={quote(LOCK_NAME)} --exclude={quote(STATE_NAME)} " + f"tar --exclude={quote(LOCK_NAME)} --exclude={quote(STATE_NAME)} --exclude={quote(PERMALINK_NAME)} " f"-C {remote_q(job_dir)} -cf - ." ) p1 = subprocess.Popen(["ssh", host, remote_cmd], stdout=subprocess.PIPE) @@ -422,7 +423,7 @@ def main() -> int: parser = argparse.ArgumentParser(description="Render changed MVLog input dirs from a remote web server.") parser.add_argument("--local", action="store_true", help="Treat remote paths as local; skip SSH") parser.add_argument("--host", default="192.168.0.204", help="SSH host for the web server") - parser.add_argument("--remote-root", default="/var/www/html/mvlog", help="Remote MVLog web root") + parser.add_argument("--remote-root", default="/var/www/html", help="Remote MVLog web root") parser.add_argument("--work-dir", default=str(Path.home() / ".cache" / "mvlog-worker"), help="Local work directory") parser.add_argument("--job", action="append", help="Only process this input dir name; may be repeated") parser.add_argument("--force", action="store_true", help="Render even if fingerprint is unchanged")