✨ improve migration from older version

Elliot67 · Sep 24, 2023 · ee015dc · ee015dc
1 parent 02624b7
commit ee015dc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/background/main.ts b/src/background/main.ts
@@ -8,6 +8,11 @@ import { AppDataGlobal, AppDataRule } from '~/types/app';
 browser.runtime.onInstalled.addListener((event): void => {
   if (event.reason === 'install') {
     browser.runtime.openOptionsPage();
+    return;
+  }
+
+  if (event.reason === 'update') {
+    SettingsStorage.applyMigrations();
   }
 });
 

diff --git a/src/composables/useSettings.ts b/src/composables/useSettings.ts
@@ -10,9 +10,6 @@ export default function useSettings() {
 
   async function load(): Promise<void> {
     const storageSettings = await SettingsStorage.getItem();
-    if (storageSettings.version !== defaultSettings.version) {
-      migrateSettings(storageSettings);
-    }
     settings.version = storageSettings.version;
     settings.favicon = storageSettings.favicon;
     settings.rules = storageSettings.rules;

diff --git a/src/logic/settings-storage.ts b/src/logic/settings-storage.ts
@@ -1,5 +1,6 @@
 import { storage } from 'webextension-polyfill';
 import { defaultSettings } from '~/configuration/settings';
+import { migrateSettings } from '~/logic/settings-migrations';
 import { AppDataGlobal } from '~/types/app';
 import { isDef } from '~/utils';
 
@@ -16,10 +17,22 @@ export const SettingsStorage = {
       await SettingsStorage.resetItem();
       return SettingsStorage.getItem();
     }
+    if (settings.version !== defaultSettings.version) {
+      migrateSettings(settings);
+      await SettingsStorage.setItem(settings);
+    }
     return settings;
   },
 
   async resetItem(): Promise<void> {
     return await SettingsStorage.setItem(defaultSettings);
   },
+
+  async applyMigrations(): Promise<void> {
+    const settings = await SettingsStorage.getItem();
+    if (settings.version !== defaultSettings.version) {
+      migrateSettings(settings);
+    }
+    await SettingsStorage.setItem(settings);
+  },
 };