fix bugs on linux

Author: molihuan

modules/service/init/InitManager.py

@@ -2,6 +2,7 @@
 
 from PySide6.QtWidgets import QHeaderView, QTableWidget
 
+from modules.utils.SysUtils import SysUtils
 from modules.service.base.BaseService import BaseService
 from modules.service.manager.ConfigManager import ConfigManager, ConfigKey
 from modules.utils.PathUtils import PathUtils
@@ -53,6 +54,9 @@ def initData(self):
         sysFFmpegPath = configManager.get(ConfigKey.SYS_FFMPEG_PATH)
         context.setSysFFmpegPath(sysFFmpegPath)
 
+        # 检查ffmpeg是否有执行权限
+        SysUtils.checkFFmpegExecPermissions(sysFFmpegPath)
+
         # allPath = context.getConfigPathDict()
         # # 检查路径是否有空格
         # StrUtils.isNullOrWhitespace(context, allPath)

modules/utils/FFmpegUtils.py

@@ -17,7 +17,7 @@ def runCommand(content, cacheInfo: CacheInfo, outputAllPath: str):
         if blvPathList is None:
             audioPath = cacheInfo.getAudioPath()
             videoPath = cacheInfo.getVideoPath()
-            
+
             cmd = f"{ffmpegPath} -i {audioPath} -i {videoPath} -c copy -y {outputAllPath}"
         else:
             srcDir = os.path.dirname(blvPathList[0])
@@ -37,5 +37,7 @@ def runCommand(content, cacheInfo: CacheInfo, outputAllPath: str):
 
         if return_code == 0:
             return True
+        elif return_code == 126:
+            print("ffmpeg没有权限")
         else:
             return False

modules/utils/SysUtils.py

@@ -1,3 +1,5 @@
+import os
+import subprocess
 import sys
 from enum import Enum
 
@@ -34,3 +36,19 @@ def getTransparentIcon() -> QIcon:
         transparent_icon.addPixmap(transparent_pixmap)
 
         return transparent_icon
+
+    # 检查ffmpeg文件是否具有可执行权限
+    @staticmethod
+    def checkFFmpegExecPermissions(ffmpeg_path: str):
+        if os.access(ffmpeg_path, os.X_OK):
+            print("ffmpeg具有执行权限")
+        else:
+            print("ffmpeg没有执行权限")
+            # 使用subprocess执行chmod命令给ffmpeg文件添加可执行权限
+            cmd = f"chmod 775 {ffmpeg_path}"
+            exit_code = subprocess.call(cmd, shell=True)
+
+            if os.access(ffmpeg_path, os.X_OK):
+                print(f"自动授权成功")
+            else:
+                print(f"自动授权失败，请手动给{ffmpeg_path}授予执行权限")

script/packagescript.py

@@ -2,22 +2,27 @@
 import shutil
 import sys
 from enum import Enum
+import sys
 
 import PyInstaller.__main__
-
-from modules.utils.SysUtils import SysType, SysUtils
-from script.appDetails import APP_NAME
-
+#///////////////不能改变导入顺序///////////////////////////////
 workPath = os.getcwd()
 workParentPath = os.path.dirname(workPath)
+# 将workParentPath也设置为工作目录
+sys.path.append(workParentPath)
+from script.appDetails import APP_NAME
+from modules.utils.SysUtils import SysType, SysUtils
+#//////////////////////////////////////////////
+
+
 # 未打包路径
-ffmpegExePath = "../res/ffmpeg/ffmpeg.exe"
+ffmpegExePath = os.path.join(workParentPath,"res/ffmpeg/ffmpeg.exe")
 # 打包后的路径
 ffmpegPackageDir = "./res/ffmpeg"
 ffmpegPackageDirUpkg = "./res/ffmpeg/ffmpeg.exe"
 pythonMainPath = os.path.join(workParentPath, 'main.py')
 outputDir = os.path.join(workPath, "dist")
-icoPath = workParentPath + '/res/images/images/ml.ico'
+icoPath =os.path.join(workParentPath,'res/images/images/ml.ico')
 
 themesPath = os.path.join(workParentPath, 'themes')
 themesPackageDir = "./themes"
@@ -28,14 +33,14 @@
 def beforePkgMac():
     global ffmpegExePath
     global ffmpegPackageDirUpkg
-    ffmpegExePath = "../res/ffmpeg/ffmpeg-mac"
+    ffmpegExePath = os.path.join(workParentPath,"res/ffmpeg/ffmpeg-mac")
     ffmpegPackageDirUpkg = "./res/ffmpeg/ffmpeg-mac"
 
 
 def beforePkgLinux():
     global ffmpegExePath
     global ffmpegPackageDirUpkg
-    ffmpegExePath = "../res/ffmpeg/ffmpeg-linux"
+    ffmpegExePath = os.path.join(workParentPath, "res/ffmpeg/ffmpeg-linux")
     ffmpegPackageDirUpkg = "./res/ffmpeg/ffmpeg-linux"
 
 
@@ -52,10 +57,10 @@ def Ppkg(sysType):
         pythonMainPath,  # 指定你的Python脚本文件
         '--add-data', f'{ffmpegExePath};{ffmpegPackageDir}',  # 将ffmpeg文件复制到指定目录
         '-n', softName,
+        '--add-binary', f'{themesPath};{themesPackageDir}',
         # 前面的顺序不要动
-        # '--add-binary', f'{ffmpegExePath};{ffmpegPackageDir}',  # 将ffmpeg文件夹复制到指定目录
+        # '--add-binary', f'{ffmpegExePath}:{ffmpegPackageDir}',  # 将ffmpeg文件夹复制到指定目录
         # '--onefile',  # 打包成一个单独的可执行文件
-        '--add-binary', f'{themesPath};{themesPackageDir}',
         '-i', icoPath,
         '--noconsole',  # 不显示控制台窗口
         '--clean',
@@ -64,8 +69,9 @@ def Ppkg(sysType):
     # 需要打包文件夹
     if sysType == SysType.LINUX:
         cmd[1] = "--add-binary"
-        cmd[2] = f'{ffmpegExePath};{ffmpegPackageDirUpkg}'
+        cmd[2] = f'{ffmpegExePath}:{ffmpegPackageDirUpkg}'
         cmd[4] = APP_NAME
+        cmd[6] = f'{themesPath}:{themesPackageDir}'
 
     PyInstaller.__main__.run(cmd)
 
@@ -145,7 +151,6 @@ def chooseType(sysType, inType):
     print(
         f"请选择打包方式:\n{PkgType.PYINSTALLER_PKG.value}.PyInstaller\n{PkgType.NUITKA.value}.Nuitka\n{PkgType.NON.value}.什么也不做\n请输入前面的序号:")
     inType = int(input())
-
     # sysType = SysType.MAC
     # sysType = SysType.LINUX
     if inType == PkgType.NON.value: