From 0c2ea645a9ae1d2c95bebd196cc81e104eba64c6 Mon Sep 17 00:00:00 2001 From: Hommy <16620803786@163.com> Date: Sun, 28 Dec 2025 09:34:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=B8=8A=E5=BA=93=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/create_draft.py | 116 +++++++++++++++++++++--------------- 1 file changed, 68 insertions(+), 48 deletions(-) diff --git a/src/service/create_draft.py b/src/service/create_draft.py index df3cfb6..dbb004d 100644 --- a/src/service/create_draft.py +++ b/src/service/create_draft.py @@ -9,6 +9,61 @@ import os import shutil +def generate_unique_draft_id(): + """生成唯一的草稿ID""" + timestamp = datetime.datetime.now().strftime("%Y%m%d%H%M%S") + unique_id = uuid.uuid4().hex[:8] + return f"{timestamp}{unique_id}" + + +def ensure_template_exists(): + """确保默认模板存在于草稿目录中""" + template_source_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "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) + + 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 json + with open(draft_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: + # 使用type作为名称，如果type存在的话 + track_type = track.get("type", "unknown") + track["name"] = f"{track_type}_track" + + # 保存修改后的模板 + with open(draft_content_path, 'w', encoding="utf-8") as f: + json.dump(template_data, f, ensure_ascii=False, indent=4) + + +def check_main_track_exists(script): + """检查是否已存在主轨道""" + main_track_name = "main_track" + main_track_exists = main_track_name in script.tracks + if not main_track_exists: + for track in script.imported_tracks: + try: + if hasattr(track, 'name') and track.name == main_track_name: + main_track_exists = True + break + except AttributeError: + # 如果track没有name属性，跳过 + continue + return main_track_exists + + def create_draft(width: int, height: int) -> str: """ 创建剪映草稿的业务逻辑 @@ -23,48 +78,26 @@ def create_draft(width: int, height: int) -> str: Raises: CustomException: 草稿创建失败 """ - # 生成一个草稿ID - timestamp = datetime.datetime.now().strftime("%Y%m%d%H%M%S") - unique_id = uuid.uuid4().hex[:8] - draft_id = f"{timestamp}{unique_id}" - logger.info(f"draft_id: {draft_id}, width: {width}, height: {height}") - draft_folder = draft.Draft_folder(config.DRAFT_DIR) # 使用默认模板创建剪映草稿 try: - # 先确保默认模板存在于草稿目录中 - template_source_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))), "template", "default") - template_target_path = os.path.join(config.DRAFT_DIR, "default") + # 确保默认模板存在 + template_target_path = ensure_template_exists() - # 如果草稿目录中不存在默认模板，则从template/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) + # 生成唯一的草稿ID + draft_id = generate_unique_draft_id() + logger.info(f"draft_id: {draft_id}, width: {width}, height: {height}") - # 使用default模板来创建新草稿 - # 在复制后，我们需要确保模板中的轨道都有name字段，因为ImportedTrack需要它 - # 如果模板中缺少name字段，我们需要在复制后修复它 - draft_content_path = os.path.join(template_target_path, "draft_content.json") - if os.path.exists(draft_content_path): - import json - with open(draft_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: - # 使用type作为名称，如果type存在的话 - track_type = track.get("type", "unknown") - track["name"] = f"{track_type}_track" - - # 保存修改后的模板 - with open(draft_content_path, 'w', encoding="utf-8") as f: - json.dump(template_data, f, ensure_ascii=False, indent=4) + # 修复模板中的轨道 + 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 @@ -72,23 +105,10 @@ def create_draft(width: int, height: int) -> str: script.content["canvas_config"]["height"] = height # 添加空的主轨道（仅当没有主轨道时添加） - main_track_name = "main_track" - # 检查是否已存在主轨道 - # 需要安全地检查imported_tracks中的轨道名称，因为某些轨道可能没有name属性 - main_track_exists = main_track_name in script.tracks + main_track_exists = 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: - main_track_exists = True - break - except AttributeError: - # 如果track没有name属性，跳过 - continue - - if not main_track_exists: - script.add_track(track_type=draft.TrackType.video, track_name=main_track_name, relative_index=0) - logger.info(f"Added empty main track: {main_track_name}") + script.add_track(track_type=draft.TrackType.video, track_name="main_track", relative_index=0) + logger.info(f"Added empty main track: main_track") # 保存草稿以确保更改被保存 script.save()