冗長部の修正

Author: Widthdom

Common/Constants.cs

@@ -45,7 +45,7 @@ public static class Constants
         /// <summary>
         /// ilspyコマンド
         /// </summary>
-        public const string ILSPY = "ilspycmd";
+        public const string ILSPY_CMD = "ilspycmd";
 
         /// <summary>
         /// 経過時間表示

Models/FileDiffResultLists.cs

@@ -2,7 +2,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using FolderDiffIL4DotNet.Common;
 
 namespace FolderDiffIL4DotNet.Models
 {

Program.cs

@@ -25,22 +25,22 @@ class Program
         /// <summary>
         /// ロガー初期化メッセージ
         /// </summary>
-        private const string INFO_INITIALIZING_LOGGER = "[INFO] Initializing logger...";
+        private const string INITIALIZING_LOGGER = "Initializing logger...";
 
         /// <summary>
         /// Logger initialized
         /// </summary>
-        private const string LOG_LOGGER_INITIALIZED = "Logger initialized.";
+        private const string LOGGER_INITIALIZED = "Logger initialized.";
 
         /// <summary>
         /// アプリバージョン
         /// </summary>
-        private const string LOG_APPLICATION_VERSION = "Application version: {0}";
+        private const string APPLICATION_VERSION = "Application version: {0}";
 
         /// <summary>
         /// 引数検証開始
         /// </summary>
-        private const string LOG_VALIDATING_ARGS = "Validating command line arguments...";
+        private const string VALIDATING_ARGS = "Validating command line arguments...";
 
         /// <summary>
         /// 引数不足
@@ -115,7 +115,7 @@ class Program
         /// <summary>
         /// 終了キープロンプト
         /// </summary>
-        private const string INFO_PRESS_ANY_KEY = "[INFO] Press any key to exit...";
+        private const string PRESS_ANY_KEY = "Press any key to exit...";
 
         /// <summary>
         /// キープロンプトエラー
@@ -163,16 +163,16 @@ static async Task Main(string[] args)
             try
             {
                 #region Loggerの初期化（以降Loggerを使ったログ出力が可能）
-                Console.WriteLine(INFO_INITIALIZING_LOGGER);
+                Console.WriteLine(INITIALIZING_LOGGER);
                 LoggerService.Initialize();
-                LoggerService.LogMessage(LoggerService.LogLevel.Info, LOG_LOGGER_INITIALIZED, shouldOutputMessageToConsole: true);
+                LoggerService.LogMessage(LoggerService.LogLevel.Info, LOGGER_INITIALIZED, shouldOutputMessageToConsole: true);
                 #endregion
 
                 // アプリケーションのバージョンを取得
                 _thisAppVersion = Utility.GetAppVersion(typeof(Program));
-                LoggerService.LogMessage(LoggerService.LogLevel.Info, string.Format(LOG_APPLICATION_VERSION, _thisAppVersion), shouldOutputMessageToConsole: true);
+                LoggerService.LogMessage(LoggerService.LogLevel.Info, string.Format(APPLICATION_VERSION, _thisAppVersion), shouldOutputMessageToConsole: true);
 
-                LoggerService.LogMessage(LoggerService.LogLevel.Info, LOG_VALIDATING_ARGS, shouldOutputMessageToConsole: true);
+                LoggerService.LogMessage(LoggerService.LogLevel.Info, VALIDATING_ARGS, shouldOutputMessageToConsole: true);
 
                 #region コマンドライン引数の過不足およびnull, 空文字, 空白文字チェック
                 try
@@ -298,7 +298,7 @@ static async Task Main(string[] args)
             {
                 /// <see cref="NO_PAUSE">オプション指定でアプリケーションが起動された場合、または
                 // 非対話（リダイレクトされている）の場合は、終了時にキー入力待ちを行わない
-                if (args.Any(a => string.Equals(a, NO_PAUSE, StringComparison.OrdinalIgnoreCase))
+                if (args.Any(arg => string.Equals(arg, NO_PAUSE, StringComparison.OrdinalIgnoreCase))
                     || Console.IsInputRedirected
                     || Console.IsOutputRedirected
                     || Console.IsErrorRedirected)
@@ -309,7 +309,7 @@ static async Task Main(string[] args)
                 {
                     try
                     {
-                        Console.WriteLine(INFO_PRESS_ANY_KEY);
+                        Console.WriteLine(PRESS_ANY_KEY);
                         Console.ReadKey(true);
                     }
                     catch (Exception ex)

Services/Caching/DotNetDisassemblerCache.cs

@@ -120,7 +120,7 @@ private static (DisassemblerKind disassemblerKind, string disassemblerVersionCac
             return Path.GetFileName(exe)?.ToLowerInvariant() switch
             {
                 Constants.DOTNET_ILDASM => (disassemblerKind: DisassemblerKind.Ildasm, disassemblerVersionCacheKey: Constants.DOTNET_ILDASM, disassemblerExe: exe),
-                Constants.ILSPY => (disassemblerKind: DisassemblerKind.Ilspy, disassemblerVersionCacheKey: Constants.ILSPY, disassemblerExe: exe),
+                Constants.ILSPY_CMD => (disassemblerKind: DisassemblerKind.Ilspy, disassemblerVersionCacheKey: Constants.ILSPY_CMD, disassemblerExe: exe),
                 _ => (disassemblerKind: DisassemblerKind.Unknown, disassemblerVersionCacheKey: null, disassemblerExe: null)
             };
         }
@@ -215,7 +215,7 @@ private static async Task<string> GetVersionForIlspyAsync(string disassemblerVer
             }
 
             // いずれの方法でも取得できない場合はエラーとして扱う。
-            throw new InvalidOperationException($"{ERROR_FAILED_TO_GET_VERSION} '{Constants.ILSPY}' ({nameof(disassemblerVersionCacheKey)}='{disassemblerVersionCacheKey}').");
+            throw new InvalidOperationException($"{ERROR_FAILED_TO_GET_VERSION} '{Constants.ILSPY_CMD}' ({nameof(disassemblerVersionCacheKey)}='{disassemblerVersionCacheKey}').");
         }
 
         /// <summary>

Services/Caching/ILCache.cs

@@ -336,10 +336,10 @@ public Task PrecomputeAsync(IEnumerable<string> fileAbsolutePaths, int maxParall
                     }
                 });
 
-                    LoggerService.LogMessage(
-                        LoggerService.LogLevel.Info,
-                        string.Format(LOG_PRECOMPUTE_MD5_COMPLETE, files.Count),
-                        shouldOutputMessageToConsole: true);
+                LoggerService.LogMessage(
+                    LoggerService.LogLevel.Info,
+                    string.Format(LOG_PRECOMPUTE_MD5_COMPLETE, files.Count),
+                    shouldOutputMessageToConsole: true);
             }
             catch
             {

Services/Caching/TimestampCache.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using FolderDiffIL4DotNet.Common;
 using FolderDiffIL4DotNet.Utils;
 
 namespace FolderDiffIL4DotNet.Services.Caching

Services/ConfigService.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
-using FolderDiffIL4DotNet.Common;
 using FolderDiffIL4DotNet.Models;
 
 namespace FolderDiffIL4DotNet.Services

Services/DotNetDisassembleService.cs

@@ -129,8 +129,8 @@ public sealed class DotNetDisassembleService
             "If it's not installed, install it with:\n" +
             "  " + Constants.DOTNET_MUXER + " tool install -g " + Constants.DOTNET_ILDASM + "\n" +
             "Also ensure that ~/" + DOTNET_HOME_DIRNAME + "/" + DOTNET_TOOLS_DIRNAME + " is included in your PATH.\n" +
-            "Alternatively, you can install " + Constants.ILSPY + " and we will use it automatically:\n" +
-            "  " + Constants.DOTNET_MUXER + " tool install -g " + Constants.ILSPY;
+            "Alternatively, you can install " + Constants.ILSPY_CMD + " and we will use it automatically:\n" +
+            "  " + Constants.DOTNET_MUXER + " tool install -g " + Constants.ILSPY_CMD;
         #endregion
         private enum DisassemblerKind
         {
@@ -223,14 +223,14 @@ public DotNetDisassembleService(ConfigSettings config, ILCache ilCache)
                 try
                 {
                     // キャッシュ確認とプロセス起動を内包した TryDisassembleAsync を実行。
-                    var attempt = await TryDisassembleAsync(candidateDisassembleCommand, dotNetAssemblyfileAbsolutePath);
-                    if (attempt.Success)
+                    var (success, ilText, disassembleCommandAndItsVersionWithArguments, error) = await TryDisassembleAsync(candidateDisassembleCommand, dotNetAssemblyfileAbsolutePath);
+                    if (success)
                     {
-                        return (attempt.IlText, attempt.DisassembleCommandAndItsVersionWithArguments);
+                        return (ilText, disassembleCommandAndItsVersionWithArguments);
                     }
-                    if (attempt.Error != null)
+                    if (error != null)
                     {
-                        lastError = attempt.Error;
+                        lastError = error;
                     }
                 }
                 catch (System.ComponentModel.Win32Exception ex)
@@ -272,8 +272,8 @@ public async Task PrefetchIlCacheAsync(IEnumerable<string> dotNetAssemblyFilesAb
                 throw new ArgumentOutOfRangeException(nameof(maxParallel), maxParallel, Constants.ERROR_MAX_PARALLEL);
             }
 
-            // 入力列を ICollection に引き上げ（必要なら ToList）て、件数ゼロなら処理をスキップ。
-            var assemblies = dotNetAssemblyFilesAbsolutePaths as ICollection<string> ?? dotNetAssemblyFilesAbsolutePaths.ToList();
+            // 入力列を ICollection に引き上げ（必要なら List を生成）て、件数ゼロなら処理をスキップ。
+            var assemblies = dotNetAssemblyFilesAbsolutePaths as ICollection<string> ?? [.. dotNetAssemblyFilesAbsolutePaths];
             if (assemblies.Count == 0)
             {
                 return;
@@ -334,7 +334,7 @@ public async Task PrefetchIlCacheAsync(IEnumerable<string> dotNetAssemblyFilesAb
                             // dotnet muxer は "dotnet dotnet-ildasm" の形で実行されるため、相対パス・絶対パスの双方を試す。
                             disassembleCommandsWithArguments = [$"{Constants.DOTNET_MUXER} {Constants.DOTNET_ILDASM} {dotNetAssemblyNameOnly}", $"{Constants.DOTNET_MUXER} {Constants.DOTNET_ILDASM} {dotNetAssemblyFileAbsolutePath}"];
                         }
-                        else if (string.Equals(disassemblerFileName, Constants.ILSPY, StringComparison.OrdinalIgnoreCase))
+                        else if (string.Equals(disassemblerFileName, Constants.ILSPY_CMD, StringComparison.OrdinalIgnoreCase))
                         {
                             // ilspycmd は /il スイッチを付与する必要があるため、これも付けた状態で 2 パターン生成。
                             disassembleCommandsWithArguments = [$"{disassemblerFileName} {ILSPY_FLAG_IL} {dotNetAssemblyNameOnly}", $"{disassemblerFileName} {ILSPY_FLAG_IL} {dotNetAssemblyFileAbsolutePath}"];
@@ -402,14 +402,14 @@ public async Task PrefetchIlCacheAsync(IEnumerable<string> dotNetAssemblyFilesAb
             {
                 foreach (var argset in BuildArgSets(disassembleCommand, dotNetAssemblyFileAbsolutePath, tempAsciiPath))
                 {
-                    var result = await TryDisassembleWithArguments(disassembleCommand, dotNetAssemblyFileAbsolutePath, argset);
-                    if (result.Success)
+                    var (success, ilText, disassembleCommandAndItsVersionWithArguments, error) = await TryDisassembleWithArguments(disassembleCommand, dotNetAssemblyFileAbsolutePath, argset);
+                    if (success)
                     {
-                        return result;
+                        return (success, ilText, disassembleCommandAndItsVersionWithArguments, error);
                     }
-                    if (result.Error != null)
+                    if (error != null)
                     {
-                        lastError = result.Error;
+                        lastError = error;
                     }
                 }
             }
@@ -521,7 +521,7 @@ public async Task PrefetchIlCacheAsync(IEnumerable<string> dotNetAssemblyFilesAb
         /// <summary>
         /// 指定コマンドが ilspycmd かを判定します。
         /// </summary>
-        private static bool IsIlspyCommand(string command) => string.Equals(Path.GetFileName(command), Constants.ILSPY, StringComparison.OrdinalIgnoreCase);
+        private static bool IsIlspyCommand(string command) => string.Equals(Path.GetFileName(command), Constants.ILSPY_CMD, StringComparison.OrdinalIgnoreCase);
 
         /// <summary>
         /// パスに非ASCII文字がある場合に、ASCII の一時パスへコピーしたファイルのパスを返します。該当しなければ null。
@@ -574,7 +574,7 @@ private static string CreateAsciiTempCopyIfNeeded(string dotNetAssemblyFileAbsol
                 {
                     argSets.Add((Environment.CurrentDirectory, [ILSPY_FLAG_IL, tempAsciiPath], null));
                 }
-                string MakeTempOut() => Path.Combine(Path.GetTempPath(), $"ilspy_out_{Guid.NewGuid():N}.il");
+                static string MakeTempOut() => Path.Combine(Path.GetTempPath(), $"ilspy_out_{Guid.NewGuid():N}.il");
                 var out1 = MakeTempOut();
                 argSets.Add((disassemblerFileDirectoryAbsolutePath, [ILSPY_FLAG_IL, ILSPY_FLAG_OUTPUT, out1, disassemblerFileNameOnly], out1));
                 var out2 = MakeTempOut();
@@ -591,7 +591,7 @@ private static string CreateAsciiTempCopyIfNeeded(string dotNetAssemblyFileAbsol
         /// <summary>
         /// ベースラベルにツールバージョンを付加して返します。取得失敗時はベースラベルをそのまま返します。
         /// </summary>
-        private async Task<string> GetDisassembleCommandAndItsVersionWithArgumentsAsync(string disassembleCommandWithArguments)
+        private static async Task<string> GetDisassembleCommandAndItsVersionWithArgumentsAsync(string disassembleCommandWithArguments)
         {
             try
             {
@@ -646,35 +646,6 @@ private async Task<string> GetDisassembleCommandAndItsVersionWithArgumentsAsync(
             }
         }
 
-        /// <summary>
-        /// コマンドラベルから逆アセンブラの種類・キャッシュキー・実行ファイル名を解決します。
-        /// Dotnet muxer 経由のケースや ilspycmd 単体起動など、既知のパターンを判定して適切なキーへ正規化します。
-        /// </summary>
-        private static (DisassemblerKind kind, string toolKey, string disassemblerExe) ResolveDisassembler(string commandLabel)
-        {
-            var tokens = Utility.TokenizeCommand(commandLabel);
-            if (tokens.Count == 0)
-            {
-                throw new InvalidOperationException($"Failed to determine disassembler version: invalid command label '{commandLabel}'.");
-            }
-
-            if (string.Equals(tokens[0], Constants.DOTNET_MUXER, StringComparison.OrdinalIgnoreCase))
-            {
-                if (tokens.Count >= 2 && string.Equals(tokens[1], Constants.DOTNET_ILDASM, StringComparison.OrdinalIgnoreCase))
-                {
-                    return (kind: DisassemblerKind.DotnetIldasm, toolKey: $"{Constants.DOTNET_MUXER} {Constants.DOTNET_ILDASM}", disassemblerExe: Constants.DOTNET_MUXER);
-                }
-            }
-
-            var exe = tokens[0];
-            return Path.GetFileName(exe)?.ToLowerInvariant() switch
-            {
-                Constants.DOTNET_ILDASM => (kind: DisassemblerKind.Ildasm, toolKey: Constants.DOTNET_ILDASM, disassemblerExe: exe),
-                Constants.ILSPY => (kind: DisassemblerKind.Ilspy, toolKey: Constants.ILSPY, disassemblerExe: exe),
-                _ => (kind: DisassemblerKind.Unknown, toolKey: null, disassemblerExe: null)
-            };
-        }
-
         /// <summary>
         /// 指定ツールがブラックリスト化されているかを判定。一定期間内に失敗が閾値を超えた場合は解除
         /// </summary>
@@ -745,8 +716,8 @@ private static IEnumerable<string> CandidateDisassembleCommands()
             yield return Constants.DOTNET_ILDASM;
             yield return Path.Combine(UserDotnetToolsDirectory, Constants.DOTNET_ILDASM);
             yield return Constants.DOTNET_MUXER;
-            yield return Constants.ILSPY;
-            yield return Path.Combine(UserDotnetToolsDirectory, Constants.ILSPY);
+            yield return Constants.ILSPY_CMD;
+            yield return Path.Combine(UserDotnetToolsDirectory, Constants.ILSPY_CMD);
         }
         #endregion
     }