Fixed configuration migration not performing correctly

Aether-Tools · Jan 9, 2024 · e77037f · e77037f
1 parent a9700f2
commit e77037f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 30 deletions.
diff --git a/CustomizePlus/Configuration/Services/ConfigurationMigrator.cs b/CustomizePlus/Configuration/Services/ConfigurationMigrator.cs
@@ -95,8 +95,8 @@ private void MigrateV3ToV4()
             while (template.UniqueId == Guid.Empty || usedGuids.Contains(template.UniqueId));
             usedGuids.Add(template.UniqueId);
 
-            _saveService.ImmediateSave(template);
-            _saveService.ImmediateSave(profile);
+            _saveService.ImmediateSaveSync(template);
+            _saveService.ImmediateSaveSync(profile);
 
             _logger.Debug($"Migrated v3 profile {legacyProfile.ProfileName} to profile {profile.UniqueId} and template {template.UniqueId}");
             File.Delete(file);

diff --git a/CustomizePlus/Profiles/ProfileFileSystem.cs b/CustomizePlus/Profiles/ProfileFileSystem.cs
@@ -94,24 +94,15 @@ private void OnProfileChange(ProfileChanged.Type type, Profile? profile, object?
 
     private void Reload()
     {
-        if (Load(new FileInfo(_saveService.FileNames.ProfileFileSystem), _profileManager.Profiles, ProfileToIdentifier, ProfileToName))
+        if (!File.Exists(_saveService.FileNames.ProfileFileSystem))
         {
-            var shouldReloadAgain = false;
-
-            if (!File.Exists(_saveService.FileNames.ProfileFileSystem))
-                shouldReloadAgain = true;
+            _logger.Debug("WORKAROUND: saving filesystem file");
+            _saveService.ImmediateSaveSync(this);
+        }
 
+        if (Load(new FileInfo(_saveService.FileNames.ProfileFileSystem), _profileManager.Profiles, ProfileToIdentifier, ProfileToName))
             _saveService.ImmediateSave(this);
 
-            //this is a workaround for FileSystem's weird behavior where it doesn't load objects into itself if its file does not exist
-            if (shouldReloadAgain)
-            {
-                _logger.Debug("BUG WORKAROUND: reloading profile filesystem again");
-                Reload();
-                return;
-            }
-        }
-
         _logger.Debug("Reloaded profile filesystem.");
     }
 

diff --git a/CustomizePlus/Templates/TemplateFileSystem.cs b/CustomizePlus/Templates/TemplateFileSystem.cs
@@ -95,24 +95,16 @@ private void OnTemplateChange(TemplateChanged.Type type, Template? template, obj
 
     private void Reload()
     {
-        if (Load(new FileInfo(_saveService.FileNames.TemplateFileSystem), _templateManager.Templates, TemplateToIdentifier, TemplateToName))
+        //this is a workaround for FileSystem's weird behavior where it doesn't load objects into itself if its file does not exist
+        if (!File.Exists(_saveService.FileNames.TemplateFileSystem))
         {
-            var shouldReloadAgain = false;
-
-            if (!File.Exists(_saveService.FileNames.TemplateFileSystem))
-                shouldReloadAgain = true;
+            _logger.Debug("WORKAROUND: saving filesystem file");
+            _saveService.ImmediateSaveSync(this);
+        }
 
+        if (Load(new FileInfo(_saveService.FileNames.TemplateFileSystem), _templateManager.Templates, TemplateToIdentifier, TemplateToName))
             _saveService.ImmediateSave(this);
 
-            //this is a workaround for FileSystem's weird behavior where it doesn't load objects into itself if its file does not exist
-            if (shouldReloadAgain)
-            {
-                _logger.Debug("BUG WORKAROUND: reloading template filesystem again");
-                Reload();
-                return;
-            }
-        }
-
         _logger.Debug("Reloaded template filesystem.");
     }