Merge pull request #484 from Freeesia/feature/fix_translate_error

Freeesia · web-flow · commit 18915611a69c · 2025-10-13T17:12:28.000+09:00
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/DeepLTranslator.cs b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/DeepLTranslator.cs
@@ -62,20 +62,27 @@ public async ValueTask<string[]> TranslateAsync(TextInfo[] srcTexts)
         var translated = srcTexts.Select(t => t.SourceText).ToArray();
         this.logger.LogDebug($"Translating {srcTexts.Length} texts.");
         var sw = Stopwatch.StartNew();
-        var glossaryId = await this.glossaryId.AsValueTask().ConfigureAwait(false);
-        await Parallel.ForEachAsync(srcTexts.GroupBy(t => t.Context).ToAsyncEnumerable(), async (g, ct) =>
+        try
         {
-            var context = string.Join('\n', this.context, g.Key);
-            var srcs = g.Select(t => t.SourceText).ToArray();
-            var results = await translator.TranslateTextAsync(srcs, this.sourceLang, this.targetLang, new() { Context = context, GlossaryId = glossaryId }, ct)
-                .ConfigureAwait(false);
-            foreach (var (s, t) in srcs.Zip(results))
+            var glossaryId = await this.glossaryId.AsValueTask().ConfigureAwait(false);
+            await Parallel.ForEachAsync(srcTexts.GroupBy(t => t.Context).ToAsyncEnumerable(), async (g, ct) =>
             {
-                var i = Array.IndexOf(translated, s);
-                translated[i] = t.Text;
-            }
-        }).ConfigureAwait(false);
-        this.logger.LogDebug($"Translated {srcTexts.Length} texts in {sw.Elapsed}");
+                var context = string.Join('\n', this.context, g.Key);
+                var srcs = g.Select(t => t.SourceText).ToArray();
+                var results = await translator.TranslateTextAsync(srcs, this.sourceLang, this.targetLang, new() { Context = context, GlossaryId = glossaryId }, ct)
+                    .ConfigureAwait(false);
+                foreach (var (s, t) in srcs.Zip(results))
+                {
+                    var i = Array.IndexOf(translated, s);
+                    translated[i] = t.Text;
+                }
+            }).ConfigureAwait(false);
+            this.logger.LogDebug($"Translated {srcTexts.Length} texts in {sw.Elapsed}");
+        }
+        catch (AuthorizationException)
+        {
+            throw new AppUserException(Properties.Resources.AuthError);
+        }
         return translated;
     }
 
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.Designer.cs b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.Designer.cs
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.de.resx b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.de.resx
@@ -121,9 +121,12 @@
     <value>API-Schlüssel</value>
   </data>
   <data name="GlossaryPath" xml:space="preserve">
-    <value>Glossarpfad</value>
+    <value>Glossar-Pfad</value>
   </data>
   <data name="NeedApiKey" xml:space="preserve">
-    <value>Der DeepL-API-Schlüssel ist nicht festgelegt. Bitte setzen Sie den DeepL-API-Schlüssel im Einstellungsdialog.</value>
+    <value>Der DeepL-API-Schlüssel ist nicht konfiguriert. Bitte setzen Sie den DeepL-API-Schlüssel im Einstellungsdialog.</value>
+  </data>
+  <data name="AuthError" xml:space="preserve">
+    <value>DeepL-Autorisierungsfehler. Ein ungültiger API-Schlüssel ist konfiguriert. Bitte versuchen Sie, den API-Schlüssel neu zu erstellen.</value>
   </data>
 </root>
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.en.resx b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.en.resx
@@ -121,9 +121,12 @@
     <value>API Key</value>
   </data>
   <data name="GlossaryPath" xml:space="preserve">
-    <value>glossary path</value>
+    <value>Glossary Path</value>
   </data>
   <data name="NeedApiKey" xml:space="preserve">
-    <value>DeepL API key is not set. Please set the DeepL API key from the settings dialog.</value>
+    <value>DeepL API key is not configured. Please set the DeepL API key from the settings dialog.</value>
+  </data>
+  <data name="AuthError" xml:space="preserve">
+    <value>DeepL authorization error. An invalid API key is configured. Please try recreating the API key.</value>
   </data>
 </root>
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.hi.resx b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.hi.resx
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+﻿<?xml version='1.0' encoding='utf-8'?>
 <root xmlns:ns1="urn:schemas-microsoft-com:xml-msdata" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   
   <xs:schema id="root">
