Merge pull request #39 from spo-kissa/fixed-problem-with-settings

Fix the timing of the database migration.

Author: barista-spo

spoclient/App.axaml.cs

@@ -16,6 +16,7 @@
 using SpoClient.Setting;
 using SpoClient.Setting.Models;
 using System.Globalization;
+using System.Threading.Tasks;
 
 namespace spoclient
 {
@@ -37,11 +38,17 @@ protected override AvaloniaObject CreateShell()
         protected override void RegisterTypes(IContainerRegistry containerRegistry)
         {
             containerRegistry.RegisterSingleton<IEventAggregator, EventAggregator>();
-            containerRegistry.RegisterSingleton<SettingManager>(() => SettingManager.Instance);
-            containerRegistry.RegisterSingleton<SqliteConnection>(() =>
+            containerRegistry.RegisterSingleton<SqliteConnection?>(() =>
             {
-                return SettingManager.Instance.OpenAsync("spoclient.setting").Result;
+                return Task.Run<SqliteConnection?>(async () =>
+                {
+                    var c = await SettingManager.Instance.OpenAsync("spoclient.setting");
+                    var migrator = new Migrator(c!);
+                    await migrator.ApplyMigrationsFromResourcesAsync("SpoClient.Setting.SQL.Migrations");
+                    return c;
+                }).Result;
             });
+            containerRegistry.RegisterSingleton<SettingManager>(() => SettingManager.Instance);
             containerRegistry.RegisterSingleton<IAppSettings, AppSettings>();
             containerRegistry.RegisterSingleton<ILocalizationManager>((c) =>
             {

spoclient/Plugins/Recipe/RecipeV1Loader.cs

@@ -15,18 +15,21 @@ public class RecipeV1Loader
         public static IEnumerable<IRecipePlugin> FindRecipePlugins()
         {
             var location = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Plugin");
-            var files = Directory.EnumerateFiles(location, "*.v1.dll", SearchOption.AllDirectories);
-            foreach (var file in files)
+            if (Directory.Exists(location))
             {
-                using var loader = PluginLoader.CreateFromAssemblyFile(file, false, [typeof(IRecipePlugin), typeof(IRecipe), typeof(ISimpleRecipe)]);
-                var plugin = loader.LoadDefaultAssembly();
-                foreach (var recipePluginType in plugin.GetTypes().Where(t => typeof(IRecipePlugin).IsAssignableFrom(t) && !t.IsAbstract))
+                var files = Directory.EnumerateFiles(location, "*.v1.dll", SearchOption.AllDirectories);
+                foreach (var file in files)
                 {
-                    var recipePlugin = Activator.CreateInstance(recipePluginType) as IRecipePlugin;
-                    if (recipePlugin is not null)
+                    using var loader = PluginLoader.CreateFromAssemblyFile(file, false, [typeof(IRecipePlugin), typeof(IRecipe), typeof(ISimpleRecipe)]);
+                    var plugin = loader.LoadDefaultAssembly();
+                    foreach (var recipePluginType in plugin.GetTypes().Where(t => typeof(IRecipePlugin).IsAssignableFrom(t) && !t.IsAbstract))
                     {
-                        Debug.WriteLine(recipePlugin.Name);
-                        yield return recipePlugin;
+                        var recipePlugin = Activator.CreateInstance(recipePluginType) as IRecipePlugin;
+                        if (recipePlugin is not null)
+                        {
+                            Debug.WriteLine(recipePlugin.Name);
+                            yield return recipePlugin;
+                        }
                     }
                 }
             }

spoclient/Views/MainAppSplashContent.axaml.cs

@@ -43,8 +43,8 @@ public async Task InitApp()
         //await settings.OpenAsync("spoclient.setting");
 
 
-        var migrator = new Migrator(settings.Connection!);
-        await migrator.ApplyMigrationsFromResourcesAsync("SpoClient.Setting.SQL.Migrations");
+        //var migrator = new Migrator(settings.Connection!);
+        //await migrator.ApplyMigrationsFromResourcesAsync("SpoClient.Setting.SQL.Migrations");
 
 
         LoadingText.Text = "Loading Plugins...";