review fixes

Author: BRUNER Patrick

src/LogExpert.UI/Dialogs/PluginTrustDialog.cs

@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Runtime.Versioning;
+using System.Security;
 
 using LogExpert.PluginRegistry;
 
@@ -51,7 +52,7 @@ private void ApplyResources ()
         Text = Resources.PluginTrustDialog_UI_Title;
 
         // Labels
-        pluginCountLabel.Text = string.Format(Resources.PluginTrustDialog_UI_Label_TotalPlugins, 0);
+        pluginCountLabel.Text = string.Format(CultureInfo.InvariantCulture, Resources.PluginTrustDialog_UI_Label_TotalPlugins, 0);
         groupBoxPlugins.Text = Resources.PluginTrustDialog_UI_GroupBox_TrustedPlugins;
 
         // Buttons
@@ -88,7 +89,16 @@ private void LoadConfiguration ()
                 // If user makes changes, they'll be saved then
             }
         }
-        catch (Exception ex)
+        catch (Exception ex) when (ex is ArgumentException or
+                                         ArgumentNullException or
+                                         PathTooLongException or
+                                         DirectoryNotFoundException or
+                                         IOException or
+                                         UnauthorizedAccessException or
+                                         FileNotFoundException or
+                                         NotSupportedException or
+                                         SecurityException or
+                                         JsonException)
         {
             _ = MessageBox.Show(
                 string.Format(CultureInfo.InvariantCulture, Resources.PluginTrustDialog_UI_Message_LoadError, ex.Message),
@@ -162,7 +172,9 @@ private void UpdateButtonStates ()
     private bool HasHashForSelection ()
     {
         if (pluginListView.SelectedItems.Count == 0)
+        {
             return false;
+        }
 
         var pluginName = pluginListView.SelectedItems[0].Text;
         return _config.PluginHashes.ContainsKey(pluginName);
@@ -293,7 +305,16 @@ private void SaveButton_Click (object sender, EventArgs e)
             DialogResult = DialogResult.OK;
             Close();
         }
-        catch (Exception ex)
+        catch (Exception ex) when (ex is ArgumentException or
+                                         ArgumentNullException or
+                                         PathTooLongException or
+                                         DirectoryNotFoundException or
+                                         IOException or
+                                         UnauthorizedAccessException or
+                                         FileNotFoundException or
+                                         NotSupportedException or
+                                         SecurityException or
+                                         JsonException)
         {
             _ = MessageBox.Show(
                 string.Format(CultureInfo.InvariantCulture, Resources.PluginTrustDialog_UI_Message_SaveError, ex.Message),
@@ -329,4 +350,4 @@ private void PluginListView_SelectedIndexChanged (object sender, EventArgs e)
     }
 
     #endregion
-}
+}

src/PluginHashGenerator.Tool/Program.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Text;
+
 using LogExpert.PluginRegistry;
 
 namespace PluginHashGenerator.Tool;
@@ -14,7 +11,9 @@ namespace PluginHashGenerator.Tool;
 /// </summary>
 internal class Program
 {
-    private static int Main(string[] args)
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "Tool for Hash Generation does not need localization")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Intentionally continue on error to process other plugins")]
+    private static int Main (string[] args)
     {
         try
         {
@@ -37,7 +36,7 @@ private static int Main(string[] args)
 
             // Find all plugin DLLs
             var pluginPaths = new List<string>();
-            
+
             // Check plugins folder
             var pluginsDir = Path.Join(outputPath, "plugins");
             if (Directory.Exists(pluginsDir))
@@ -82,7 +81,7 @@ private static int Main(string[] args)
             foreach (var pluginPath in pluginPaths.OrderBy(p => p))
             {
                 var fileName = Path.GetFileName(pluginPath);
-                
+
                 // Skip dependencies
                 if (knownDependencies.Contains(fileName))
                 {
@@ -93,14 +92,14 @@ private static int Main(string[] args)
                 try
                 {
                     var hash = PluginHashCalculator.CalculateHash(pluginPath);
-                    
+
                     // For x86 plugins, add suffix to distinguish them
                     var key = fileName;
                     if (pluginPath.Contains("pluginsx86", StringComparison.OrdinalIgnoreCase))
                     {
                         key = $"{Path.GetFileNameWithoutExtension(fileName)}.dll (x86)";
                     }
-                    
+
                     // Handle duplicate keys (same plugin in both folders)
                     if (!pluginHashes.ContainsKey(key))
                     {
@@ -110,6 +109,7 @@ private static int Main(string[] args)
                 }
                 catch (Exception ex)
                 {
+                    //Intentionally continue on error to process other plugins
                     Console.Error.WriteLine($"  ✗ ERROR calculating hash for {fileName}: {ex.Message}");
                 }
             }
@@ -121,7 +121,7 @@ private static int Main(string[] args)
             var targetDir = Path.GetDirectoryName(targetFile);
             if (!string.IsNullOrEmpty(targetDir) && !Directory.Exists(targetDir))
             {
-                Directory.CreateDirectory(targetDir);
+                _ = Directory.CreateDirectory(targetDir);
             }
 
             // Write the file
@@ -140,43 +140,46 @@ private static int Main(string[] args)
         }
     }
 
-    private static string GenerateSourceCode(Dictionary<string, string> pluginHashes, string configuration)
+    private static string GenerateSourceCode (Dictionary<string, string> pluginHashes, string configuration)
     {
         var timestamp = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
-        
+
         var sb = new StringBuilder();
-        sb.AppendLine("// <auto-generated/>");
-        sb.AppendLine("// This file is auto-generated during build. Do not edit manually.");
-        sb.AppendLine("// To regenerate, rebuild the project or run the GeneratePluginHashes MSBuild target.");
-        sb.AppendLine();
-        sb.AppendLine("using System.Collections.Generic;");
-        sb.AppendLine();
-        sb.AppendLine("namespace LogExpert.PluginRegistry;");
-        sb.AppendLine();
-        sb.AppendLine("public static partial class PluginValidator");
-        sb.AppendLine("{");
-        sb.AppendLine("    /// <summary>");
-        sb.AppendLine("    /// Gets pre-calculated SHA256 hashes for built-in plugins.");
-        sb.AppendLine($"    /// Generated: {timestamp} UTC");
-        sb.AppendLine($"    /// Configuration: {configuration}");
-        sb.AppendLine($"    /// Plugin count: {pluginHashes.Count}");
-        sb.AppendLine("    /// </summary>");
-        sb.AppendLine("    public static Dictionary<string, string> GetBuiltInPluginHashes()");
-        sb.AppendLine("    {");
-        sb.AppendLine("        return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)");
-        sb.AppendLine("        {");
 
         foreach (var kvp in pluginHashes.OrderBy(kvp => kvp.Key))
         {
             // Properly escape the key for C# string literal
-            var escapedKey = kvp.Key.Replace("\\", "\\\\").Replace("\"", "\\\"");
-            sb.AppendLine($"            [\"{escapedKey}\"] = \"{kvp.Value}\",");
+            var escapedKey = kvp.Key.Replace("\\", "\\\\", StringComparison.OrdinalIgnoreCase).Replace("\"", "\\\"", StringComparison.OrdinalIgnoreCase);
+            _ = sb.AppendLine(CultureInfo.InvariantCulture, $"            [\"{escapedKey}\"] = \"{kvp.Value}\",");
         }
 
-        sb.AppendLine("        };");
-        sb.AppendLine("    }");
-        sb.AppendLine("}");
+        string sourceCode = $$"""
+            // <auto-generated/>
+            // This file is auto-generated during build. Do not edit manually.
+            // To regenerate, rebuild the project or run the GeneratePluginHashes MSBuild target.
+
+            using System.Collections.Generic;
+
+            namespace LogExpert.PluginRegistry;
+
+            public static partial class PluginValidator
+            {
+                /// <summary>
+                /// Gets pre-calculated SHA256 hashes for built-in plugins.
+                /// Generated: {{timestamp}} UTC
+                /// Configuration: {{configuration}}
+                /// Plugin count: {{pluginHashes.Count}}
+                /// </summary>
+                public static Dictionary<string, string> GetBuiltInPluginHashes()
+                {
+                    return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+                    {
+                         {{sb}}
+                    };
+                }
+            }
+            """;
 
-        return sb.ToString();
+        return sourceCode;
     }
-}
+}