🚧 优化项目结构，分离message模块

Author: FishCat233

SimpleCutMainFrame.py src/SimpleCutMainFrame.pySimpleCutMainFrame.py renamed to src/SimpleCutMainFrame.py

@@ -2,7 +2,6 @@
 import os
 import subprocess
 import time
-from enum import Enum
 
 import wx
 
@@ -11,6 +10,8 @@
 import threading
 
 from command import concat_filter, merge_filestream_audio_channel
+from message import ExportMessage, WorkStateEnum
+
 from pymediainfo import MediaInfo
 
 VERSION = "0.2.0"
@@ -30,16 +31,6 @@ def OnDropFiles(self, x, y, filenames):
 
 # TODO: 重写配置的参数验证，建立物品类和导出配置 ExportConfig
 
-class ExportMessageState(Enum):
-    SUCCESS = "成功"
-    ERROR = "错误"
-
-
-class ExportMessage:
-    def __init__(self, state: ExportMessageState, message: any):
-        self.state = state
-        self.message = message
-
 
 # Implementing MainFrame
 class SimpleCutPyMainFrame(SimpleCutPy.MainFrame):
@@ -192,16 +183,15 @@ def ExportBtnOnClick(self, event):
             export_name = export_path + '/' + export_name
         else:
             # 默认使用第一个文件的目录
-            # os.chdir(os.path.dirname(self.item_list[0]["path"]))
             path = os.path.dirname(self.item_list[0]["path"])
             export_name = path + '/' + export_name
 
-        threading.Thread(target=self.export_videofile, args=(export_amix, export_mbps, export_name)).start()
+        threading.Thread(target=self.export_video_file, args=(export_amix, export_mbps, export_name)).start()
         self.ExportBtn.Disable()
 
         return
 
-    def export_videofile(self, export_amix, export_mbps, export_name):
+    def export_video_file(self, export_amix, export_mbps, export_name):
         # 导出命令
         console_command = 'ffmpeg '
         filter_complex_string = '-filter_complex '
@@ -260,10 +250,10 @@ def export_videofile(self, export_amix, export_mbps, export_name):
             subprocess.run(console_command, shell=False, check=True, creationflags=subprocess.CREATE_NO_WINDOW)
 
             # 完成命令，发送事件
-            wx.CallAfter(self.on_export_done, ExportMessage(ExportMessageState.SUCCESS, "导出完成"))
+            wx.CallAfter(self.on_export_done, ExportMessage(WorkStateEnum.SUCCESS, "导出完成"))
         except subprocess.CalledProcessError as e:
             # 导出失败，发送事件
-            wx.CallAfter(self.on_export_done, ExportMessage(ExportMessageState.ERROR, e))
+            wx.CallAfter(self.on_export_done, ExportMessage(WorkStateEnum.FAIL, e))
 
     def ProjectWebBtnOnClick(self, event):
         # TODO: Implement ProjectWebBtnOnClick
@@ -299,14 +289,28 @@ def append_files(self, filename, path):
         self.add_files(item_no, filename, path)
 
     def OnStartTimeCtrlText(self, event):
+        """修改开始时间输入框的时候修改itemlist的start_time"""
         first_selected_index = self.first_selected_index
-        self.item_list[first_selected_index]["start_time"] = self.format_time(self.StartTimeCtrl.GetValue())
+        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.list_load_item(self.item_list[first_selected_index], first_selected_index)
 
     def OnEndTimeCtrlText(self, event):
+        """修改结束时间输入框的时候修改itemlist的end_time"""
         first_selected_index = self.first_selected_index
-        self.item_list[first_selected_index]["end_time"] = self.format_time(self.EndTimeCtrl.GetValue())
+        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.list_load_item(self.item_list[first_selected_index], first_selected_index)
 
@@ -357,11 +361,19 @@ def list_load_item(self, load_item, list_ctrl_index):
         self.list_ctrl.SetItem(list_ctrl_index, 3, load_item["end_time"])
         self.list_ctrl.SetItem(list_ctrl_index, 4, load_item["path"])
 