@@ -68,4 +68,7 @@
   <data name="NeedApiKey" xml:space="preserve">
     <value>DeepL API कुंजी सेट नहीं है। कृपया सेटिंग्स डायलॉग से DeepL API कुंजी सेट करें।</value>
   </data>
+  <data name="AuthError" xml:space="preserve">
+    <value>DeepL प्राधिकरण त्रुटि। एक अमान्य API कुंजी कॉन्फ़िगर की गई है। कृपया API कुंजी को पुनः बनाने का प्रयास करें।</value>
+  </data>
 </root>
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.ko.resx b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.ko.resx
@@ -121,9 +121,12 @@
     <value>API 키</value>
   </data>
   <data name="GlossaryPath" xml:space="preserve">
-    <value>용어집 패스</value>
+    <value>용어집 경로</value>
   </data>
   <data name="NeedApiKey" xml:space="preserve">
     <value>DeepL API 키가 설정되지 않았습니다. 설정 대화상자에서 DeepL API 키를 설정해 주세요.</value>
   </data>
+  <data name="AuthError" xml:space="preserve">
+    <value>DeepL 인증 오류입니다. 유효하지 않은 API 키가 설정되어 있습니다. API 키를 재생성하는 등의 방법을 시도해 주세요.</value>
+  </data>
 </root>
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.resx b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.resx
@@ -126,4 +126,7 @@
   <data name="NeedApiKey" xml:space="preserve">
     <value>DeepLのAPIキーが設定されていません。設定ダイアログからDeepLのAPIキーを設定してください。</value>
   </data>
+  <data name="AuthError" xml:space="preserve">
+    <value>DeepLの認可エラーです。利用できないAPIキーが設定されています。APIキーの再作成などお試しください。</value>
+  </data>
 </root>
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.vi.resx b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.vi.resx
@@ -121,9 +121,12 @@
     <value>Khóa API</value>
   </data>
   <data name="GlossaryPath" xml:space="preserve">
-    <value>Đường dẫn thuật ngữ</value>
+    <value>Đường dẫn từ điển thuật ngữ</value>
   </data>
   <data name="NeedApiKey" xml:space="preserve">
     <value>Khóa API DeepL chưa được thiết lập. Vui lòng đặt khóa API DeepL từ hộp thoại cài đặt.</value>
   </data>
+  <data name="AuthError" xml:space="preserve">
+    <value>Lỗi xác thực DeepL. Đã cấu hình khóa API không hợp lệ. Vui lòng thử tạo lại khóa API.</value>
+  </data>
 </root>
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.zh-CN.resx b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.zh-CN.resx
@@ -121,9 +121,12 @@
     <value>API 密钥</value>
   </data>
   <data name="GlossaryPath" xml:space="preserve">
-    <value>词汇路径</value>
+    <value>词汇表路径</value>
   </data>
   <data name="NeedApiKey" xml:space="preserve">
     <value>未设置 DeepL API 密钥。请在设置对话框中设置 DeepL API 密钥。</value>
   </data>
+  <data name="AuthError" xml:space="preserve">
+    <value>DeepL 授权错误。配置了无效的 API 密钥。请尝试重新创建 API 密钥。</value>
+  </data>
 </root>
diff --git a/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.zh-TW.resx b/Plugins/WindowTranslator.Plugin.DeepLTranslatePlugin/Properties/Resources.zh-TW.resx
@@ -121,9 +121,12 @@
     <value>API 金鑰</value>
   </data>
   <data name="GlossaryPath" xml:space="preserve">
-    <value>詞彙路徑</value>
+    <value>詞彙表路徑</value>
   </data>
   <data name="NeedApiKey" xml:space="preserve">
     <value>未設定 DeepL API 金鑰。請在設定對話方塊中設定 DeepL API 金鑰。</value>
   </data>
+  <data name="AuthError" xml:space="preserve">
+    <value>DeepL 授權錯誤。設定了無效的 API 金鑰。請嘗試重新建立 API 金鑰。</value>
+  </data>
 </root>
diff --git a/WindowTranslator.Abstractions/AppUserException.cs b/WindowTranslator.Abstractions/AppUserException.cs
@@ -3,5 +3,16 @@
 /// <summary>
 /// ユーザの操作ミスなど、アプリケーションの使用方法に起因する例外を表します。
 /// </summary>
