优化创建草稿流程。

src/service/create_draft.py

@@ -16,41 +16,67 @@ def generate_unique_draft_id():
     return f"{timestamp}{unique_id}"
 
 
-def ensure_template_exists():
-    """确保默认模板存在于草稿目录中"""
+def create_draft_from_template(draft_id: str, width: int, height: int):
+    """基于模板创建新草稿，使用duplicate_as_template方法"""
     # 使用绝对路径构建模板源路径
     current_file_dir = os.path.dirname(os.path.abspath(__file__))  # src/service
     src_dir = os.path.dirname(current_file_dir)  # src
     project_root = os.path.dirname(src_dir)  # 项目根目录
     template_source_path = os.path.join(project_root, "template", "default")
-    template_target_path = os.path.join(config.DRAFT_DIR, "default")
     
-    if not os.path.exists(template_target_path):
-        os.makedirs(config.DRAFT_DIR, exist_ok=True)
-        shutil.copytree(template_source_path, template_target_path)
+    # 创建临时模板目录
+    temp_template_name = "temp_template_for_creation"
+    temp_template_path = os.path.join(config.DRAFT_DIR, temp_template_name)
     
-    return template_target_path
-
-
-def fix_template_tracks(template_target_path):
-    """修复模板中的轨道，确保所有轨道都有name字段"""
-    draft_content_path = os.path.join(template_target_path, "draft_content.json")
-    if os.path.exists(draft_content_path):
+    # 如果临时模板路径已存在，先删除
+    import shutil
+    if os.path.exists(temp_template_path):
+        shutil.rmtree(temp_template_path)
+    
+    # 临时复制模板到草稿目录
+    shutil.copytree(template_source_path, temp_template_path)
+    
+    try:
+        # 先加载模板内容并修复轨道名称
         import json
-        with open(draft_content_path, 'r', encoding="utf-8") as f:
+        template_content_path = os.path.join(temp_template_path, "draft_content.json")
+        with open(template_content_path, 'r', encoding="utf-8") as f:
             template_data = json.load(f)
         
         # 确保所有轨道都有name字段
         for track in template_data.get("tracks", []):
-            if "name" not in track:
+            if not isinstance(track, dict) or "name" not in track:
                 # 使用type作为名称，如果type存在的话
-                track_type = track.get("type", "unknown")
-                track["name"] = f"{track_type}_track"
+                track_type = track.get("type", "unknown") if isinstance(track, dict) else "unknown"
+                track_name = f"{track_type}_track"
+                if isinstance(track, dict):
+                    track["name"] = track_name
+                else:
+                    # 如果track不是字典，跳过
+                    continue
         
-        # 保存修改后的模板
-        with open(draft_content_path, 'w', encoding="utf-8") as f:
+        # 保存修复后的模板内容
+        with open(template_content_path, 'w', encoding="utf-8") as f:
             json.dump(template_data, f, ensure_ascii=False, indent=4)
-
+        
+        # 使用DraftFolder的duplicate_as_template方法
+        draft_folder = draft.Draft_folder(config.DRAFT_DIR)
+        script = draft_folder.duplicate_as_template(temp_template_name, draft_id, allow_replace=True)
+        
+        # 确保草稿中的ID与文件夹ID一致
+        script.content["id"] = draft_id
+        
+        # 更新草稿的画布尺寸以匹配请求的尺寸
+        script.width = width
+        script.height = height
+        script.content["canvas_config"]["width"] = width
+        script.content["canvas_config"]["height"] = height
+        
+        return script
+    finally:
+        # 清理临时模板目录
+        if os.path.exists(temp_template_path):
+            shutil.rmtree(temp_template_path)
 
 def check_main_track_exists(script):
     """检查是否已存在主轨道"""
@@ -59,7 +85,7 @@ def check_main_track_exists(script):
     if not main_track_exists:
         for track in script.imported_tracks:
             try:
-                if hasattr(track, 'name') and track.name == main_track_name:
+                if hasattr(track, 'name') and getattr(track, 'name', None) == main_track_name:
                     main_track_exists = True
                     break
             except AttributeError:
@@ -82,31 +108,14 @@ def create_draft(width: int, height: int) -> str:
     Raises:
         CustomException: 草稿创建失败
     """
-    draft_folder = draft.Draft_folder(config.DRAFT_DIR)
-
     # 使用默认模板创建剪映草稿
     try:
-        # 确保默认模板存在
-        template_target_path = ensure_template_exists()
-        
         # 生成唯一的草稿ID
         draft_id = generate_unique_draft_id()
         logger.info(f"draft_id: {draft_id}, width: {width}, height: {height}")
         
-        # 修复模板中的轨道
-        fix_template_tracks(template_target_path)
-        
-        # 使用default模板来创建新草稿
-        script = draft_folder.duplicate_as_template("default", draft_id, allow_replace=True)
-        
-        # 确保草稿中的ID与文件夹ID一致
-        script.content["id"] = draft_id
-        
-        # 更新草稿的画布尺寸以匹配请求的尺寸
-        script.width = width
-        script.height = height
-        script.content["canvas_config"]["width"] = width
-        script.content["canvas_config"]["height"] = height
+        # 基于模板创建新草稿，不将模板复制到草稿目录
+        script = create_draft_from_template(draft_id, width, height)
         
         # 添加空的主轨道（仅当没有主轨道时添加）
         main_track_exists = check_main_track_exists(script)