Fix: Prevent setting migrations failing (#928)

* Fix: Prevent setting migrations failing * Fix: Add proper error handling for settings migrations
ShokoAnime · Jun 3, 2024 · f523fa5 · f523fa5
1 parent cf384cf
commit f523fa5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/src/core/patches.ts b/src/core/patches.ts
@@ -18,7 +18,7 @@ export const webuiSettingsPatches = {
     delete webuiSettings.collection.poster.showRandomPoster;
     webuiSettings.collection.image = {
       showRandomPoster:
-        (oldWebuiSettings?.collection?.list?.showRandomPoster || oldWebuiSettings?.collection?.poster?.showRandomPoster)
+        (oldWebuiSettings.collection.list.showRandomPoster || oldWebuiSettings.collection.poster.showRandomPoster)
           ?? false,
       showRandomFanart: false,
     };

diff --git a/src/core/react-query/settings/helpers.ts b/src/core/react-query/settings/helpers.ts
@@ -400,21 +400,27 @@ export const transformSettings = (response: SettingsServerType) => {
   let webuiSettings = JSON.parse(
     response.WebUI_Settings === '' ? '{}' : response.WebUI_Settings,
   ) as WebUISettingsType;
-  const settingsRevision = webuiSettings.settingsRevision ?? 0;
-  if (settingsRevision < 4) {
-    webuiSettings = {
-      ...initialSettings.WebUI_Settings,
-      settingsRevision: Number(Object.keys(webuiSettingsPatches).pop()),
-    };
+  const currentSettingsRevision = webuiSettings.settingsRevision ?? 0;
+  const versionedInitialSettings: WebUISettingsType = {
+    ...initialSettings.WebUI_Settings,
+    settingsRevision: Number(Object.keys(webuiSettingsPatches).pop()),
+  };
+
+  if (currentSettingsRevision < 4) {
+    webuiSettings = versionedInitialSettings;
   } else {
-    Object
-      .keys(webuiSettingsPatches)
-      .map(Number)
-      .filter(key => key > settingsRevision)
-      .forEach((key) => {
-        webuiSettings = webuiSettingsPatches[key](webuiSettings);
-      });
-    webuiSettings = Object.assign({}, initialSettings.WebUI_Settings, webuiSettings);
+    try {
+      Object
+        .keys(webuiSettingsPatches)
+        .map(Number)
+        .filter(key => key > currentSettingsRevision)
+        .forEach((key) => {
+          webuiSettings = webuiSettingsPatches[key](webuiSettings);
+        });
+      webuiSettings = Object.assign({}, initialSettings.WebUI_Settings, webuiSettings);
+    } catch {
+      webuiSettings = versionedInitialSettings;
+    }
   }
   return { ...response, WebUI_Settings: webuiSettings } as SettingsType;
   // For Dev Only