From c1cce12e687abb780d209e019e6454be3445e808 Mon Sep 17 00:00:00 2001
From: liubiren <marslbr@qq.com>
Date: Tue, 6 Jan 2026 22:01:46 +0800
Subject: [PATCH] 260106 from nuc

---
 .gitignore                     | 163 ---------------------------------
 短视频合成自动化/draft.py      |  10 +-
 短视频合成自动化/main.py       |   3 +-
 短视频合成自动化/separation.py |   0
 4 files changed, 7 insertions(+), 169 deletions(-)
 create mode 100644 短视频合成自动化/separation.py

diff --git a/.gitignore b/.gitignore
index a38dbc0..c18dd8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,164 +1 @@
-### Python template
-# Byte-compiled / optimized / DLL files
 __pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
-.pdm.toml
-.pdm-python
-.pdm-build/
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-.idea/
-
diff --git a/短视频合成自动化/draft.py b/短视频合成自动化/draft.py
index 3a258d7..f4d66e0 100644
--- a/短视频合成自动化/draft.py
+++ b/短视频合成自动化/draft.py
@@ -123,10 +123,10 @@ class JianYingDraft:
                 text_segment.add_bubble(**bubble)
 
             # 添加花字
+            # pylint: disable=line-too-long
+            # 将花字保存预设后在C:/Users/admin/AppData/Local/JianyingPro/User Data/Presets/Text_V2/预设文本?.textpreset获取花字resource_id
             if effect:
-                text_segment.add_effect(
-                    **effect
-                )  # 可先将花字保存预设，再在C:/Users/admin/AppData/Local/JianyingPro/User Data/Presets/Text_V2/预设文本?.textpreset获取花字resource_id
+                text_segment.add_effect(**effect)
 
             # 添加动画
             if animation:
@@ -320,8 +320,10 @@ class JianYingDraft:
             )
 
             # 构建贴纸
+            # pylint: disable=line-too-long
+            # 将贴纸保存为我的预设后在C:\Users\admin\AppData\Local\JianyingPro\User Data\Presets\Combination\Presets\我的预设?\preset_draft获取
             sticker_segment = pyJianYingDraft.StickerSegment(
-                resource_id=resource_id,  # 可先将贴纸保存为我的预设，再在C:\Users\admin\AppData\Local\JianyingPro\User Data\Presets\Combination\Presets\我的预设?\preset_draft获取
+                resource_id=resource_id,
                 target_timerange=pyJianYingDraft.trange(
                     *(
                         target_timerange
diff --git a/短视频合成自动化/main.py b/短视频合成自动化/main.py
index dfe3a5c..222fd87 100644
--- a/短视频合成自动化/main.py
+++ b/短视频合成自动化/main.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-
 """
-短视频合成自动化
+主程序
 """
 
 from export import JianYingExport
diff --git a/短视频合成自动化/separation.py b/短视频合成自动化/separation.py
new file mode 100644
index 0000000..e69de29