OSバージョン判定処理修正

Author: Freeesia

Plugins/WindowTranslator.Plugin.OneOcrPlugin/OneOcrValidator.cs

@@ -1,15 +1,17 @@
-using WindowTranslator.Modules;
+using Microsoft.Extensions.Logging;
+using WindowTranslator.Modules;
 using WindowTranslator.Plugin.OneOcrPlugin.Properties;
 using Wpf.Ui;
 using Wpf.Ui.Controls;
 using Wpf.Ui.Extensions;
 
 namespace WindowTranslator.Plugin.OneOcrPlugin;
 
-public class OneOcrValidator(IContentDialogService dialogService) : ITargetSettingsValidator
+public class OneOcrValidator(IContentDialogService dialogService, ILogger<OneOcrValidator> logger) : ITargetSettingsValidator
 {
-    private static readonly ValidateResult Invalid = ValidateResult.Invalid("OneOcr", Resources.NotFoundModule);
+    private static readonly ValidateResult Invalid = ValidateResult.Invalid(Resources.OneOcr, Resources.NotFoundModule);
     private readonly IContentDialogService dialogService = dialogService;
+    private readonly ILogger<OneOcrValidator> logger = logger;
     private bool versionChecked = false;
 
     public async ValueTask<ValidateResult> Validate(TargetSettings settings)
@@ -21,7 +23,7 @@ public async ValueTask<ValidateResult> Validate(TargetSettings settings)
         }
 
         // ScreenSketchのバージョンをチェック       
-        if (!this.versionChecked && !await Utility.CheckScreenSketchVersionAsync().ConfigureAwait(false))
+        if (!this.versionChecked && !await Utility.CheckScreenSketchVersionAsync(this.logger))
         {
             // バージョンが古い場合、確認ダイアログを表示
             var confirmResult = await this.dialogService.ShowSimpleDialogAsync(new()
@@ -49,9 +51,9 @@ public async ValueTask<ValidateResult> Validate(TargetSettings settings)
             {
                 while (!checkCts.Token.IsCancellationRequested)
                 {
-                    await Task.Delay(TimeSpan.FromSeconds(5), checkCts.Token).ConfigureAwait(false);
+                    await Task.Delay(TimeSpan.FromSeconds(5), checkCts.Token);
 
-                    if (await Utility.CheckScreenSketchVersionAsync().ConfigureAwait(false))
+                    if (await Utility.CheckScreenSketchVersionAsync(this.logger))
                     {
                         // 更新完了
                         dialogCts.Cancel();
@@ -97,10 +99,10 @@ await this.dialogService.ShowSimpleDialogAsync(new()
         }
 
         // OneOcrのインストール先を取得
-        var oneOcrPath = await Utility.FindOneOcrPath().ConfigureAwait(false);
+        var oneOcrPath = await Utility.FindOneOcrPath();
         if (oneOcrPath == null)
         {
-            return ValidateResult.Invalid("OneOcr", Resources.NotFoundModule);
+            return Invalid;
         }
 
         // DLLをコピー
@@ -110,7 +112,7 @@ await this.dialogService.ShowSimpleDialogAsync(new()
         }
         catch (Exception ex)
         {
-            return ValidateResult.Invalid("OneOcr", string.Format(Resources.CopyFaild, ex.Message));
+            return ValidateResult.Invalid(Resources.OneOcr, string.Format(Resources.CopyFaild, ex.Message));
         }
 
         return ValidateResult.Valid;

Plugins/WindowTranslator.Plugin.OneOcrPlugin/Utility.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using Microsoft.Extensions.Logging;
 
 namespace WindowTranslator.Plugin.OneOcrPlugin;
 
@@ -21,6 +22,9 @@ static class Utility
 
     public static string OneOcrPath { get; } = Path.Combine(PathUtility.UserDir, "OneOcr");
 
+    private static int GetOsVersion()
+        => Environment.OSVersion.Version is { Major: 10, Build: < 22000 } ? 10 : 11;
+
     private static async ValueTask<string?> GetInstallLocation(string appName)
     {
         var info = new ProcessStartInfo("powershell.exe", $"-Command \"(Get-AppxPackage -Name {appName}).InstallLocation\"")
@@ -89,20 +93,22 @@ static class Utility
     /// ScreenSketchのバージョンをチェックし、必要に応じてMicrosoft Storeを開く
     /// </summary>
     /// <returns>バージョンが十分か、または更新が必要かを示す情報</returns>
-    public static async ValueTask<bool> CheckScreenSketchVersionAsync()
+    public static async ValueTask<bool> CheckScreenSketchVersionAsync(ILogger logger)
     {
         // インストール済みのScreenSketchバージョンを取得
         var installedVersion = await GetInstallVersion(ScreenSketchAppName).ConfigureAwait(false);
 
         if (installedVersion == null)
         {
+            logger.LogWarning("ScreenSketch is not installed.");
             // ScreenSketchがインストールされていない
             return false;
         }
 
         // 必要な最小バージョンを取得
-        if (!MinimumVersions.TryGetValue(Environment.OSVersion.Version.Major, out var minVersion))
+        if (!MinimumVersions.TryGetValue(GetOsVersion(), out var minVersion))
         {
+            logger.LogWarning("Unsupported OS version: {OSVersion}", Environment.OSVersion.Version);
             // サポートされていないOSバージョン（OSバージョンに応じたチェックをスキップ）
             return false;
         }
@@ -114,6 +120,7 @@ public static async ValueTask<bool> CheckScreenSketchVersionAsync()
             return true;
         }
 
+        logger.LogInformation("ScreenSketch version is outdated. Installed: {InstalledVersion}, Required: {RequiredVersion}", installedVersion, minVersion);
         // バージョンが古い
         return false;
     }

Sandbox/Program.cs

@@ -113,11 +113,11 @@ His first person is "儂" in Kanji.
     Console.WriteLine(translated[0]);
 }
 
-static async Task ClipTextRect([Argument] string imagePath, [FromServices] ILogger<OneOcr> logger, [FromServices] IOptionsSnapshot<LanguageOptions> langOptions, [FromServices] IOptionsSnapshot<BasicOcrParam> ocrParam)
+static async Task ClipTextRect([Argument] string imagePath, [FromServices] ILoggerFactory loggerFactory, [FromServices] IOptionsSnapshot<LanguageOptions> langOptions, [FromServices] IOptionsSnapshot<BasicOcrParam> ocrParam)
 {
-    var validator = new OneOcrValidator(null!);
+    var validator = new OneOcrValidator(null!, loggerFactory.CreateLogger<OneOcrValidator>());
     await validator.Validate(new() { SelectedPlugins = { [nameof(IOcrModule)] = nameof(OneOcr) } }).ConfigureAwait(false);
-    var ocr = new OneOcr(logger, langOptions, ocrParam);
+    var ocr = new OneOcr(loggerFactory.CreateLogger<OneOcr>(), langOptions, ocrParam);
 
     // 画像ファイルの読み込み
     using var fileStream = new FileStream(imagePath, FileMode.Open);