diff --git a/SimpleCutPy.spec b/SimpleCutPy.spec
index dd1c80f..d6088e6 100644
--- a/SimpleCutPy.spec
+++ b/SimpleCutPy.spec
@@ -6,7 +6,7 @@ a = Analysis(
pathex=['src'],
binaries=[('assets/ffmpeg.exe', 'assets')],
datas=[],
- hiddenimports=['wx', 'src', 'pymediainfo'],
+ hiddenimports=['wx', 'src', 'pymediainfo', 'pydantic'],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
diff --git a/pyproject.toml b/pyproject.toml
index 5512fab..17bc951 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,12 @@ version = "0.4.3"
description = "A simple video cut tool based on wxpython, ffmpeg"
readme = "README.md"
requires-python = "==3.12.*"
-dependencies = ["logging>=0.4.9.6", "pymediainfo>=7.0.1", "wxpython>=4.2.2"]
+dependencies = [
+ "logging>=0.4.9.6",
+ "pydantic>=2.12.5",
+ "pymediainfo>=7.0.1",
+ "wxpython>=4.2.2",
+]
[dependency-groups]
dev = [
diff --git a/src/SimpleCutMainFrame.py b/src/SimpleCutMainFrame.py
index 9833546..cc9be72 100644
--- a/src/SimpleCutMainFrame.py
+++ b/src/SimpleCutMainFrame.py
@@ -1,48 +1,48 @@
+# TODO: 文件路径其实没有把文件名显示出来
+
"""Subclass of MainFrame, which is generated by wxFormBuilder."""
+from export.model import VideoFile
+import export
+from controller.core import CoreController
import logging
import os
-import subprocess
-import sys
-import threading
-import time
import wx
-from pymediainfo import MediaInfo
import meta
import SimpleCutPy
-from command import concat_filter, merge_filestream_audio_channel
from message import ExportMessage, WorkStateEnum
-from model import VideoModel, VideoSequenceModel
class FileDropTarget(wx.FileDropTarget):
- def __init__(self, target):
+ def __init__(self, target: "SimpleCutPyMainFrame"):
wx.FileDropTarget.__init__(self)
self.target = target
def OnDropFiles(self, x, y, filenames):
+ logging.debug(f"FileDropTarget 拖拽文件：{filenames}")
for file in filenames:
- self.target.append_files(file, file)
+ filepath, filename = os.path.split(file)
+ logging.debug(f"解析文件：{file} -> 路径: {filepath}, 文件名: {filename}")
+ self.target.core_controller.add_file(filename, filepath)
+ self.target.update_video_sequence_view()
return True
-# TODO: 重写配置的参数验证，建立物品类和导出配置 ExportConfig
-
-
# Implementing MainFrame
class SimpleCutPyMainFrame(SimpleCutPy.MainFrame):
def __init__(self, parent=None):
SimpleCutPy.MainFrame.__init__(self, parent)
+ # 设置标题
+ self.SetTitle(f"Simple Cut Py {meta.VERSION}")
+
# 设置拖拽文件
self.list_ctrl.SetDropTarget(FileDropTarget(self))
self.first_selected_index = 0
- # self.item_list: list[dict] = [] # 列表是控件上的映射，列表的物品顺序就是控件上物品的顺序
- self.video_sequence: VideoSequenceModel = VideoSequenceModel()
# list_ctrl 控件添加列
self.list_ctrl.InsertColumn(0, "序号", width=40)
@@ -54,377 +54,329 @@ def __init__(self, parent=None):
# 标记版本
self.VersionText.SetLabelText(f"Simple Cut Py 版本号\n{meta.VERSION}")
- # Handlers for MainFrame events.
+ self.core_controller = CoreController(self)
- # TODO: 参数初始化
- self.ExportBitCtrl.SetValue("6")
+ self.on_size_control_mode_change(None)
- # 线程字典
- self.working_thread: dict[str, threading.Thread] = {}
+ def _bind_event(self):
+ pass
def on_add_file_button_click(self, event):
# 文件选择对话框
file_dlg = wx.FileDialog(self, "选择导入的文件", "", "", "*.mp4", wx.FD_OPEN)
if file_dlg.ShowModal() == wx.ID_OK:
- # 文件导入
- # {NO, filename, startTime, endTime, path}
+ # 导入文件
+ filepath = file_dlg.GetPath()
+ for filename in file_dlg.GetFilenames():
+ self.core_controller.add_file(filename, filepath)
- # 将导入文件数据转为字典
- filename = file_dlg.GetFilename()
- path = file_dlg.GetPath()
+ logging.debug("导入文件：{}, {}".format(filename, filepath))
- self.append_files(filename, path)
-
- logging.debug(
- "导入文件：{}, {}".format(file_dlg.GetFilename(), file_dlg.GetPath())
- )
+ self.update_video_sequence_view()
file_dlg.Destroy()
- def list_ctrl_on_drop_files(self, event):
- files = event.GetFiles()
-
- # 防止拖空文件
- if len(files) <= 0:
- return
-
- logging.debug(f"拖拽文件：{files}")
-
- for filename in files:
- item_no = self.list_ctrl.GetItemCount()
- self.add_files(item_no, filename, filename)
-
def on_remove_file_button_click(self, event):
# 删除列表中的项
- index = self.first_selected_index
+ target_idx = self.core_controller.first_select_index
- if index <= -1:
+ if target_idx <= -1:
return # 如果没有选中
- if index >= len(self.video_sequence):
+ if target_idx >= self.core_controller.sequence_length():
return # 如果超出范围
- self.video_sequence.pop_video(index)
-
- # 删除界面中的项
-
- self.list_ctrl.DeleteItem(index)
+ self.core_controller.remove_file(target_idx)
- # 删除以后进行序号重排
- for i in range(len(self.video_sequence)):
- if i < index:
- continue
-
- # 从删除项开始后面的每一个物品都重新加载
- self.update_video_model_item(i)
+ self.update_video_sequence_view()
# 选中 index
- self.list_ctrl.Select(index)
+ if target_idx < self.core_controller.sequence_length():
+ self.list_ctrl.Select(target_idx)
+ elif self.core_controller.sequence_length() > 0:
+ self.list_ctrl.Select(self.core_controller.sequence_length() - 1)
def on_move_up_file_button_click(self, event):
- value = self.first_selected_index
+ logging.debug(
+ f"on_move_up_file_button_click: {self.core_controller.first_select_index}"
+ )
+
+ idx = self.core_controller.first_select_index
- if value == -1:
+ if idx == -1:
return # 如果没有选中
- if value == 0:
+ if idx == 0:
wx.MessageBox(
"选中素材已置顶。", "错误", style=wx.YES_DEFAULT | wx.ICON_QUESTION
)
return # 如果是第一个物品
- self.video_sequence.swap_item(value, value - 1)
+ self.core_controller.swap_file(idx, idx - 1)
- self.update_video_model_item(value)
- self.update_video_model_item(value - 1)
+ self.update_video_sequence_view()
- self.list_ctrl.Select(self.first_selected_index, on=0) # 取消原来的选中
- self.list_ctrl.Select(self.first_selected_index - 1)
+ self.list_ctrl.Select(idx, on=0) # 取消原来的选中
+ self.list_ctrl.Select(idx - 1)
def on_move_down_file_button_click(self, event):
- value = self.first_selected_index
+ logging.debug(
+ f"on_move_down_file_button_click: {self.core_controller.first_select_index}"
+ )
+
+ idx = self.core_controller.first_select_index
- if value == -1:
+ if idx == -1:
return # 如果没有选中
- if value == self.list_ctrl.GetItemCount() - 1:
+ if idx == self.list_ctrl.GetItemCount() - 1:
wx.MessageBox(
"选中素材在最末端。", "错误", style=wx.YES_DEFAULT | wx.ICON_QUESTION
)
return # 如果是最后一个
- self.video_sequence.swap_item(
- self.first_selected_index, self.first_selected_index + 1
- )
+ self.core_controller.swap_file(idx, idx + 1)
- self.update_video_model_item(value)
- self.update_video_model_item(value + 1)
+ self.update_video_sequence_view()
# 选中转移
- self.list_ctrl.Select(self.first_selected_index, on=0) # 取消原来的选中
- self.list_ctrl.Select(self.first_selected_index + 1)
+ self.list_ctrl.Select(idx, on=0) # 取消原来的选中
+ self.list_ctrl.Select(idx + 1)
def on_export_button_click(self, event):
- # TODO: 加了码率设置的功能，别忘了测试
- # TODO: item list 重写
-
- # 从界面读取导出文件名、路径、码率
- export_name = self.ExportNameCtrl.GetValue()
- export_path = self.ExportPathCtrl.GetValue()
- export_mbps = self.ExportBitCtrl.GetValue()
- export_amix = self.AmixCheckBox.IsChecked()
- export_double_output = self.DoubleOutputBox.IsChecked()
-
- # 导出码率设置为空则使用 6 mbps
- if export_mbps == "":
- export_mbps = 6
-
- # 导出文件名为空则使用时间
- if export_name == "":
- export_name = str(time.strftime("No Title %Y.%m.%d - %H.%M.output.mp4"))
-
- # 导出路径不为空则更改导出目录
- if not export_path == "":
- # os.chdir(export_path)
- export_name = export_path + "/" + export_name
- else:
- # 默认使用第一个文件的目录
- path = os.path.dirname(self.video_sequence[0].path)
- export_name = path + "/" + export_name
-
- paths = [export_name]
-
- # 如果没有后缀 添加类型后缀
- if "." not in export_name:
- export_name += ".mp4"
-
- # 获取后缀
- path_without_suffix, suffix = os.path.splitext(export_name)
+ # 获取文件名路径
+ self.core_controller.task.export_file_name = self.ExportNameCtrl.GetValue()
+ self.core_controller.task.export_file_path = self.ExportPathCtrl.GetValue()
- if export_double_output:
- # 如果导出双倍输出，则给文件名添加后缀
- paths.append(path_without_suffix + "_WITHAMIX" + suffix)
+ # 读取配置
+ self.get_export_config()
# 导出
- for it in paths:
- # 第一个输出文件使用用户设置的amix状态
- # 第二个输出文件（带_WITHAMIX后缀）强制使用amix=True
- if "_WITHAMIX" in it:
- # 对于带_WITHAMIX后缀的输出，强制使用多音轨合并
- t = threading.Thread(
- target=self.export_video_file, args=(True, export_mbps, it)
- )
- else:
- # 使用用户设置的多音轨合并状态
- t = threading.Thread(
- target=self.export_video_file, args=(False, export_mbps, it)
- )
- self.working_thread[it] = t
- t.start()
+ self.core_controller.export_sequence()
self.ExportBtn.Disable()
return
- def export_video_file(self, export_amix, export_mbps, export_name):
- # TODO: item list 重写
- # 导出命令
-
- # 获取ffmpeg路径 - 优先使用打包后的资源路径
- if getattr(sys, "frozen", False):
- # 打包后环境
- base_path = sys._MEIPASS # type: ignore
- else:
- # 开发环境
- base_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
- ffmpeg_path = os.path.join(base_path, "assets", "ffmpeg.exe")
- console_command = f'"{ffmpeg_path}" '
- filter_complex_string = "-filter_complex "
- filter_complex_filters: list[str] = []
- concat_inputs: list[str] = []
- for index, item in enumerate(self.video_sequence.video_list):
- no = index
- start_time = item.start_time
- end_time = item.end_time
- item_path = item.path
-
- # 开始、结束时间以及路径的命令行参数生成
- time_param = []
- if start_time != "":
- time_param.append(f"-ss {start_time}")
- if end_time != "":
- time_param.append(f"-to {end_time}")
- time_param.append(f'-i "{item_path}"')
- time_string = " ".join(time_param)
-
- console_command += time_string + " "
-
- # concat_inputs 的参数生成
- concat_inputs.append(f"{no}:v")
-
- media_info = MediaInfo.parse(item_path)
- audio_tracks_number = len(media_info.audio_tracks)
- if audio_tracks_number > 0 and export_amix:
- # 多音轨，合并
- # amix_filter
- filter_complex_filters.append(
- merge_filestream_audio_channel(
- f"{no}", audio_tracks_number, f"{no}a"
- )
- )
- concat_inputs.append(f"{no}a")
- else:
- # 单音轨
- concat_inputs.append(f"{no}:a")
- # 使用 concat 滤镜
- concat_string = concat_filter(concat_inputs, "v", "a")
- filter_complex_filters.append(concat_string)
- # 拼接 filter_complex 命令行参数，拼接滤镜
- console_command += (
- filter_complex_string + f'"{";".join(filter_complex_filters)}"'
- )
- console_command += ' -map "[v]" -map "[a]"'
- # 拼接全指令
- if os.path.split(export_name)[1] == "":
- export_name += ".mp4"
-
- console_command += f' -b:v {export_mbps}M "{export_name}"'
- logging.info(f"导出命令：{console_command}")
-
- # 执行命令
- try:
- subprocess.run(
- console_command,
- shell=False,
- check=True,
- creationflags=subprocess.CREATE_NO_WINDOW,
- )
-
- # 完成命令，发送事件
- wx.CallAfter(
- self.on_export_done,
- ExportMessage(WorkStateEnum.SUCCESS, "导出完成", export_name),
- )
- except subprocess.CalledProcessError as e:
- # 导出失败，发送事件
- wx.CallAfter(self.on_export_done, ExportMessage(WorkStateEnum.FAIL, e))
-
def on_open_project_website_button_click(self, event):
# TODO: Implement ProjectWebBtnOnClick
pass
- def add_files(self, item_no, filename, path):
- """
- 添加文件。将文件添加到物品列表，并刷新显示在界面上
- :param item_no: 序号
- :param filename: 文件名
- :param path: 文件路径
- :return: 空
- """
- # 构建物品字典
- item = VideoModel(path, filename)
-
- # 加到物品表
- self.video_sequence.append_video(item)
-
- # 显示数据在界面
- index = self.list_ctrl.InsertItem(item_no, item_no)
- self.update_video_model_item(index)
-
- def append_files(self, filename, path):
- item_no = self.list_ctrl.GetItemCount()
- self.add_files(item_no, filename, path)
-
def on_clear_all_button_click(self, event):
- self.video_sequence.clear_all()
- logging.debug(f"clear all video: {self.video_sequence.video_list}")
- self.update_sequence_model()
+ self.core_controller.clear_all_files()
+ logging.debug(
+ f"clear all video: {self.core_controller.task.video_sequence.get_video_list()}"
+ )
+ self.update_video_sequence_view()
def on_start_time_ctrl_text(self, event):
"""修改开始时间输入框的时候修改itemlist的start_time"""
- index = self.first_selected_index
+ index = self.core_controller.first_select_index
+
value = self.StartTimeCtrl.GetValue()
- self.video_sequence[index].start_time = value
+ # 尝试更新数据
+ videofile = self.core_controller.get_file(index)
+ videofile.start_time = self.core_controller.format_time(value)
- self.update_video_model_item(index)
+ self.update_video_file_view(index, videofile)
def on_end_time_ctrl_text(self, event):
"""修改结束时间输入框的时候修改itemlist的end_time"""
- index = self.first_selected_index
+ index = self.core_controller.first_select_index
+
value = self.EndTimeCtrl.GetValue()
- self.video_sequence[index].end_time = value
+ # 尝试更新数据
+ videofile = self.core_controller.get_file(index)
+ videofile.end_time = self.core_controller.format_time(value)
- self.update_video_model_item(index)
+ self.update_video_file_view(index, videofile)
def on_list_item_selected(self, event):
index = self.list_ctrl.GetFirstSelected()
- self.first_selected_index = index
+ self.core_controller.first_select_index = index
# 获取选中的物品时间，同步到输入框
- self.StartTimeCtrl.SetValue(self.video_sequence[index].start_time)
- self.EndTimeCtrl.SetValue(self.video_sequence[index].end_time)
+ self.StartTimeCtrl.SetValue(self.core_controller.get_file(index).start_time)
+ self.EndTimeCtrl.SetValue(self.core_controller.get_file(index).end_time)
logging.debug(
f"Selected Item Index: {index}, \
- Selected Item no: {self.video_sequence[index]}"
+ Selected Item no: {self.core_controller.get_file(index)}"
)
- def update_video_model_item(self, no):
- """重载物品"""
- self.load_video_model_item(self.video_sequence[no], no)
-
- def update_sequence_model(self):
- """重载序列"""
- self.load_sequence_model(self.video_sequence)
-
- def load_video_model_item(self, load_item: VideoModel, list_ctrl_index: int):
- """
- 将 VideoModel 载入到 列表item上
- :param load_item: 载入的物品
- :param list_ctrl_index: 载入在控件的行数
- :return: 无
- """
- self.list_ctrl.SetItem(list_ctrl_index, 0, str(list_ctrl_index))
- self.list_ctrl.SetItem(list_ctrl_index, 1, load_item.filename)
-
- start_time = "开头" if load_item.start_time == "" else load_item.start_time
- end_time = "结尾" if load_item.end_time == "" else load_item.end_time
- self.list_ctrl.SetItem(list_ctrl_index, 2, start_time)
- self.list_ctrl.SetItem(list_ctrl_index, 3, end_time)
- self.list_ctrl.SetItem(list_ctrl_index, 4, load_item.path)
-
- def load_sequence_model(self, sequence: VideoSequenceModel):
- """
- 把物品列表上的所有物品载入到用户界面的控件上
- :return:
- """
- # 清除控件
- self.list_ctrl.DeleteAllItems()
-
- # 重新载入
- for index, item in enumerate(sequence.video_list):
- logging.debug(f"load item: {index},{item}")
- self.list_ctrl.InsertItem(index, index)
- self.load_video_model_item(item, index)
-
def on_export_done(self, msg: ExportMessage):
logging.debug(f"Export Done: {msg}")
if msg.state == WorkStateEnum.SUCCESS:
wx.MessageBox("导出成功", "提示", wx.OK | wx.ICON_INFORMATION)
- if msg.export_name != "":
- self.working_thread.pop(msg.export_name)
elif msg.state == WorkStateEnum.FAIL:
logging.error(f"Export Error: {msg.message}")
wx.MessageBox("导出失败", "提示", wx.OK | wx.ICON_INFORMATION)
- if len(self.working_thread) == 0:
+ if len(self.core_controller.working_thread) == 0:
self.ExportBtn.Enable()
return
+ def on_size_control_mode_change(self, event):
+ size_control_mode = "none"
+ match self.SizeControlMode.GetSelection():
+ case 0:
+ size_control_mode = "x264"
+ case 1:
+ size_control_mode = "mbps"
+ case _:
+ size_control_mode = "none"
+
+ logging.debug(f"SizeControlMode: {size_control_mode}")
+
+ # 如果不是 mbps 则隐藏，否则显示
+ if size_control_mode == "mbps":
+ self.MbpsCtrl.Enable()
+ else:
+ self.MbpsCtrl.Disable()
+
+ return
+
+ def update_video_file_view(self, index: int, file: VideoFile):
+ """将 VideoFile 载入到 列表item上
+
+ Args:
+ index (int): 列表项索引
+ file (VideoFile): 要载入的视频文件
+ """
+ logging.debug(f"update_video_file_view: {file}, index: {index}")
+ # 确保列表控件中有足够的项
+ while index >= self.list_ctrl.GetItemCount():
+ self.list_ctrl.InsertItem(self.list_ctrl.GetItemCount(), "")
+
+ self.list_ctrl.SetItem(index, 0, str(index + 1))
+ self.list_ctrl.SetItem(index, 1, file.file_name)
+ self.list_ctrl.SetItem(index, 2, file.start_time)
+ self.list_ctrl.SetItem(index, 3, file.end_time)
+ self.list_ctrl.SetItem(index, 4, file.file_path)
+
+ def update_video_sequence_view(self, index=-1) -> None:
+ """更新视频序列视图
+
+ Args:
+ index (int, optional): 要更新的视频序列索引. 默认-1表示更新所有.
+ """
+ sequence = self.core_controller.task.video_sequence.get_video_list()
+ logging.debug(f"update_video_sequence_view: {index}, sequence: {sequence}")
+ if index == -1:
+ # 清空列表，然后重新添加所有条目，避免空白条目
+ self.list_ctrl.DeleteAllItems()
+ for i, item in enumerate(sequence):
+ # 直接添加到列表末尾
+ self.list_ctrl.InsertItem(i, str(i + 1))
+ self.list_ctrl.SetItem(i, 1, item.file_name)
+ self.list_ctrl.SetItem(i, 2, item.start_time)
+ self.list_ctrl.SetItem(i, 3, item.end_time)
+ self.list_ctrl.SetItem(i, 4, item.file_path)
+ return
+
+ # 只更新单个条目
+ if index < len(sequence):
+ self.update_video_file_view(index, sequence[index])
+
+ def update_export_config_view(self) -> None:
+ """更新导出配置视图"""
+ export_config = self.core_controller.task.export_config
+
+ match export_config.size_control:
+ case export.model.X264Config():
+ self.SizeControlMode.SetSelection(0)
+ case export.model.MbpsConfig():
+ self.SizeControlMode.SetSelection(1)
+ self.MbpsCtrl.SetValue(str(export_config.size_control.mbps))
+ case None:
+ self.SizeControlMode.SetSelection(2)
+ case _:
+ self.SizeControlMode.SetSelection(0)
+
+ match export_config.multi_track_mode:
+ case "first":
+ self.MultiTrackMode.SetSelection(0)
+ case "amix":
+ self.MultiTrackMode.SetSelection(1)
+ case "export_both":
+ self.MultiTrackMode.SetSelection(2)
+ case _:
+ self.MultiTrackMode.SetSelection(0)
+
+ def get_export_config(self) -> None:
+ """
+ 获取导出配置到模型
+ """
+ size_control_mode = self.size_control_idx_to_enum(
+ self.SizeControlMode.GetSelection()
+ )
+
+ match size_control_mode:
+ case "x264":
+ size_control = export.model.X264Config()
+ case "mbps":
+ size_control = export.model.MbpsConfig(
+ mbps=float(self.MbpsCtrl.GetValue())
+ )
+ case "none":
+ size_control = None
+ case _:
+ size_control = None
+
+ multi_track_mode = self.multi_track_select_idx_to_enum(
+ self.MultiTrackMode.GetSelection()
+ )
+
+ export_config = export.model.ExportConfig(
+ size_control=size_control,
+ multi_track_mode=multi_track_mode,
+ )
+
+ self.core_controller.setup_export_config(export_config)
+
+ @staticmethod
+ def size_control_idx_to_enum(idx: int):
+ """将大小控制模式选择框索引转换为枚举值
+
+ Args:
+ idx (int): 大小控制模式选择框索引
+
+ Returns:
+ SizeControlMode: 大小控制模式枚举值
+ """
+ match idx:
+ case 0:
+ return "x264"
+ case 1:
+ return "mbps"
+ case 2:
+ return "none"
+ case _:
+ return "none"
+
+ @staticmethod
+ def multi_track_select_idx_to_enum(idx: int):
+ """将多轨道模式选择框索引转换为枚举值
+
+ Args:
+ idx (int): 多轨道模式选择框索引
+
+ Returns:
+ MultiTrackMode: 多轨道模式枚举值
+ """
+ match idx:
+ case 0:
+ return "first"
+ case 1:
+ return "amix"
+ case 2:
+ return "export_both"
+ case _:
+ return "first"
+
if __name__ == "__main__":
App = wx.App()
diff --git a/src/SimpleCutPy.fbp b/src/SimpleCutPy.fbp
index 25d102a..6847138 100644
--- a/src/SimpleCutPy.fbp
+++ b/src/SimpleCutPy.fbp
@@ -124,7 +124,7 @@
@@ -928,7 +927,7 @@
+
+
+
+
-