From a229194d48a3a0759111b995715095db207644a2 Mon Sep 17 00:00:00 2001 From: j Date: Tue, 19 Mar 2024 10:12:15 +0100 Subject: [PATCH] actually cleanup, only remove renders in infinity range --- render.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/render.py b/render.py index 77e3824..0be09fd 100644 --- a/render.py +++ b/render.py @@ -635,7 +635,6 @@ def update_m3u(render_prefix, exclude=[]): def render_infinity(options): prefix = options['prefix'] duration = int(options['duration']) - base = int(options['offset']) state_f = os.path.join(prefix, "infinity.json") if os.path.exists(state_f): @@ -644,7 +643,8 @@ def render_infinity(options): else: state = { "offset": 100, - "max-items": 30 + "max-items": 30, + "no_video": False, } for key in ("prefix", "duration"): state[key] = options[key] @@ -653,19 +653,19 @@ def render_infinity(options): render_prefix = state["prefix"] + "/render/" current = [ f for f in os.listdir(render_prefix) - if f.isdigit() and os.path.isdir(render_prefix + f) + if f.isdigit() and os.path.isdir(render_prefix + f) and state["offset"] > int(f) >= 100 ] if len(current) > state["max-items"]: - current = ox.sorted_strings(current) - remove = current[-state["max-items"]:] + current = list(reversed(ox.sorted_strings(current))) + remove = list(reversed(current[-state["max-items"]:])) update_m3u(render_prefix, exclude=remove) for folder in remove: folder = render_prefix + folder print("remove", folder) - #shutil.rmtree(folder) - cmd = ["ssh", "front", "rm", "-r", folder] - print(cmd) - #subprocess.check_call(cmd) + shutil.rmtree(folder) + cmd = ["ssh", "front", "rm", "-rf", folder] + #print(cmd) + subprocess.check_call(cmd) render_all(state) path = "%s%s/" % (render_prefix, state["offset"]) cmd = ['rsync', '-a', path, "front:" + path]