激活相关 bugfix；少量参数调整；多选任务时右键可直接调出批量操作菜单，支持批量下载；修复预设名中包含“.”时的异常

Author: ttqftech

WindowsInstaller/FFBox.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "FFBox"
-#define MyAppVersion "5.1"
+#define MyAppVersion "5.2"
 #define MyAppPublisher "滔滔清风"
 #define MyAppURL "http://ttqf.tech"
 ; #define MyCopyright "版权所有"
@@ -11,7 +11,7 @@
 
 ; 安装包输出文件夹
 #define MySetupOutDir "./output"
-#define MySetupOutBaseFilename "Windows_x86-64_FFBox_5.1"
+#define MySetupOutBaseFilename "Windows_x86-64_FFBox_5.2"
 
 ; 安装包所用的资源文件夹
 #define MyResDir "./res"
@@ -21,7 +21,7 @@
 ; 点击 license 打开的网页连接
 #define MyAppLkLicenseURL 'http://ffbox.ttqf.tech/LICENSE'
 ; 安装目录至少需要的空间
-#define MyAppNeedSpaceByte 322000000
+#define MyAppNeedSpaceByte 321000000
 ; 外部程序调用本安装程序时，会向外部传安装进度的 window api Message ID 
 #define WM_MY_INSTALL_PROGRESS 6364
 

package.json

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

scripts/dev-frontend.mjs

@@ -137,7 +137,7 @@ await injectProcessEnv();
 // bootstrap
 const server = await createServer({ configFile: rendererConfig })
 
-await server.listen();
+await server.listen(5174);
 const address = server.httpServer.address();
 console.log(`已启动服务于 ${address.address}:${address.port}`);
 await watchPreload(server);

src/backend/FFBoxService.ts

@@ -1110,11 +1110,10 @@ export class FFBoxService extends (EventEmitter as new () => TypedEventEmitter<F
 				return true;
 			}
 		}
-		if (this.functionLevel < 45) {
-			if (progressLog.elapsed + new Date().getTime() / 1000 - progressLog.lastStarted > 671) {
-				this.trailLimit_stopTranscoding(id, 'working');
-				return true;
-			}
+		const maxWorkingDuration = this.functionLevel < 45 ? 671 : 40271;
+		if (progressLog.elapsed + new Date().getTime() / 1000 - progressLog.lastStarted > maxWorkingDuration) {
+			this.trailLimit_stopTranscoding(id, 'working');
+			return true;
 		}
 	}
 

src/common/constants.ts

@@ -1,11 +1,11 @@
 export const version = (() => {
-    let ret = '5.2-alpha';
+    let ret = '5.2';
     if (!buildInfo) {
         ret += ' *'
     } else if (buildInfo.isDev) {
         ret += ` ${buildInfo.gitCommit}`
     }
     return ret;
 })();
-export const buildNumber = 18;
-//	1.0	1.1	2.0	2.1	2.2	2.3	2.4 2.5 2.6 3.0 4.0 4.1 4.2 4.3 4.4 4.5 5.0 5.1
+export const buildNumber = 19;
+//	1.0	1.1	2.0	2.1	2.2	2.3	2.4 2.5 2.6 3.0 4.0 4.1 4.2 4.3 4.4 4.5 5.0 5.1 5.2

src/common/i11n/zh-CN.ts

@@ -3,14 +3,13 @@ import { I11n } from './i11n';
 const lang: I11n = {
 	service: {
 		功能限制_暂停转码: (taskName, byFrontend, reason) =>
-			`任务「${taskName}」转码达到${byFrontend ? '前端' : '后端'}时长上限了\n` +
-			`💔您的用户等级最高支持 11:11 的${reason === 'media' ? '媒体时长' : '处理耗时'}\n` +
+			`任务「${taskName}」转码达到${byFrontend ? '前端' : '后端'}的${reason === 'media' ? '媒体时长' : '处理耗时'}时长上限了\n` +
 			'🤫开发者设计该项限制的意图是为了给“伸手党”和“白嫖党”制造一些不便😞谁知盘中餐，粒粒皆辛苦！\n' +
 			'☺️探访一下 FFBox 官网、作者发布媒介，或者 AI，或许就能发现激活方式了✅',
 		功能限制_不能继续: (taskName, byFrontend, reason, pid) =>
-			`任务「${taskName}」转码达到${byFrontend ? '前端' : '后端'}时长上限了\n` +
-			`💔您的用户等级最高支持 11:11 的${reason === 'media' ? '媒体时长' : '处理耗时'}\n` +
-			`您可以选择停止该任务，或改用 FFBox 以外的软件恢复进程。PID：${pid}`,
+			`任务「${taskName}」转码达到${byFrontend ? '前端' : '后端'}的${reason === 'media' ? '媒体时长' : '处理耗时'}时长上限了\n` +
+			'请在菜单中心的功能解限面板查看详情\n' +
+			`您可以选择停止该任务、激活${byFrontend ? '前端' : '后端'}后重试，或改用 FFBox 以外的软件恢复进程。PID：${pid}`,
 		功能限制_任务数上限: (maxTaskCount, byFrontend) =>
 			`😞任务数量达到${byFrontend ? '前端' : '后端'}上限了\n` +
 			`💔您的用户等级最高支持在任务列表中放入 ${maxTaskCount} 个任务，您可以先删除一些任务再添加\n` +

src/common/params/formats.ts

@@ -107,18 +107,6 @@ export const builtInMuxers: MenuItem<Muxer>[] = [
 				label: 'DVD',
 				tooltip: '（另有 .vob 扩展名）\n默认视频编码器：mpeg2video\n默认音频编码器：mp2',
 			},
-			{
-				type: 'normal',
-				value: 'h264',
-				label: 'h264',
-				tooltip: 'h.264 裸流',
-			},
-			{
-				type: 'normal',
-				value: 'hevc',
-				label: 'hevc',
-				tooltip: 'hevc 裸流',
-			},
 		],
 	},
 	{
@@ -265,6 +253,24 @@ export const builtInMuxers: MenuItem<Muxer>[] = [
 				label: 'WEBP',
 				tooltip: 'WebP 是由 Google 开发的衍生自 VP8 的现代图像格式，支持有损和无损压缩、透明通道和动画，广泛用于网页图片。',
 			},
+			{
+				type: 'normal',
+				value: 'h264',
+				label: 'h264',
+				tooltip: 'h.264 裸流',
+			},
+			{
+				type: 'normal',
+				value: 'hevc',
+				label: 'hevc',
+				tooltip: 'hevc 裸流',
+			},
+			{
+				type: 'normal',
+				value: 'mjpeg',
+				label: 'mjpeg',
+				tooltip: 'mjpeg 裸流',
+			},
 		],
 	},
 ];