+    def list_load_all_item(self):
+        """
+        把物品列表上的所有物品载入到用户界面的控件上
+        :return:
+        """
+        for item in self.item_list:
+            self.list_load_item(item, item["no"])
+
     def on_export_done(self, msg: ExportMessage):
         logging.debug(f"Export Done: {msg}")
-        if msg.state == ExportMessageState.SUCCESS:
+        if msg.state == WorkStateEnum.SUCCESS:
             wx.MessageBox("导出成功", "提示", wx.OK | wx.ICON_INFORMATION)
-        elif msg.state == ExportMessageState.ERROR:
+        elif msg.state == WorkStateEnum.FAIL:
             logging.error(f"Export Error: {msg.message}")
             wx.MessageBox("导出失败", "提示", wx.OK | wx.ICON_INFORMATION)
 

SimpleCutPy.fbp src/SimpleCutPy.fbpSimpleCutPy.fbp renamed to src/SimpleCutPy.fbp

@@ -124,7 +124,7 @@
             <object class="notebookpage" expanded="true">
               <property name="bitmap"></property>
               <property name="label">素材设置</property>
-              <property name="select">0</property>
+              <property name="select">1</property>
               <object class="wxPanel" expanded="true">
                 <property name="BottomDockable">1</property>
                 <property name="LeftDockable">1</property>
@@ -571,7 +571,7 @@
                           <property name="focus"></property>
                           <property name="font"></property>
                           <property name="gripper">0</property>
-                          <property name="hidden">0</property>
+                          <property name="hidden">1</property>
                           <property name="id">wxID_ANY</property>
                           <property name="label">应用时间</property>
                           <property name="margins"></property>
@@ -1745,7 +1745,7 @@
             <object class="notebookpage" expanded="true">
               <property name="bitmap"></property>
               <property name="label">关于</property>
-              <property name="select">1</property>
+              <property name="select">0</property>
               <object class="wxPanel" expanded="true">
                 <property name="BottomDockable">1</property>
                 <property name="LeftDockable">1</property>

SimpleCutPy.py src/SimpleCutPy.pySimpleCutPy.py renamed to src/SimpleCutPy.py

@@ -62,6 +62,8 @@ def __init__( self, parent ):
 		bSizer81.Add( bSizer10, 1, wx.EXPAND, 5 )
 
 		self.ApplyTimeBtn = wx.Button( self.m_panel2, wx.ID_ANY, u"应用时间", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.ApplyTimeBtn.Hide()
+
 		bSizer81.Add( self.ApplyTimeBtn, 0, wx.ALL, 5 )
 
 

command.py src/command.pycommand.py renamed to src/command.py

@@ -1,5 +1,6 @@
-import time
-from abc import ABC, abstractmethod
+"""
+命令生成
+"""
 
 
 def concat_filter(input: list[str], output_video_name: str, output_audio_name: str, v: int = 1, a: int = 1) -> str:
@@ -42,4 +43,4 @@ def merge_filestream_audio_channel(input: str, audio_channel_number: int, output
     for i in range(audio_channel_number):
         inputs.append(f'{input}:a:{i}')
 
-    return amix_filter(inputs, output_audio_name)
+    return amix_filter(inputs, output_audio_name)

main.py src/main.pymain.py renamed to src/main.py

@@ -1,16 +1,15 @@
 import sys
-import logging
 
 from SimpleCutMainFrame import *
 
 if __name__ == '__main__':
+    import logging
+
     logging.basicConfig(level=logging.DEBUG)
 
     App = wx.App()
     mainFrame = SimpleCutPyMainFrame()
     mainFrame.Show(True)
     App.MainLoop()
 
-    # TODO: 解决程序没有彻底退出的问题
-    # 猜测是 App.MainLoop 主循环没有彻底结束
     sys.exit(0)

src/message.py

@@ -0,0 +1,15 @@
+"""
+多线程的 message
+"""
+from enum import Enum
+
+
+class WorkStateEnum(Enum):
+    SUCCESS = "成功"
+    FAIL = "失败"
+
+
+class ExportMessage:
+    def __init__(self, state: WorkStateEnum, message: any):
+        self.state = state
+        self.message = message