✨ 更新版本至0.2.0，优化导出逻辑与界面交互，分离导出线程和ui线程

Author: FishCat233

SimpleCutMainFrame.py

@@ -1,16 +1,21 @@
 """Subclass of MainFrame, which is generated by wxFormBuilder."""
 import os
+import subprocess
 import time
+from enum import Enum
 
 import wx
 
 import SimpleCutPy
 import logging
+import threading
 
 from command import concat_filter, merge_filestream_audio_channel
 from pymediainfo import MediaInfo
 
 
+VERSION = "0.2.0"
+
 class FileDropTarget(wx.FileDropTarget):
     def __init__(self, target):
         wx.FileDropTarget.__init__(self)
@@ -24,7 +29,16 @@ def OnDropFiles(self, x, y, filenames):
 
 
 # TODO: 重写配置的参数验证，建立物品类和导出配置 ExportConfig
-# TODO: 多线程剪辑
+
+class ExportMessageState(Enum):
+    SUCCESS = "成功"
+    ERROR = "错误"
+
+
+class ExportMessage:
+    def __init__(self, state: ExportMessageState, message: any):
+        self.state = state
+        self.message = message
 
 
 # Implementing MainFrame
@@ -156,7 +170,6 @@ def MovDownBtnOnClick(self, event):
         self.list_ctrl.Select(self.first_selected_index + 1)
 
     def ExportBtnOnClick(self, event):
-        # TODO: Implement ExportBtnOnClick
         # TODO: 加了码率设置的功能，别忘了测试
 
         # 从界面读取导出文件名、路径、码率
@@ -176,13 +189,21 @@ def ExportBtnOnClick(self, event):
         # 导出路径不为空则更改工作路径
         if not export_path == '':
             os.chdir(export_path)
+        else:
+            # 默认使用第一个文件的目录
+            os.chdir(os.path.dirname(self.item_list[0]["path"]))
+
+        threading.Thread(target=self.export_videofile, args=(export_amix, export_mbps, export_name)).start()
+        self.ExportBtn.Disable()
 
+        return
+
+    def export_videofile(self, export_amix, export_mbps, export_name):
         # 导出命令
         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"]
@@ -219,26 +240,28 @@ def ExportBtnOnClick(self, event):
             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 not export_name.endswith(".mp4"):
             export_name += ".mp4"
-
         console_command += f' -b:v {export_mbps}M "{export_name}"'
-
         logging.info(f"导出命令：{console_command}")
 
-        # os.system(console_command)
-        return
+        # 执行命令
+        try:
+            subprocess.run(console_command, shell=False, check=True)
+
+            # 完成命令，发送事件
+            wx.CallAfter(self.on_export_done, ExportMessage(ExportMessageState.SUCCESS, "导出完成"))
+        except subprocess.CalledProcessError as e:
+            # 导出失败，发送事件
+            wx.CallAfter(self.on_export_done, ExportMessage(ExportMessageState.ERROR, e))
+
 
     def ProjectWebBtnOnClick(self, event):
         # TODO: Implement ProjectWebBtnOnClick
@@ -332,6 +355,17 @@ 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 on_export_done(self, msg: ExportMessage):
+        logging.debug(f"Export Done: {msg}")
+        if msg.state == ExportMessageState.SUCCESS:
+            wx.MessageBox("导出成功", "提示", wx.OK | wx.ICON_INFORMATION)
+        elif msg.state == ExportMessageState.ERROR:
+            logging.error(f"Export Error: {msg.message}")
+            wx.MessageBox("导出失败", "提示", wx.OK | wx.ICON_INFORMATION)
+
+        self.ExportBtn.Enable()
+        return
+
 
 if __name__ == '__main__':
     App = wx.App()

SimpleCutPy.fbp

@@ -124,7 +124,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>
@@ -1745,7 +1745,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>
@@ -1836,7 +1836,7 @@
                       <property name="gripper">0</property>
                       <property name="hidden">0</property>
                       <property name="id">wxID_ANY</property>
-                      <property name="label">关于 Pure Clip：&#x0A;一个用于进行简单剪切工作的开源迷你剪辑软件。&#x0A;&#x0A;项目地址：&#x0A;&#x0A;--FishCat233&#x0A;2024.2.27&#x0A;&#x0A;Pure Clip 版本号&#x0A;0.1</property>
+                      <property name="label">关于 Pure Clip：&#x0A;一个用于进行简单剪切工作的开源迷你剪辑软件。&#x0A;&#x0A;项目地址：&#x0A;&#x0A;--FishCat233&#x0A;2024.2.27&#x0A;&#x0A;Pure Clip 版本号&#x0A;0.2.0</property>
                       <property name="markup">0</property>
                       <property name="max_size"></property>
                       <property name="maximize_button">0</property>

SimpleCutPy.py

@@ -88,7 +88,7 @@ def __init__( self, parent ):
 		self.m_panel2.SetSizer( bSizer4 )
 		self.m_panel2.Layout()
 		bSizer4.Fit( self.m_panel2 )
-		self.m_notebook1.AddPage( self.m_panel2, u"素材设置", True )
+		self.m_notebook1.AddPage( self.m_panel2, u"素材设置", False )
 		self.m_panel3 = wx.Panel( self.m_notebook1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
 		bSizer5 = wx.BoxSizer( wx.VERTICAL )
 
@@ -175,7 +175,7 @@ def __init__( self, parent ):
 		self.m_panel4 = wx.Panel( self.m_notebook1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
 		bSizer8 = wx.BoxSizer( wx.VERTICAL )
 
-		self.m_staticText6 = wx.StaticText( self.m_panel4, wx.ID_ANY, u"关于 Pure Clip：\n一个用于进行简单剪切工作的开源迷你剪辑软件。\n\n项目地址：\n\n--FishCat233\n2024.2.27\n\nPure Clip 版本号\n0.1", wx.DefaultPosition, wx.DefaultSize, 0 )
+		self.m_staticText6 = wx.StaticText( self.m_panel4, wx.ID_ANY, u"关于 Pure Clip：\n一个用于进行简单剪切工作的开源迷你剪辑软件。\n\n项目地址：\n\n--FishCat233\n2024.2.27\n\nPure Clip 版本号\n0.2.0", wx.DefaultPosition, wx.DefaultSize, 0 )
 		self.m_staticText6.Wrap( -1 )
 
 		bSizer8.Add( self.m_staticText6, 0, wx.ALL, 5 )
@@ -187,7 +187,7 @@ def __init__( self, parent ):
 		self.m_panel4.SetSizer( bSizer8 )
 		self.m_panel4.Layout()
 		bSizer8.Fit( self.m_panel4 )
-		self.m_notebook1.AddPage( self.m_panel4, u"关于", False )
+		self.m_notebook1.AddPage( self.m_panel4, u"关于", True )
 
 		bSizer3.Add( self.m_notebook1, 1, wx.EXPAND |wx.ALL, 5 )
 

pyproject.toml

@@ -7,5 +7,6 @@ requires-python = "==3.12.*"
 dependencies = [
     "logging>=0.4.9.6",
     "pymediainfo>=7.0.1",
+    "pypubsub>=4.0.3",
     "wxpython>=4.2.2",
 ]