From c1b5f83cb90b4ab5b047fcae7309dc30fb4708cf Mon Sep 17 00:00:00 2001 From: Hawk Lee Date: Sun, 15 Feb 2026 17:46:13 +0800 Subject: [PATCH] feat(safety): add .aiia_temp marker file to prevent accidental deletion of user frame directories - All ToDisk nodes now write .aiia_temp marker on directory creation - VideoCombine cleanup_frames only deletes directories with this marker - Affected nodes: FloatProcess_ToDisk, DittoSampler, PersonaLive_ToDisk, BodySway --- aiia_ditto_nodes.py | 3 +++ aiia_float_nodes.py | 3 +++ aiia_personalive_nodes.py | 3 +++ aiia_video_nodes.py | 22 ++++++++++++++++------ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/aiia_ditto_nodes.py b/aiia_ditto_nodes.py index 8690d10..a4dfd97 100644 --- a/aiia_ditto_nodes.py +++ b/aiia_ditto_nodes.py @@ -937,6 +937,9 @@ class AIIA_DittoSampler: import tempfile import folder_paths frames_dir = tempfile.mkdtemp(prefix="ditto_frames_", dir=folder_paths.get_temp_directory()) + # 写入标记文件，供下游 Video Combine 的 cleanup_frames 安全识别 + from pathlib import Path + Path(frames_dir, ".aiia_temp").touch() master_sdk.set_disk_mode(True, frames_dir) logger.info(f"[Ditto] Disk mode enabled. Saving frames to: {frames_dir}") else: diff --git a/aiia_float_nodes.py b/aiia_float_nodes.py index 14b9930..853563e 100755 --- a/aiia_float_nodes.py +++ b/aiia_float_nodes.py @@ -344,6 +344,9 @@ class AIIA_FloatProcess_ToDisk: frames_output_directory_final = os.path.join(output_node_main_dir, run_unique_folder_name) try: os.makedirs(frames_output_directory_final, exist_ok=True) + # 写入标记文件，供下游 Video Combine 的 cleanup_frames 安全识别 + from pathlib import Path + Path(frames_output_directory_final, ".aiia_temp").touch() except Exception as e_mkdir: return self._create_error_string_count(f"无法创建输出目录 {frames_output_directory_final}: {e_mkdir}", log_message=True) diff --git a/aiia_personalive_nodes.py b/aiia_personalive_nodes.py index dd1101c..cb12b8d 100644 --- a/aiia_personalive_nodes.py +++ b/aiia_personalive_nodes.py @@ -401,6 +401,9 @@ class AIIA_PersonaLive_PhotoSampler_ToDisk: run_unique_folder_name = f"{output_subdir_name}_{timestamp_str}_{int(torch.randint(0,10000,(1,)).item())}" frames_output_directory = os.path.join(output_node_main_dir, run_unique_folder_name) os.makedirs(frames_output_directory, exist_ok=True) + # 写入标记文件，供下游 Video Combine 的 cleanup_frames 安全识别 + from pathlib import Path + Path(frames_output_directory, ".aiia_temp").touch() print(f"Processing {num_frames} frames (To-Disk). Output: {frames_output_directory}") diff --git a/aiia_video_nodes.py b/aiia_video_nodes.py index 09b8e0c..5dddbf2 100755 --- a/aiia_video_nodes.py +++ b/aiia_video_nodes.py @@ -37,6 +37,9 @@ import tempfile # 用于创建临时目录和文件 from comfy.utils import ProgressBar +# --- AIIA 常量 --- +AIIA_TEMP_MARKER = ".aiia_temp" # 标记文件，表示该目录由 AIIA 节点自动生成，可安全清理 + # --- AIIA 特定工具函数 --- DEFAULT_STD_ENCODING = "utf-8" @@ -384,13 +387,17 @@ class AIIA_VideoCombine: if not os.path.exists(final_video_filepath) or os.path.getsize(final_video_filepath) == 0: raise FileNotFoundError("FFmpeg 执行后未生成有效输出文件。") - # 合成成功，清理用户指定的帧目录 + # 合成成功，清理用户指定的帧目录（仅当存在 .aiia_temp 标记时） if user_frames_dir_to_cleanup and os.path.isdir(user_frames_dir_to_cleanup): - try: - shutil.rmtree(user_frames_dir_to_cleanup) - logger.info(f"{node_name_log} 已清理帧目录: {user_frames_dir_to_cleanup}") - except Exception as e_del: - logger.warning(f"{node_name_log} 清理帧目录失败: {e_del}") + marker_path = os.path.join(user_frames_dir_to_cleanup, AIIA_TEMP_MARKER) + if os.path.exists(marker_path): + try: + shutil.rmtree(user_frames_dir_to_cleanup) + logger.info(f"{node_name_log} 已清理帧目录: {user_frames_dir_to_cleanup}") + except Exception as e_del: + logger.warning(f"{node_name_log} 清理帧目录失败: {e_del}") + else: + logger.warning(f"{node_name_log} 未发现 {AIIA_TEMP_MARKER} 标记，跳过清理以防误删用户文件: {user_frames_dir_to_cleanup}") preview_item = {"filename": final_video_filename, "subfolder": subfolder, "type": "output" if save_output else "temp"} return {"ui": {"images": [preview_item], "animated": (True,)}, "result": (final_video_filepath,)} @@ -579,6 +586,9 @@ class AIIA_BodySway: if use_disk_mode: import folder_paths output_frames_dir = tempfile.mkdtemp(prefix="bodysway_frames_", dir=folder_paths.get_temp_directory()) + # 写入标记文件，供下游 Video Combine 的 cleanup_frames 安全识别 + from pathlib import Path + Path(output_frames_dir, ".aiia_temp").touch() logger.info(f"[BodySway] Output frames will be saved to: {output_frames_dir}") # Process frames: disk mode or memory mode