-/// <param name="message"></param>
-public class AppUserException(string? message) : Exception(message);
+/// <param name="message">エラーメッセージ</param>
+/// <param name="innerException">内部例外</param>
+public class AppUserException(string? message, Exception? innerException) : Exception(message, innerException)
+{
+    /// <summary>
+    /// コンストラクタ
+    /// </summary>
+    /// <param name="message">エラーメッセージ</param>
+    public AppUserException(string? message)
+        : this(message, null)
+    {
+    }
+}
diff --git a/WindowTranslator/Extensions/KamishibaiExtensions.cs b/WindowTranslator/Extensions/KamishibaiExtensions.cs
@@ -22,4 +22,17 @@ public static Task<bool> CloseAsync(this IWindow window)
         window.Close();
         return taskSource.Task;
     }
+
+    public static async ValueTask OpenErrorDialogAsync(this IPresentationService presentationService, string err, Exception ex, string target, string imagePath, object? owner = null)
+    {
+        if (ex is AppUserException || (ex is AggregateException { InnerExceptions: var exs } && exs.OfType<AppUserException>().Any()))
+        {
+            presentationService.ShowMessage(ex.Message, target, icon: MessageBoxImage.Exclamation, owner: owner);
+        }
+        else
+        {
+            await presentationService.OpenErrorReportDialogAsync(err, ex, target, imagePath, owner, new() { WindowStartupLocation = WindowStartupLocation.CenterOwner });
+        }
+    }
+
 }
diff --git a/WindowTranslator/Modules/Main/MainViewModelBase.cs b/WindowTranslator/Modules/Main/MainViewModelBase.cs
@@ -14,6 +14,7 @@
 using WindowTranslator.Modules.Capture;
 using WindowTranslator.Properties;
 using WindowTranslator.Stores;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace WindowTranslator.Modules.Main;
 
@@ -197,7 +198,7 @@ private async Task CreateTextOverlayAsync()
                     this.capture.StopCapture();
                     var path = Path.Combine(PathUtility.UserDir, $"ocr_error", $"{DateTime.UtcNow:yyyyMMdd'T'HHmmss'Z'}.png");
                     await sbmp.TrySaveImage(path);
-                    await this.presentationService.OpenErrorReportDialogAsync(Resources.FaildOcr, e, this.name, path);
+                    await this.presentationService.OpenErrorDialogAsync(Resources.FaildOcr, e, this.name, path);
                     StrongReferenceMessenger.Default.Send<CloseMessage>(new(this));
                     return;
                 }
@@ -295,9 +296,12 @@ private async Task TranslateAsync(IEnumerable<TextRect> texts)
         }
         catch (Exception e) when (e is not OperationCanceledException)
         {
+            this.logger.LogError(e, "翻訳中にエラーが発生");
             this.timer.DisposeAsync().Forget();
             this.capture.StopCapture();
-            await this.presentationService.OpenErrorReportDialogAsync(Resources.FaildTranslate, e, this.name, string.Empty);
+            // 翻訳失敗してエラーで閉じる場合はキューをクリア
+            Interlocked.Exchange(ref this.lastRequested, null);
+            await Application.Current.Dispatcher.BeginInvoke(async () => await this.presentationService.OpenErrorDialogAsync(Resources.FaildOverlay, e, this.name, string.Empty));
             StrongReferenceMessenger.Default.Send<CloseMessage>(new(this));
         }
         finally
