marijo/movmaker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change web root path on webserver

Browse source
This commit is contained in:
hbrain 2026-06-04 21:58:14 +00:00
parent 4f81e406f3
commit bacb335e38
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mvlog_worker.py
View file

@ -29,6 +29,7 @@ LOCK_NAME = ".movmaker-lock"
ENABLED_NAME = ".movmaker-enabled" ENABLED_NAME = ".movmaker-enabled"
PREVIEW_NAME = ".movmaker-preview" PREVIEW_NAME = ".movmaker-preview"
HIDDEN_NAME = ".mvlog-hidden" HIDDEN_NAME = ".mvlog-hidden"
PERMALINK_NAME = ".mvlog-permalink"
ARTICLE_ID_NAME = ".mvlog-id" ARTICLE_ID_NAME = ".mvlog-id"
INTRO_LOGO_ALPHA = "0.5" INTRO_LOGO_ALPHA = "0.5"
MVLOG_WORKER_RECOMMENDED_INTERVAL_MINUTES = 5 MVLOG_WORKER_RECOMMENDED_INTERVAL_MINUTES = 5
@ -97,7 +98,7 @@ entries = []
for dirpath, dirnames, filenames in os.walk(root): for dirpath, dirnames, filenames in os.walk(root):
dirnames[:] = [d for d in dirnames if d != '.movmaker-lock'] dirnames[:] = [d for d in dirnames if d != '.movmaker-lock']
for name in filenames: 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 continue
path = os.path.join(dirpath, name) path = os.path.join(dirpath, name)
rel = os.path.relpath(path, root) 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: def copy_job_from_remote(host: str, job_dir: str, local_input: Path) -> None:
local_input.mkdir(parents=True, exist_ok=True) local_input.mkdir(parents=True, exist_ok=True)
remote_cmd = ( 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 - ." f"-C {remote_q(job_dir)} -cf - ."
) )
p1 = subprocess.Popen(["ssh", host, remote_cmd], stdout=subprocess.PIPE) 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 = 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("--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("--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("--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("--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") parser.add_argument("--force", action="store_true", help="Render even if fingerprint is unchanged")