修复 Linux 和 macOS 下 ffmpeg 路径识别问题；修复菜单项 icon 位置问题和 vue deep style 用法

Author: ttqftech

.vscode/settings.json

@@ -13,6 +13,6 @@
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": false
+		"source.fixAll.eslint": "never"
 	},
 }

WindowsInstaller/FFBox.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "FFBox"
-#define MyAppVersion "4.2"
+#define MyAppVersion "4.3"
 #define MyAppPublisher "滔滔清风"
 #define MyAppURL "http://ttqf.tech"
 ; #define MyCopyright "版权所有"
@@ -11,7 +11,7 @@
 
 ; 安装包输出文件夹
 #define MySetupOutDir "./output"
-#define MySetupOutBaseFilename "Windows_x86-64_FFBox_4.2"
+#define MySetupOutBaseFilename "Windows_x86-64_FFBox_4.3"
 
 ; 安装包所用的资源文件夹
 #define MyResDir "./res"
@@ -21,7 +21,7 @@
 ; 点击 license 打开的网页连接
 #define MyAppLkLicenseURL 'http://ttqf.tech/LICENSE'
 ; 安装目录至少需要的空间
-#define MyAppNeedSpaceByte 280000000
+#define MyAppNeedSpaceByte 290000000
 ; 外部程序调用本安装程序时，会向外部传安装进度的 window api Message ID 
 #define WM_MY_INSTALL_PROGRESS 6364
 
