✨ 更新至0.3.0，重构数据模型，实现移除文件后选中下一个文件的功能

Author: FishCat233

main.spec

@@ -2,11 +2,11 @@
 
 
 a = Analysis(
-    ['main.py'],
-    pathex=['.venv/Lib/site-packages'],
+    ['src/main.py'],
+    pathex=['src', '.venv/Lib/site-packages'],
     binaries=[],
     datas=[],
-    hiddenimports=['wx'],
+    hiddenimports=['wx', 'src'],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "simplecutpy"
-version = "0.1.0"
-description = "Add your description here"
+version = "0.3.0"
+description = "A simple video cut tool based on wxpython, ffmpeg"
 readme = "README.md"
 requires-python = "==3.12.*"
 dependencies = [

src/SimpleCutMainFrame.py

@@ -14,7 +14,9 @@
 
 from pymediainfo import MediaInfo
 
-VERSION = "0.2.0"
+from src.model import VideoSequenceModel, VideoModel
+
+VERSION = "0.3.0"
 
 
 class FileDropTarget(wx.FileDropTarget):
@@ -41,7 +43,8 @@ def __init__(self, parent=None):
         self.list_ctrl.SetDropTarget(FileDropTarget(self))
 
         self.first_selected_index = 0
-        self.item_list: list[dict] = []  # 列表是控件上的映射，列表的物品顺序就是控件上物品的顺序
+        # self.item_list: list[dict] = []  # 列表是控件上的映射，列表的物品顺序就是控件上物品的顺序
+        self.video_sequence: VideoSequenceModel = VideoSequenceModel()
 
         # list_ctrl 控件添加列
         self.list_ctrl.InsertColumn(0, "序号", width=40)
@@ -50,6 +53,9 @@ def __init__(self, parent=None):
         self.list_ctrl.InsertColumn(3, "结束时间", width=65)
         self.list_ctrl.InsertColumn(4, "文件路径", width=238)
 
+        # 标记版本
+        self.VersionText.SetLabelText(f"Simple Cut Py 版本号\n{VERSION}")
+
         # Handlers for MainFrame events.
 
         # TODO: 参数初始化
@@ -64,25 +70,6 @@ def format_time(time_string: str) -> str:
         time_string = str.replace(time_string, "：", ":")
         return time_string
 
-    def ApplyTimeButtonOnClick(self, event):
-        apply_time_item_index = self.first_selected_index
-
-        # 从控件上读取时间
-        start_time = self.StartTimeCtrl.GetValue()
-        end_time = self.EndTimeCtrl.GetValue()
-
-        start_time = self.format_time(start_time)
-        end_time = self.format_time(end_time)
-
-        # 设置物品列表的参数，如果为空就不更改
-        if not start_time == '':
-            self.item_list[apply_time_item_index]["start_time"] = start_time
-        if not end_time == '':
-            self.item_list[apply_time_item_index]["end_time"] = end_time
-
-        # 更新界面
-        self.list_load_item(self.item_list[apply_time_item_index], apply_time_item_index)
-
     def AddFileBtnOnClick(self, event):
         # 文件选择对话框
         file_dlg = wx.FileDialog(self, u"选择导入的文件", "", "", "*.mp4", wx.FD_OPEN)
@@ -115,53 +102,71 @@ def list_ctrl_on_drop_files(self, event):
 
     def RemoveBtnOnClick(self, event):
         # 删除列表中的项
-        delete_index = self.first_selected_index
-        self.item_list.pop(delete_index)
+        index = self.first_selected_index
+
+        if index <= -1:
+            return  # 如果没有选中
+
+        if index >= len(self.video_sequence):
+            return # 如果超出范围
+
+        self.video_sequence.pop_video(index)
 
         # 删除界面中的项
 
-        self.list_ctrl.DeleteItem(delete_index)
+        self.list_ctrl.DeleteItem(index)
 
         # 删除以后进行序号重排
-        for i in range(len(self.item_list)):
-            if i < delete_index:
+        for i in range(len(self.video_sequence)):
+            if i < index:
                 continue
 
-            # 从删除项以后的每一个项的序号都要 -1
-            self.item_list[i]["no"] -= 1
-
             # 从删除项开始后面的每一个物品都重新加载
-            self.list_load_item(self.item_list[i], i)
+            self.update_video_model_item(i)
+
+        # 选中 index
+        self.list_ctrl.Select(index)
 
     def MovUpBtnOnClick(self, event):
-        if self.first_selected_index == -1:
+        value = self.first_selected_index
+
+        if value == -1:
             return  # 如果没有选中
 
-        if self.first_selected_index == 0:
+        if value == 0:
             wx.MessageBox("选中素材已置顶。", "错误", style=wx.YES_DEFAULT | wx.ICON_QUESTION)
             return  # 如果是第一个物品
 
-        self.item_swap(self.first_selected_index, self.first_selected_index - 1)
+        self.video_sequence.swap_item(value, value - 1)
+
+        self.update_video_model_item(value)
+        self.update_video_model_item(value - 1)
 
         self.list_ctrl.Select(self.first_selected_index, on=0)  # 取消原来的选中
         self.list_ctrl.Select(self.first_selected_index - 1)
 
     def MovDownBtnOnClick(self, event):
-        if self.first_selected_index == -1:
+        value = self.first_selected_index
+
+        if value == -1:
             return  # 如果没有选中
 
-        if self.first_selected_index == self.list_ctrl.GetItemCount() - 1:
+        if value == self.list_ctrl.GetItemCount() - 1:
             wx.MessageBox("选中素材在最末端。", "错误", style=wx.YES_DEFAULT | wx.ICON_QUESTION)
             return  # 如果是最后一个
 
-        self.item_swap(self.first_selected_index, self.first_selected_index + 1)
+        self.video_sequence.swap_item(self.first_selected_index, self.first_selected_index + 1)
+
+        self.update_video_model_item(value)
+        self.update_video_model_item(value + 1)
 
         # 选中转移
         self.list_ctrl.Select(self.first_selected_index, on=0)  # 取消原来的选中
         self.list_ctrl.Select(self.first_selected_index + 1)
 
     def ExportBtnOnClick(self, event):
         # TODO: 加了码率设置的功能，别忘了测试
+        # TODO: item list 重写
 
         # 从界面读取导出文件名、路径、码率
         export_name = self.ExportNameCtrl.GetValue()
@@ -183,7 +188,7 @@ def ExportBtnOnClick(self, event):
             export_name = export_path + '/' + export_name
         else:
             # 默认使用第一个文件的目录
-            path = os.path.dirname(self.item_list[0]["path"])
+            path = os.path.dirname(self.video_sequence[0].path)
             export_name = path + '/' + export_name
 
         threading.Thread(target=self.export_video_file, args=(export_amix, export_mbps, export_name)).start()
@@ -192,28 +197,23 @@ def ExportBtnOnClick(self, event):
         return
 
     def export_video_file(self, export_amix, export_mbps, export_name):
+        # TODO: item list 重写
         # 导出命令
         console_command = 'ffmpeg '
         filter_complex_string = '-filter_complex '
         filter_complex_filters: list[str] = []
         concat_inputs: list[str] = []
-        for item in self.item_list:
-            no = item["no"]
-            start_time = item["start_time"]
-            end_time = item["end_time"]
-            item_path = item["path"]
-
-            # 防止一些奇怪的东西
-            if start_time == '':
-                start_time = "开头"
-            if end_time == '':
-                end_time = "结尾"
+        for index, item in enumerate(self.video_sequence):
+            no = index
+            start_time = item.start_time
+            end_time = item.end_time
+            item_path = item.path
 
             # 开始、结束时间以及路径的命令行参数生成
             time_param = []
-            if start_time != "开头":
+            if start_time != "":
                 time_param.append(f'-ss {start_time}')
-            if end_time != "结尾":
+            if end_time != "":
                 time_param.append(f'-to {end_time}')
             time_param.append(f'-i "{item_path}"')
             time_string = " ".join(time_param)
@@ -268,106 +268,78 @@ def add_files(self, item_no, filename, path):
         :return: 空
         """
         # 构建物品字典
-        item_dict = {"no": item_no,
-                     "filename": filename,
-                     "start_time": "开头",
-                     "end_time": "结尾",
-                     "path": path
-                     }
+        item = VideoModel(path, filename)
 
         # 加到物品表
-        self.item_list.append(item_dict)
+        self.video_sequence.append_video(item)
 
         # 显示数据在界面
-        index = self.list_ctrl.InsertItem(item_dict["no"], item_dict["no"])
-        self.list_load_item(item_dict, index)
-
-        pass
+        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 OnStartTimeCtrlText(self, event):
         """修改开始时间输入框的时候修改itemlist的start_time"""
-        first_selected_index = self.first_selected_index
+        index = self.first_selected_index
         value = self.StartTimeCtrl.GetValue()
 
-        if value == '':
-            value = "开头"
-            self.item_list[first_selected_index]["start_time"] = value
-        else:
-            self.item_list[first_selected_index]["start_time"] = self.format_time(value)
+        self.video_sequence[index].start_time = value
 
-        self.list_load_item(self.item_list[first_selected_index], first_selected_index)
+        self.update_video_model_item(index)
 
     def OnEndTimeCtrlText(self, event):
         """修改结束时间输入框的时候修改itemlist的end_time"""
-        first_selected_index = self.first_selected_index
+        index = self.first_selected_index
         value = self.EndTimeCtrl.GetValue()
 
-        if value == '':
-            value = "结尾"
-            self.item_list[first_selected_index]["end_time"] = value
-        else:
-            self.item_list[first_selected_index]["end_time"] = self.format_time(value)
+        self.video_sequence[index].end_time = value
 
-        self.list_load_item(self.item_list[first_selected_index], first_selected_index)
+        self.update_video_model_item(index)
 
     def list_ctrl_on_selected(self, event):
-        first_selected_index = self.list_ctrl.GetFirstSelected()
-        self.first_selected_index = first_selected_index
+        index = self.list_ctrl.GetFirstSelected()
+        self.first_selected_index = index
 
         # 获取选中的物品时间，同步到输入框
-        self.StartTimeCtrl.SetValue(self.item_list[first_selected_index]["start_time"])
-        self.EndTimeCtrl.SetValue(self.item_list[first_selected_index]["end_time"])
+        self.StartTimeCtrl.SetValue(self.video_sequence[index].start_time)
+        self.EndTimeCtrl.SetValue(self.video_sequence[index].end_time)
 
         logging.debug(
-            f"Selected Item Index: {self.first_selected_index}, \
-                    Selected Item no: {self.item_list[self.first_selected_index]}")
+            f"Selected Item Index: {index}, \
+                    Selected Item no: {self.video_sequence[index]}")
 
-    def item_swap(self, item1_index, item2_index):
-        """
-        交换物品函数。会交换物品在列表的序号，位置，并更新控件上的位置
-        :param item1_index: 交换的物品 1
-        :param item2_index: 交换的物品 2
-        :return:
-        """
+    def update_video_model_item(self, no):
+        self.load_video_model_item(self.video_sequence[no], no)
 
-        # 更新物品列表的序号
-        temp = self.item_list[item1_index]["no"]
-        self.item_list[item1_index]["no"] = self.item_list[item2_index]["no"]
-        self.item_list[item2_index]["no"] = temp
+    def update_sequence_model(self):
+        self.load_sequence_model(self.video_sequence)
 
-        # 更新物品列表的位置
-        temp = self.item_list[item1_index]
-        self.item_list[item1_index] = self.item_list[item2_index]
-        self.item_list[item2_index] = temp
-
-        # 交换用户界面上的显示
-        self.list_load_item(self.item_list[item1_index], self.item_list[item1_index]["no"])
-        self.list_load_item(self.item_list[item2_index], self.item_list[item2_index]["no"])
-
-    def list_load_item(self, load_item, list_ctrl_index):
+    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(load_item["no"]))
-        self.list_ctrl.SetItem(list_ctrl_index, 1, load_item["filename"])
-        self.list_ctrl.SetItem(list_ctrl_index, 2, load_item["start_time"])
-        self.list_ctrl.SetItem(list_ctrl_index, 3, load_item["end_time"])
-        self.list_ctrl.SetItem(list_ctrl_index, 4, load_item["path"])
+        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 list_load_all_item(self):
+    def load_sequence_model(self, sequence: VideoSequenceModel):
         """
         把物品列表上的所有物品载入到用户界面的控件上
         :return:
         """
-        for item in self.item_list:
-            self.list_load_item(item, item["no"])
+        for index, item in enumerate(sequence):
+            self.load_video_model_item(item, index)
 
     def on_export_done(self, msg: ExportMessage):
         logging.debug(f"Export Done: {msg}")