diff_report.mdにすべての逆アセンブルツールが出力されてしまう事象への対応

cafa53c の修正

Author: Widthdom

Models/FileDiffResultLists.cs

@@ -88,9 +88,14 @@ public enum IgnoredFileLocation
         public static ConcurrentDictionary<string, IgnoredFileLocation> IgnoredFilesRelativePathToLocation { get; } = new ConcurrentDictionary<string, IgnoredFileLocation>(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
-        /// 実行中に使用された逆アセンブラの名称とバージョン。
+        /// 実行中に使用された逆アセンブラの名称とバージョン（実ツール実行）。
         /// </summary>
         public static ConcurrentDictionary<string, byte> DisassemblerToolVersions { get; } = new ConcurrentDictionary<string, byte>(StringComparer.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// キャッシュ経由で利用された逆アセンブラの名称とバージョン。
+        /// </summary>
+        public static ConcurrentDictionary<string, byte> DisassemblerToolVersionsFromCache { get; } = new ConcurrentDictionary<string, byte>(StringComparer.OrdinalIgnoreCase);
         #endregion
 
         /// <summary>
@@ -126,14 +131,15 @@ public static void RecordIgnoredFile(string fileRelativePath, IgnoredFileLocatio
         /// </summary>
         /// <param name="toolName">ツール名。</param>
         /// <param name="version">バージョン文字列（省略可）。</param>
-        public static void RecordDisassemblerToolVersion(string toolName, string version)
+        public static void RecordDisassemblerToolVersion(string toolName, string version, bool fromCache = false)
         {
             if (string.IsNullOrWhiteSpace(toolName))
             {
                 return;
             }
             var label = string.IsNullOrWhiteSpace(version) ? toolName : $"{toolName} (version: {version})";
-            DisassemblerToolVersions[label] = 0;
+            var target = fromCache ? DisassemblerToolVersionsFromCache : DisassemblerToolVersions;
+            target[label] = 0;
         }
     }
 }

Services/DotNetDisassembleService.cs

@@ -451,7 +451,7 @@ public async Task PrefetchIlCacheAsync(IEnumerable<string> dotNetAssemblyFilesAb
                     if (cachedIL != null)
                     {
                         Interlocked.Increment(ref _ilCacheHits);
-                        RecordDisassemblerUsage(disassembleCommand, disassembleCommandAndItsVersionWithArguments);
+                        RecordDisassemblerUsage(disassembleCommand, disassembleCommandAndItsVersionWithArguments, fromCache: true);
                         return (Success: true, IlText: cachedIL, DisassembleCommandAndItsVersionWithArguments: disassembleCommandAndItsVersionWithArguments, Error: null);
                     }
                 }
@@ -730,7 +730,7 @@ private static IEnumerable<string> CandidateDisassembleCommands()
         /// <summary>
         /// 使用した逆アセンブラ名/バージョンを集計します。
         /// </summary>
-        private static void RecordDisassemblerUsage(string disassembleCommand, string disassembleCommandAndItsVersionWithArguments)
+        private static void RecordDisassemblerUsage(string disassembleCommand, string disassembleCommandAndItsVersionWithArguments, bool fromCache = false)
         {
             if (string.IsNullOrWhiteSpace(disassembleCommandAndItsVersionWithArguments))
             {
@@ -739,7 +739,7 @@ private static void RecordDisassemblerUsage(string disassembleCommand, string di
 
             var toolName = NormalizeDisassemblerName(disassembleCommand);
             var version = ExtractVersionFromLabel(disassembleCommandAndItsVersionWithArguments);
-            FileDiffResultLists.RecordDisassemblerToolVersion(toolName, version);
+            FileDiffResultLists.RecordDisassemblerToolVersion(toolName, version, fromCache);
         }
 
         /// <summary>

Services/FolderDiffService.cs

@@ -246,6 +246,7 @@ public async Task ExecuteFolderDiffAsync()
             FileDiffResultLists.ModifiedFilesRelativePath.Clear();
             FileDiffResultLists.FileRelativePathToDiffDetailDictionary.Clear();
             FileDiffResultLists.DisassemblerToolVersions.Clear();
+            FileDiffResultLists.DisassemblerToolVersionsFromCache.Clear();
             var folderDiffCompleted = false;
             try
             {

Services/ReportGenerateService.cs

@@ -388,7 +388,18 @@ public void GenerateDiffReport(
                     streamWriter.WriteLine(string.Format(REPORT_HEADER_IGNORED_EXTENSIONS, string.Join(REPORT_LIST_SEPARATOR, config.IgnoredExtensions)));
                     streamWriter.WriteLine(string.Format(REPORT_HEADER_TEXT_EXTENSIONS, string.Join(REPORT_LIST_SEPARATOR, config.TextFileExtensions)));
                     var disassemblerLabels = FileDiffResultLists.DisassemblerToolVersions.Keys.OrderBy(label => label, StringComparer.OrdinalIgnoreCase).ToList();
-                    var disassemblerText = disassemblerLabels.Count > 0 ? string.Join(REPORT_LIST_SEPARATOR, disassemblerLabels) : REPORT_HEADER_IL_DISASSEMBLERS_NONE;
+                    var disassemblerText = REPORT_HEADER_IL_DISASSEMBLERS_NONE;
+                    if (disassemblerLabels.Count > 0)
+                    {
+                        disassemblerText = string.Join(REPORT_LIST_SEPARATOR, disassemblerLabels);
+                    }
+                    else if (FileDiffResultLists.DisassemblerToolVersionsFromCache.Count > 0)
+                    {
+                        var cachedLabels = FileDiffResultLists.DisassemblerToolVersionsFromCache.Keys
+                            .OrderBy(label => label, StringComparer.OrdinalIgnoreCase)
+                            .ToList();
+                        disassemblerText = string.Join(REPORT_LIST_SEPARATOR, cachedLabels) + " (cache)";
+                    }
                     streamWriter.WriteLine(string.Format(REPORT_HEADER_IL_DISASSEMBLERS, disassemblerText));
                     if (!string.IsNullOrWhiteSpace(elapsedTimeString))
                     {