@@ -51,7 +51,7 @@ DefaultDirName={pf}/{#MyAppName}
 LicenseFile={#MyAppPkgDir}\LICENSE
 OutputDir={#MySetupOutDir}
 OutputBaseFilename={#MySetupOutBaseFilename}
-SetupIconFile={#MyResDir}\256.ico
+SetupIconFile={#MyResDir}\..\..\config\256.ico
 ; ArchitecturesAllowed 指示安装包运行时检查系统的架构类型
 ArchitecturesAllowed=x64compatible
 ; ArchitecturesInstallIn64BitMode 指示安装包本体的架构类型

config/256.icns

@@ -21,7 +21,7 @@
   ],
   "win": {
     "artifactName": "${productName}_${version}.${ext}",
-    "icon": "256.png",
+    "icon": "config/256.ico",
     "target": [
       {
         "target": "dir",
@@ -41,7 +41,7 @@
   },
   "mac": {
     "artifactName": "${productName}_${version}.${ext}",
-    "icon": "512.png",
+    "icon": "config/512.png",
     "target": [
       {
         "target": "dmg",
@@ -57,7 +57,7 @@
   },
   "linux": {
     "artifactName": "${productName}_${version}.${ext}",
-    "icon": "256.icns",
+    "icon": "config/256.icns",
     "target": [
       {
         "target": "AppImage",

config/256.ico

@@ -1,6 +1,6 @@
 {
   "name": "FFBox",
-  "version": "4.3.0-alpha",
+  "version": "4.3.0",
   "description": "",
   "main": "app/main/index.cjs",
   "scripts": {

config/512.png

@@ -26,7 +26,7 @@ export class FFBoxService extends (EventEmitter as new () => TypedEventEmitter<F
 	private workingStatus: WorkingStatus = WorkingStatus.idle;
 	private maxThreads = 1;
 	private ffmpegVersion = '';
-	private ffmpegPath = 'ffmpeg';
+	private ffmpegPath = '';
 	private customFFmpegPath: string;
 	private globalTask: ServiceTask;
 	public notifications: Notification[] = [];
@@ -66,7 +66,8 @@ export class FFBoxService extends (EventEmitter as new () => TypedEventEmitter<F
 		this.maxThreads = currentMaxThreads;
 		log.info(`设定最大同时运行任务数为 ${this.maxThreads}`);
 		const customFFmpegPath = await localConfig.get('service.customFFmpegPath');
-		if (this.customFFmpegPath !== customFFmpegPath) {
+		// 发生了变更，或者初始化时 ffmpegPath 为空（如果之前已经初始化过，那么 customFFmpegPath 两者之一不为空）
+		if (this.customFFmpegPath !== customFFmpegPath || !this.ffmpegPath && !customFFmpegPath) {
 			this.customFFmpegPath = customFFmpegPath as any || undefined;
 			this.initFFmpeg();
 		}
@@ -91,24 +92,25 @@ export class FFBoxService extends (EventEmitter as new () => TypedEventEmitter<F
 			this.ffmpegPath = this.customFFmpegPath;
 		} else {
 			log.info('检查 FFmpeg 路径和版本。');
-			if (process.platform === 'win32') {
-				this.ffmpegPath = 'ffmpeg';
-			}
+			this.ffmpegPath = 'ffmpeg';
 			if (process.platform === 'darwin') {
 				await fsPromise.access(path.join(process.execPath, '../ffmpeg'), fs.constants.X_OK).then((result) => {
-					this.ffmpegPath = path.join(process.execPath, '../ffmpeg'); // 【程序目录】沙箱运行模式，service 与 ffmpeg 处在同一层级
+					// 【程序目录】沙箱运行模式，service 与 ffmpeg 处在同一层级（此时 execPath 就是 FFBox.app 所在的绝对路径）
+					this.ffmpegPath = path.join(process.execPath, '../ffmpeg');
 				}).catch(() => {});
 				await fsPromise.access('/usr/local/bin/ffmpeg', fs.constants.X_OK).then((result) => {
-					this.ffmpegPath = '/usr/local/bin/ffmpeg'; // 【系统目录】macOS 只允许用户往 /usr/local/bin/ 放东西（而不能是 /usr/bin/），且此种情况下需要完整路径才能引用
+					// 【系统目录】macOS 只允许用户往 /usr/local/bin/ 放东西（而不能是 /usr/bin/），且此种情况下需要完整路径才能引用
+					this.ffmpegPath = '/usr/local/bin/ffmpeg';
 				}).catch(() => {});
 			}
 			if (process.platform === 'linux') {
 				await fsPromise.access(path.join(process.execPath, '../ffmpeg'), fs.constants.X_OK).then((result) => {
-					// 【程序目录】deb 沙箱运行模式。service 与 ffmpeg 处在同一目录（/opt/FFBox/）
+					// 【程序目录】deb 沙箱运行模式。service 与 ffmpeg 处在同一目录（此时 execPath 是 /opt/FFBox/FFBoxService，cwd 是 /home/[用户名]）
 					this.ffmpegPath = path.join(process.execPath, '../ffmpeg');
 				}).catch(() => {});
 				await fsPromise.access(path.join(process.cwd(), 'ffmpeg'), fs.constants.X_OK).then((result) => {
-					this.ffmpegPath = path.join(process.cwd(), 'ffmpeg'); // 【程序目录】AppImage 沙箱运行模式，读取 .AppImage 同级目录
+					// 【程序目录】AppImage 沙箱运行模式，读取 .AppImage 同级目录（此时 execPath 是 /tmp/.mount_FFBox_[hash]/FFBoxService，cwd 就是终端的 pwd）
+					this.ffmpegPath = path.join(process.cwd(), 'ffmpeg');
 				}).catch(() => {});
 				// 【系统目录】Linux 下 /usr/local/bin/ 和 /usr/bin/ 里的东西均能被直接引用，包括终端执行和沙箱执行，因此此处不需要进行处理
 				// console.log('路径', process.execPath, process.cwd(), __dirname, this.ffmpegPath);

electron-builder.json5

@@ -1,5 +1,5 @@
 export const version = (() => {
-    let ret = '4.3_alpha';
+    let ret = '4.3';
     if (!buildInfo) {
         ret += ' *'
     } else if (buildInfo.isDev) {

package.json

@@ -591,7 +591,7 @@ defineExpose({
 					display: flex;
 					justify-content: center;
 					align-items: center;
-					/deep/ svg {
+					&>:deep(svg) {
 						width: 20px;
 						height: 20px;
 					}