diff --git a/WindowTranslator/Modules/Main/MainWindowModule.cs b/WindowTranslator/Modules/Main/MainWindowModule.cs
@@ -21,29 +21,38 @@ private async Task OpenTargetWindowCoreAsync(IntPtr targetWindowHandle, string n
     {
         using var l = await this.asyncLock.EnterAsync();
         var scope = provider.CreateScope();
-        var options = scope.ServiceProvider.GetRequiredService<IOptionsSnapshot<UserSettings>>();
-        var presentationService = scope.ServiceProvider.GetRequiredService<IPresentationService>();
-        var processInfo = scope.ServiceProvider.GetRequiredService<IProcessInfoStoreInternal>();
-        processInfo.SetTargetProcess(targetWindowHandle, name);
-
-        if (!options.Value.Targets.ContainsKey(name) && !await presentationService.OpenAllSettingsDialogAsync(name))
+        try
         {
-            return;
-        }
 
-        var window = options.Value.Common.ViewMode switch
-        {
-            ViewMode.Capture => await presentationService.OpenCaptureMainWindowAsync(),
-            ViewMode.Overlay => await presentationService.OpenOverlayMainWindowAsync(),
-            _ => throw new NotSupportedException(),
-        };
-        var info = new WindowInfo(name, targetWindowHandle, window);
-        window.Closed += (_, _) =>
+            var options = scope.ServiceProvider.GetRequiredService<IOptionsSnapshot<UserSettings>>();
+            var presentationService = scope.ServiceProvider.GetRequiredService<IPresentationService>();
+            var processInfo = scope.ServiceProvider.GetRequiredService<IProcessInfoStoreInternal>();
+            processInfo.SetTargetProcess(targetWindowHandle, name);
+
+            if (!options.Value.Targets.ContainsKey(name) && !await presentationService.OpenAllSettingsDialogAsync(name))
+            {
+                return;
+            }
+
+            var window = options.Value.Common.ViewMode switch
+            {
+                ViewMode.Capture => await presentationService.OpenCaptureMainWindowAsync(),
+                ViewMode.Overlay => await presentationService.OpenOverlayMainWindowAsync(),
+                _ => throw new NotSupportedException(),
+            };
+            var info = new WindowInfo(name, targetWindowHandle, window);
+            window.Closed += (_, _) =>
+            {
+                scope.Dispose();
+                this.OpenedWindows.Remove(info);
+            };
+            this.OpenedWindows.Add(info);
+        }
+        catch (Exception)
         {
             scope.Dispose();
-            this.OpenedWindows.Remove(info);
-        };
-        this.OpenedWindows.Add(info);
+            throw;
+        }
     }
 
     public void Dispose()
diff --git a/WindowTranslator/Modules/Settings/AllSettingsViewModel.cs b/WindowTranslator/Modules/Settings/AllSettingsViewModel.cs
@@ -321,14 +321,7 @@ public async Task SaveAsync(object window)
             }
             catch (Exception ex)
             {
-                if (ex is AppUserException || (ex is AggregateException { InnerExceptions: var exs } && exs.OfType<AppUserException>().Any()))
-                {
-                    this.presentationService.ShowMessage(ex.Message, icon: Kamishibai.MessageBoxImage.Exclamation, owner: window);
-                }
-                else
-                {
-                    await this.presentationService.OpenErrorReportDialogAsync(Resources.FaildApplySettings, ex, this.target, string.Empty, owner: window);
-                }
+                await this.presentationService.OpenErrorDialogAsync(Resources.FaildApplySettings, ex, this.target, string.Empty, owner: window);
             }
         }
         else
diff --git a/WindowTranslator/Modules/Startup/StartupViewModel.cs b/WindowTranslator/Modules/Startup/StartupViewModel.cs
@@ -1,16 +1,17 @@
-﻿using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using Composition.WindowsRuntimeHelpers;
-using Kamishibai;
-using Microsoft.Extensions.DependencyInjection;
-using System.Collections.ObjectModel;
+﻿using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Composition.WindowsRuntimeHelpers;
+using Kamishibai;
+using Microsoft.Extensions.DependencyInjection;
 using Windows.Graphics.Capture;
 using Windows.Win32.Foundation;
+using WindowTranslator.Extensions;
 using WindowTranslator.Modules.Main;
 using WindowTranslator.Properties;
 using static Windows.Win32.PInvoke;
@@ -117,14 +118,7 @@ public async Task RunAsync()
         }
         catch (Exception ex)
         {
-            if (ex is AppUserException || (ex is AggregateException { InnerExceptions: var exs } && exs.OfType<AppUserException>().Any()))
-            {
-                this.presentationService.ShowMessage(ex.Message, icon: Kamishibai.MessageBoxImage.Exclamation, owner: window);
-            }
-            else
-            {
-                await this.presentationService.OpenErrorReportDialogAsync(Resources.FaildOverlay, ex, p.Name, string.Empty, owner: window);
-            }
+            await this.presentationService.OpenErrorDialogAsync(Resources.FaildOverlay, ex, p.Name, string.Empty, window);
         }
         if (!beforeVisible)
         {
