chore: bump version to 2.7.0 in package.json

buxuku · buxuku · commit 84fc8dbbbc79 · 2025-09-26T15:51:02.000+08:00
- Updated version number in package.json to 2.7.0.
- Enhanced subtitle translation progress tracking in fileProcessor.ts.
- Improved logging for AI batch translation in ai.ts.
- Added progress display and consistency checks in TaskStatus.tsx and useIpcCommunication.tsx.
- Updated UI components to include new icons and improved functionality.
diff --git a/main/helpers/fileProcessor.ts b/main/helpers/fileProcessor.ts
@@ -56,23 +56,43 @@ async function generateSubtitle(
  * 翻译字幕
  */
 async function translateSubtitle(event, file: IFiles, formData, provider) {
+  // 强制发送翻译开始状态
   event.sender.send('taskFileChange', {
     ...file,
     translateSubtitle: 'loading',
+    translateSubtitleProgress: 0,
   });
 
+  // 强制发送初始进度
+  event.sender.send('taskProgressChange', file, 'translateSubtitle', 0);
+
   const onProgress = (progress) => {
+    const normalizedProgress = Math.min(Math.max(progress, 0), 100);
     event.sender.send(
       'taskProgressChange',
       file,
       'translateSubtitle',
-      Math.min(progress, 100),
+      normalizedProgress,
     );
   };
+
   try {
     await translate(event, file, formData, provider, onProgress);
-    event.sender.send('taskFileChange', { ...file, translateSubtitle: 'done' });
+
+    // 确保最终状态的正确发送
+    event.sender.send('taskProgressChange', file, 'translateSubtitle', 100);
+    event.sender.send('taskFileChange', {
+      ...file,
+      translateSubtitle: 'done',
+      translateSubtitleProgress: 100,
+    });
+
+    logMessage(
+      `Translation completed successfully for ${file.fileName}`,
+      'info',
+    );
   } catch (error) {
+    // 确保错误状态下也发送当前进度（从文件状态获取）
     onError(event, file, 'translateSubtitle', error);
   }
 }
diff --git a/main/translate/services/ai.ts b/main/translate/services/ai.ts
@@ -22,12 +22,24 @@ export async function handleAIBatchTranslation(
   const { provider, sourceLanguage, targetLanguage, translator } = config;
   const results: TranslationResult[] = [];
   const totalBatches = Math.ceil(subtitles.length / batchSize);
+  let processedSubtitles = 0;
+
+  logMessage(
+    `开始AI批量翻译：总共 ${subtitles.length} 条字幕，分为 ${totalBatches} 个批次，每批次 ${batchSize} 条`,
+    'info',
+  );
 
   for (let i = 0; i < subtitles.length; i += batchSize) {
     const batch = subtitles.slice(i, i + batchSize);
     const currentBatchIndex = Math.floor(i / batchSize) + 1;
     let retryCount = 0;
     let batchSuccess = false;
+    let batchResults: TranslationResult[] = [];
+
+    logMessage(
+      `处理批次 ${currentBatchIndex}/${totalBatches}，包含 ${batch.length} 条字幕`,
+      'info',
+    );
 
     while (!batchSuccess && retryCount <= maxRetries) {
       try {
@@ -89,7 +101,7 @@ export async function handleAIBatchTranslation(
 
           const parsedValues = Object.values(parsedContent);
 
-          const batchResults = batch.map((subtitle, index) => ({
+          batchResults = batch.map((subtitle, index) => ({
             id: subtitle.id,
             startEndTime: subtitle.startEndTime,
             sourceContent: subtitle.content.join('\n'),
@@ -106,7 +118,13 @@ export async function handleAIBatchTranslation(
           }
 
           results.push(...batchResults);
+          processedSubtitles += batch.length;
           batchSuccess = true;
+
+          logMessage(
+            `批次 ${currentBatchIndex}/${totalBatches} 翻译成功，已处理 ${processedSubtitles}/${subtitles.length} 条字幕`,
+            'info',
+          );
         } else {
           throw new Error(
             'Invalid response format: Failed to parse JSON structure',
@@ -136,7 +154,7 @@ export async function handleAIBatchTranslation(
             'error',
           );
           // 如果全部重试都失败，则添加失败记录，并继续下一批
-          const failedResults = batch.map((subtitle) => ({
+          batchResults = batch.map((subtitle) => ({
             id: subtitle.id,
             startEndTime: subtitle.startEndTime,
             sourceContent: subtitle.content.join('\n'),
@@ -145,22 +163,41 @@ export async function handleAIBatchTranslation(
 
           // 对失败的结果也进行处理和保存
           if (onTranslationResult) {
-            await onTranslationResult(failedResults);
+            await onTranslationResult(batchResults);
           }
 
-          results.push(...failedResults);
+          results.push(...batchResults);
+          processedSubtitles += batch.length;
           batchSuccess = true; // 标记为完成，继续下一批次
+
+          logMessage(
+            `批次 ${currentBatchIndex}/${totalBatches} 已标记为失败完成，继续下一批次`,
+            'warning',
+          );
         }
       }
     }
 
-    // 更新翻译进度
-    const progress = Math.min(((i + batchSize) / subtitles.length) * 100, 100);
+    // 更新翻译进度 - 使用实际处理的字幕数量计算
+    const progress = Math.min(
+      (processedSubtitles / subtitles.length) * 100,
+      100,
+    );
     if (onProgress) {
       onProgress(progress);
     }
+
+    logMessage(
+      `进度更新: ${progress.toFixed(2)}% (${processedSubtitles}/${subtitles.length})`,
+      'info',
+    );
   }
 
+  logMessage(
+    `AI批量翻译完成：共处理 ${processedSubtitles} 条字幕，成功 ${results.filter((r) => !r.targetContent.startsWith('[翻译失败:')).length} 条`,
+    'info',
+  );
+
   return results;
 }
 
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "smartsub",
   "description": "视频转字幕，字幕翻译软件",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "author": "buxuku <buxuku@gmail.com>",
   "main": "app/background.js",
   "scripts": {
diff --git a/renderer/components/TaskListControl.tsx b/renderer/components/TaskListControl.tsx
@@ -1,4 +1,4 @@
-import { Import, FileText } from 'lucide-react';
+import { Import, FileText, Trash2 } from 'lucide-react';
 import { Button } from './ui/button';
 import { useTranslation } from 'next-i18next';
 import { useState } from 'react';
@@ -37,6 +37,7 @@ const TaskListControl = ({ setFiles, formData }) => {
           variant="outline"
           onClick={handleClearList}
         >
+          <Trash2 className="size-5 mr-2" />
           {t('clearList')}
         </Button>
         <Button
diff --git a/renderer/components/TaskStatus.tsx b/renderer/components/TaskStatus.tsx
@@ -10,25 +10,40 @@ import {
 const TaskStatus = ({ file, checkKey, skip = false }) => {
   if (skip) return <RedoDot className="size-4" />;
 
-  if (file[checkKey] === 'loading') {
+  // 状态调试：检查进度与状态的一致性
+  const progressKey = `${checkKey}Progress`;
+  const progress = file[progressKey];
+  const status = file[checkKey];
+
+  // 调试日志（仅在开发环境）
+  if (process.env.NODE_ENV === 'development') {
+    // 检查状态不一致的情况
+    if (status === 'done' && progress !== undefined && progress < 100) {
+      console.warn(`状态不一致: ${checkKey} 状态为 done 但进度为 ${progress}%`);
+    }
+    if (status === 'loading' && progress === undefined) {
+      console.warn(`状态不一致: ${checkKey} 状态为 loading 但没有进度信息`);
+    }
+  }
+
+  if (status === 'loading') {
     // 检查是否有进度信息
-    const progressKey = `${checkKey}Progress`;
-    const hasProgress = file[progressKey] !== undefined;
+    const hasProgress = progress !== undefined && progress !== null;
+    const displayProgress = hasProgress ? Number(progress).toFixed(2) : '0.00';
+
     return (
       <div className="flex items-center gap-1">
         <Loader className="animate-spin size-4" />
-        {hasProgress && (
-          <span className="text-xs">{file[progressKey].toFixed(2)}%</span>
-        )}
+        <span className="text-xs">{displayProgress}%</span>
       </div>
     );
   }
 
-  if (file[checkKey] === 'done') {
+  if (status === 'done') {
     return <CircleCheck className="size-4" />;
   }
 
-  if (file[checkKey] === 'error') {
+  if (status === 'error') {
     const errorKey = `${checkKey}Error`;
     const errorMsg = file[errorKey] || '未知错误';
 
@@ -40,6 +55,9 @@ const TaskStatus = ({ file, checkKey, skip = false }) => {
           </TooltipTrigger>
           <TooltipContent>
             <p>{errorMsg}</p>
+            {progress !== undefined && (
+              <p className="text-xs text-gray-500 mt-1">进度：{progress}%</p>
+            )}
           </TooltipContent>
         </Tooltip>
       </TooltipProvider>
diff --git a/renderer/hooks/useIpcCommunication.tsx b/renderer/hooks/useIpcCommunication.tsx
@@ -25,11 +25,31 @@ export default function useIpcCommunication(setFiles) {
       key: string,
       progress: number,
     ) => {
+      // 验证进度值的合理性
+      const normalizedProgress = Math.min(Math.max(progress || 0, 0), 100);
+
       setFiles((prevFiles) => {
         const progressKey = `${key}Progress`;
-        const updatedFiles = prevFiles.map((file) =>
-          file.uuid === res?.uuid ? { ...file, [progressKey]: progress } : file,
-        );
+        const updatedFiles = prevFiles.map((file) => {
+          if (file.uuid === res?.uuid) {
+            const currentProgress = file[progressKey] || 0;
+
+            // 防止进度回退，除非是重新开始（进度为0）
+            if (
+              normalizedProgress === 0 ||
+              normalizedProgress >= currentProgress
+            ) {
+              return { ...file, [progressKey]: normalizedProgress };
+            }
+
+            // 如果进度回退了，记录警告但仍然更新（可能是重试）
+            console.warn(
+              `Progress rollback detected for ${key}: ${currentProgress} -> ${normalizedProgress}`,
+            );
+            return { ...file, [progressKey]: normalizedProgress };
+          }
+          return file;
+        });
         return updatedFiles;
       });
     };
@@ -50,9 +70,41 @@ export default function useIpcCommunication(setFiles) {
 
     const handleFileChange = (res: IFiles) => {
       setFiles((prevFiles) => {
-        const updatedFiles = prevFiles.map((file) =>
-          file.uuid === res?.uuid ? { ...file, ...res } : file,
-        );
+        const updatedFiles = prevFiles.map((file) => {
+          if (file.uuid === res?.uuid) {
+            const updatedFile = { ...file, ...res };
+
+            // 状态一致性检查：如果状态变为 'done'，确保进度为100%
+            Object.keys(res).forEach((key) => {
+              if (key.endsWith('Subtitle') && res[key] === 'done') {
+                const progressKey = `${key}Progress`;
+                if (
+                  !updatedFile[progressKey] ||
+                  updatedFile[progressKey] < 100
+                ) {
+                  updatedFile[progressKey] = 100;
+                }
+              }
+
+              // 如果状态变为 'error'，保持当前进度不变
+              if (key.endsWith('Subtitle') && res[key] === 'error') {
+                const progressKey = `${key}Progress`;
+                // 保持原有进度，不重置
+              }
+
+              // 如果状态变为 'loading'，确保有初始进度
+              if (key.endsWith('Subtitle') && res[key] === 'loading') {
+                const progressKey = `${key}Progress`;
+                if (!updatedFile[progressKey]) {
+                  updatedFile[progressKey] = 0;
+                }
+              }
+            });
+
+            return updatedFile;
+          }
+          return file;
+        });
         return updatedFiles;
       });
     };
diff --git a/resources/WechatIMG428.png b/resources/WechatIMG428.png
