Merge branch 'main' into Releases/v3.7.0.0

Author: Bas Visscher

Config/.vscode/settings.json

@@ -1,117 +1,96 @@
-using LogViewer.Config.Models;
-using System.Reflection;
+using LogViewer.Config.Helpers;
 using LogViewer.Config.Mergers;
-using LogViewer.Config.Loaders;
-using LogViewer.Config.Resources;
-using LogViewer.Config.Schema;
-using LogViewer.Config.Hashing;
-using LogViewer.Config.Cache;
-using LogViewer.Config.Helpers;
+using LogViewer.Config.Models;
+using LogViewer.Serializers.Yaml;
+using System.Reflection;
 
 namespace LogViewer.Config
 {
     public class ConfigurationService
     {
-
-        // Embedded resources
-
 #if DEBUG
-        private static readonly string VsCodeSettingsResource = $"{Assembly.GetExecutingAssembly().GetName().Name}.Resources.vscode.settings.json";
-        private static readonly string ConfigFileResource = $"{Assembly.GetExecutingAssembly().GetName().Name}.Resources.default_config.development.yaml";
-
-        private static readonly string VsCodeSettingsFile = PathHelper.NormalizePath("%SOLUTION%\\Config\\.vscode\\settings.json");
-        private static readonly string SchemaFile =  PathHelper.NormalizePath("%SOLUTION%\\Config\\schema.json");
-        private static readonly string ConfigFile =  PathHelper.NormalizePath("%LOCALAPPDATA%\\LogViewer\\debug\\config.yaml");
-        private static readonly string CacheFolder = PathHelper.NormalizePath("%LOCALAPPDATA%\\LogViewer\\debug\\cache");
-
+        private static readonly string ConfigFolder = PathHelper.NormalizePath("%LOCALAPPDATA%\\LogViewer_debug");
 #else
-        private static readonly string VsCodeSettingsResource = $"{Assembly.GetExecutingAssembly().GetName().Name}.Resources.vscode.settings.json";
-        private static readonly string ConfigFileResource = $"{Assembly.GetExecutingAssembly().GetName().Name}.Resources.default_config.yaml";
-
-        private static readonly string VsCodeSettingsFile =  PathHelper.NormalizePath("%LOCALAPPDATA%\\LogViewer\\release\\.vscode\\settings.json");
-        private static readonly string SchemaFile =          PathHelper.NormalizePath("%LOCALAPPDATA%\\LogViewer\\release\\schema.json");
-        private static readonly string ConfigFile =          PathHelper.NormalizePath("%LOCALAPPDATA%\\LogViewer\\release\\config.yaml");
-        private static readonly string CacheFolder =         PathHelper.NormalizePath("%LOCALAPPDATA%\\LogViewer\\release\\cache");
+    private static readonly string ConfigFolder = PathHelper.NormalizePath("%LOCALAPPDATA%\\LogViewer");
 #endif
 
-        private readonly IResourceProvider _resourceProvider;
-        private readonly ISchemaBuilder _schemaBuilder;
-        private readonly IConfigLoader _configLoader;
-        private readonly IConfigUpdateChecker _configUpdateChecker;
+        private static readonly Assembly ThisAssembly = Assembly.GetExecutingAssembly();
+        private static readonly string Root = ThisAssembly.GetName().Name!;
 
-        public ConfigurationService()
-        {
-            // Shared infrastructure
-            var hashProvider = new Md5HashProvider();
-            var cacheManager = new CacheManager(CacheFolder, hashProvider);
-            var merger = BuildMerger();
+        // Embedded resource names (verify via GetManifestResourceNames)
+        private static readonly string VsCodeSettingsResource = $"{Root}.Resources..vscode.settings.json";
+        private static readonly string Organisations_SchemaResource = $"{Root}.Resources.definitions.organisations_schema.json";
+        private static readonly string System_OrganisationsResource = $"{Root}.Resources.system_organisations.yaml";
+        private static readonly string User_OrganisationsResource = $"{Root}.Resources.user_organisations.yaml";
 
-            _resourceProvider = new ResourceProvider();
-            _schemaBuilder = new SchemaBuilder();
-            _configLoader = new RecursiveConfigLoader(cacheManager, merger);
-            _configUpdateChecker = new RecursiveConfigUpdateChecker(cacheManager);
+        private static readonly string VsCodeSettingsFile = PathHelper.CombinePaths(ConfigFolder, ".vscode\\settings.json");
+        private static readonly string Organisations_SchemaFile = PathHelper.CombinePaths(ConfigFolder, "definitions\\organisations_schema.json");
+        private static readonly string User_OrganisationsFile = PathHelper.CombinePaths(ConfigFolder, "user_organisations.yaml");
 
-            EnsureDefaultConfigExists();
-            EnsureSchemaExists();
-            EnsureVsCodeSettingsExists();
-        }
+        private readonly IConfigMerger configMerger;
 
-        private static IConfigMerger BuildMerger()
+        public ConfigurationService()
         {
-            var merger = new ConfigMerger();
-            merger.RegisterMerger(new LogViewerConfigMerger());
-            merger.RegisterMerger(new DictionaryMerger());
-            merger.RegisterMerger(new ObjectMerger());
-            return merger;
+            ExportResourceIfNotExists(VsCodeSettingsResource, VsCodeSettingsFile);
+            ExportResourceIfNotExists(Organisations_SchemaResource, Organisations_SchemaFile);
+            ExportResourceIfNotExists(User_OrganisationsResource, User_OrganisationsFile);
+            configMerger = BuildMerger();
         }
 
-        public async Task<LogViewerConfig> GetConfigAsync(CancellationToken token = default)
+        public LogViewerConfig GetConfigAsync(CancellationToken token = default)
         {
-            return await _configLoader.LoadAndMergeAsync(ConfigFile, token);
+            LogViewerConfig config = new LogViewerConfig();
+            configMerger.TryMerge(config, GetConfigFromResource(System_OrganisationsResource));
+            configMerger.TryMerge(config, GetConfigFromFile(User_OrganisationsFile));
+            return config;
         }
 
-        public async Task<bool> DownloadIfUpdatedAsync(CancellationToken token = default)
+        private LogViewerConfig? GetConfigFromResource(string resource)
         {
-            return await _configUpdateChecker.DownloadIfUpdatedRecursiveAsync(ConfigFile, token);
+            string? yaml = ReadEmbeddedResource(resource);
+            if (yaml == null)
+                return null;
+            if (!YamlSerializer.LoadYaml(yaml, out LogViewerConfig config))
+                return null;
+            return config;
         }
 
-        public void EnsureDefaultConfigExists()
+        private LogViewerConfig? GetConfigFromFile(string filePath)
         {
-            if (File.Exists(ConfigFile))
-                return;
-
-            Directory.CreateDirectory(Path.GetDirectoryName(ConfigFile)!);
-            var fileContents = _resourceProvider.ReadEmbeddedYaml(ConfigFileResource);
-            File.WriteAllText(ConfigFile, fileContents);
-
-            Directory.CreateDirectory(Path.GetDirectoryName(SchemaFile)!);
+            if (!YamlSerializer.LoadYaml(new FileInfo(filePath), out LogViewerConfig config))
+                return null;
+            return config;
         }
 
-        public void EnsureVsCodeSettingsExists()
+        private static void ExportResourceIfNotExists(string resource, string destination)
         {
-            if (File.Exists(VsCodeSettingsFile))
+            string path = Path.GetDirectoryName(destination)!;
+            Directory.CreateDirectory(path);
+            if (File.Exists(destination))
                 return;
-
-            Directory.CreateDirectory(Path.GetDirectoryName(VsCodeSettingsFile)!);
-            var fileContents = _resourceProvider.ReadEmbeddedYaml(VsCodeSettingsResource);
-            File.WriteAllText(VsCodeSettingsFile, fileContents);
+            string? content = ReadEmbeddedResource(resource);
+            if (content == null)
+                return;
+            File.WriteAllText(destination, content);
         }
 
-        public void EnsureSchemaExists()
+        private static IConfigMerger BuildMerger()
         {
-            var newSchema = _schemaBuilder.GetSchema();
-
-            if (File.Exists(SchemaFile))
-            {
-                var existingSchema = File.ReadAllText(SchemaFile);
+            var merger = new ConfigMerger();
+            merger.RegisterMerger(new LogViewerConfigMerger());
+            merger.RegisterMerger(new DictionaryMerger());
+            merger.RegisterMerger(new ObjectMerger());
+            return merger;
+        }
 
-                if (existingSchema == newSchema)
-                    return;
-            }
 
-            Directory.CreateDirectory(Path.GetDirectoryName(SchemaFile)!);
-            File.WriteAllText(SchemaFile, newSchema);
+        public static string? ReadEmbeddedResource(string resourceName)
+        {
+            using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName);
+            if (stream == null)
+                return null;
+            using var reader = new StreamReader(stream);
+            return reader.ReadToEnd();
         }
     }
-
 }