src/common/params/vcodecs.ts

@@ -1708,6 +1708,7 @@ export const resolution: MenuItem[] = [
 	{ type: 'submenu', label: '电脑显示标准', subMenu: [
 		{ type: 'normal', label: '10240×4320', value: '10240x4320', tooltip: '(64:27), 44.2M 像素' },
 		{ type: 'normal', label: '7680×4320', value: '7680x4320', tooltip: 'UHD 8K (16:9), 33.2M 像素' },
+		{ type: 'normal', label: '6144×3456', value: '6144x3456', tooltip: '(16:9), 21.2M 像素' },
 		{ type: 'normal', label: '5760×3240', value: '5760x3240', tooltip: '(16:9), 18.7M 像素' },
 		{ type: 'normal', label: '5120×3200', value: '5120x3200', tooltip: 'WHXGA (8:5), 16.4M 像素' },
 		{ type: 'normal', label: '4096×3072', value: '4096x3072', tooltip: '(4:3), 12.6M 像素' },

src/main/index.ts

@@ -14,13 +14,19 @@ import osBridge from './osBridge';
 import * as mica from './mica';
 // import { FFBoxService } from './service/FFBoxService';
 
+interface DownloadMap {
+	item?: Electron.DownloadItem;
+	finalFileBaseName?: string;
+	dir?: string;	// 批量下载前指定文件夹，这样每个文件下载时就不弹窗
+	fileTime?: { accessTime: number, createTime: number, modifyTime: number };
+}
 
 class ElectronApp {
 	mainWindow: BrowserWindow | null = null;
 	// electronStore: ElectronStore;
 	service: ProcessInstance | null = null;
 	blockWindowClose = true;
-	downloadMap: Map<string, { item?: Electron.DownloadItem, finalFileBaseName?: string, fileTime?: { accessTime: number, createTime: number, modifyTime: number } }> = new Map();
+	downloadMap: Map<string, DownloadMap> = new Map();
 
 	constructor() {
 		this.mountAppEvents();
@@ -149,8 +155,11 @@ class ElectronApp {
 			if (!map || map?.item) return;
 			map.item = item;
 
-			item.setSaveDialogOptions({ defaultPath: map.finalFileBaseName });
-			// item.setSavePath(folderpath + `\\${item.getFilename()}`);	// 设置文件存放位置
+			if (map.dir) {
+				item.setSavePath(path.join(map.dir, map.finalFileBaseName));
+			} else {
+				item.setSaveDialogOptions({ defaultPath: map.finalFileBaseName });
+			}
 			mainWindow.webContents.send('downloadStatusChange', { url: url, status: 'started' });
 			item.on('updated', (event, state) => {
 				if (state === 'interrupted') {
@@ -435,6 +444,19 @@ class ElectronApp {
 			this.mainWindow!.webContents.downloadURL(params.url);
 		});
 
+		ipcMain.on('downloadFiles', async (_event, params: { sessionId: string; files: { url: string; finalFileBaseName?: string; fileTime?: any }[] }) => {
+			const result = await dialog.showOpenDialog(this.mainWindow, {
+				title: `指定 ${params.files.length} 个下载文件的保存文件夹`,
+				properties: ['openDirectory', 'createDirectory']
+			});
+			if (!result.canceled) {
+				for (const file of params.files) {
+					this.downloadMap.set(file.url, { finalFileBaseName: file.finalFileBaseName, fileTime: file.fileTime, dir: result.filePaths[0] });
+					this.mainWindow!.webContents.downloadURL(file.url);
+				}
+			}
+		});
+
 		// 启动一个 ffboxService，这个 ffboxService 目前钦定监听 localhost:33269，而 serviceBridge 会连接此 service
 		ipcMain.handle('startService', () => this.createService());