Merge pull request #30 from microsoft/jschick/check_providers_onload

Added provider database check on load
microsoft · May 9, 2023 · 3d0836a · 3d0836a
2 parents 264e0c5 + 207d753
commit 3d0836a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/src/EventLogExpert.Library/Providers/RegistryProvider.cs b/src/EventLogExpert.Library/Providers/RegistryProvider.cs
@@ -53,8 +53,8 @@ public IEnumerable<string> GetMessageFilesForLegacyProvider(string providerName)
 
         foreach (var logSubKeyName in eventLogKey.GetSubKeyNames())
         {
-            // Skip Security since it requires elevation
-            if (logSubKeyName == "Security")
+            // Skip Security and State since it requires elevation
+            if (logSubKeyName is "Security" or "State")
             {
                 continue;
             }

diff --git a/src/EventLogExpert/MauiProgram.cs b/src/EventLogExpert/MauiProgram.cs
@@ -6,7 +6,6 @@
 using EventLogExpert.Store;
 using EventLogExpert.Store.EventLog;
 using Fluxor;
-using System.Diagnostics;
 
 namespace EventLogExpert;
 
@@ -37,7 +36,14 @@ public static MauiApp CreateMauiApp()
             options.AddMiddleware<LoggingMiddleware>();
         });
 
-        builder.Services.AddSingleton<IEventResolver>(new EventProviderDatabaseEventResolver(Utils.Trace));
+        if (Utils.HasProviderDatabases())
+        {
+            builder.Services.AddSingleton<IEventResolver>(new EventProviderDatabaseEventResolver(Utils.Trace));
+        }
+        else
+        {
+            builder.Services.AddSingleton<IEventResolver, LocalProviderEventResolver>();
+        }
 
         return builder.Build();
     }

diff --git a/src/EventLogExpert/Utils.cs b/src/EventLogExpert/Utils.cs
@@ -9,12 +9,31 @@ internal class Utils
 {
     private static readonly long _maxLogSize = 10 * 1024 * 1024;
 
+    internal static bool HasProviderDatabases()
+    {
+        var path = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "EventLogExpert",
+            "Databases");
+
+        try
+        {
+            return Directory.EnumerateFiles(path, "*.db").Any();
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
     internal static void InitTracing()
     {
         // Set up tracing to a file
-        var eventLogExpertDataFolder = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "EventLogExpert");
+        var eventLogExpertDataFolder =
+            Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "EventLogExpert");
+
         var debugLogPath = Path.Join(eventLogExpertDataFolder, "debug.log");
         var fileInfo = new FileInfo(debugLogPath);
+
         if (fileInfo.Exists && fileInfo.Length > _maxLogSize)
         {
             fileInfo.Delete();
@@ -26,7 +45,7 @@ internal static void InitTracing()
         // Trace all exceptions
         AppDomain.CurrentDomain.FirstChanceException += (o, args) =>
         {
-           Trace($"{args.Exception}");
+            Trace($"{args.Exception}");
         };
     }