Merge pull request #456 from Freeesia/feature/fix_fasttext

Author: Freeesia

Directory.Packages.props

@@ -31,7 +31,7 @@
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Octokit" Version="14.0.0" />
-    <PackageVersion Include="Panlingo.LanguageIdentification.FastText" Version="0.6.0" />
+    <PackageVersion Include="Panlingo.LanguageIdentification.FastText" Version="0.6.1" />
     <PackageVersion Include="PInvoke.User32" Version="0.7.124" />
     <PackageVersion Include="PropertyTools" Version="3.1.0" />
     <PackageVersion Include="PropertyTools.Wpf" Version="3.1.0" />

Plugins/WindowTranslator.Plugin.OneOcrPlugin/OneOcr.cs

@@ -21,7 +21,7 @@ public sealed class OneOcr : IOcrModule, IDisposable
 {
     const string apiKey = "kj)TGtrK>f]b[Piow.gU+nC@s\"\"\"\"\"\"4";
     const int maxLineCount = 1000;
-    private readonly FastTextDetector? fastText;
+    private readonly FastTextDetector fastText;
     private readonly ILogger<OneOcr> logger;
     private readonly string source;
     private readonly HashSet<string> targets;
@@ -58,15 +58,8 @@ private static nint Context_ResolvingUnmanagedDll(Assembly assembly, string arg2
     public OneOcr(ILogger<OneOcr> logger, IOptionsSnapshot<LanguageOptions> langOptions, IOptionsSnapshot<BasicOcrParam> ocrParam)
     {
         this.logger = logger;
-        try
-        {
-            this.fastText = new FastTextDetector();
-            this.fastText.LoadDefaultModel();
-        }
-        catch (DllNotFoundException)
-        {
-            this.logger.LogError("FastTextのDLLが見つからないため、言語判定処理は利用出来ません");
-        }
+        this.fastText = new FastTextDetector();
+        this.fastText.LoadDefaultModel();
         this.source = langOptions.Value.Source;
         this.targets = [langOptions.Value.Target[..2]];
         if (this.targets.Overlaps(["ja", "zh"]) && this.source[..2] is not "ja" and not "zh")
@@ -126,7 +119,7 @@ public OneOcr(ILogger<OneOcr> logger, IOptionsSnapshot<LanguageOptions> langOpti
 
     public void Dispose()
     {
-        this.fastText?.Dispose();
+        this.fastText.Dispose();
     }
 
     public async ValueTask<IEnumerable<TextRect>> RecognizeAsync(SoftwareBitmap bitmap)
@@ -160,7 +153,7 @@ public async ValueTask<IEnumerable<TextRect>> RecognizeAsync(SoftwareBitmap bitm
     }
 
     private bool IsTargetLangText(string text)
-        => this.fastText?.Predict(text, 3, 0.7f).Any(p => this.targets.Contains(p.Label[(p.Label.LastIndexOf('_') + 1)..])) ?? false;
+        => this.fastText.Predict(text, 3, 0.7f).Any(p => this.targets.Contains(p.Label[(p.Label.LastIndexOf('_') + 1)..]));
 
     private unsafe IEnumerable<TextRect> Recognize(SoftwareBitmap bitmap)
     {