fix: apply config migrations, even on first run

Author: lars-berger

packages/desktop/src/app_settings.rs

@@ -155,14 +155,15 @@ impl AppSettings {
     config_dir: &Path,
     migration_file: &Path,
   ) -> anyhow::Result<(AppSettingsValue, bool)> {
+    // Apply any pending config migrations before reading the settings
+    // file.
+    apply_config_migrations(config_dir, migration_file)?;
+
     let settings_path = config_dir.join("settings.json");
     let is_found = settings_path.exists();
 
-    // Apply any pending config migrations before reading the settings
-    // file. If the file does not exist, initialize a default.
-    if is_found {
-      apply_config_migrations(config_dir, migration_file)?;
-    } else {
+    // If the file does not exist, initialize a default.
+    if !is_found {
       Self::create_default(config_dir)?;
     }
 

packages/desktop/src/config_migration.rs

@@ -33,7 +33,10 @@ impl ConfigMigration {
   }
 }
 
-/// Migrates config files to the latest version.
+/// Migrates existing config files to the latest version.
+///
+/// Any migrations that have already been applied will be skipped. If
+/// no migrations are needed, the function will no-op.
 pub fn apply_config_migrations(
   config_dir: &Path,
   migration_file: &Path,
@@ -74,6 +77,11 @@ pub fn apply_config_migrations(
 fn migrate_startup_config(config_dir: &Path) -> anyhow::Result<()> {
   let settings_path = config_dir.join("settings.json");
 
+  // Skip if the settings file does not exist.
+  if !settings_path.exists() {
+    return Ok(());
+  }
+
   let settings_json =
     read_and_parse_json::<serde_json::Value>(&settings_path)
       .context("Failed to parse settings.json")?;