Fix settings export/import to also handle notes

IsThereAnyDeal · May 28, 2024 · 55e8907 · 55e8907
1 parent 18b826d
commit 55e8907
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/src/js/Content/Features/Store/Common/UserNotes.ts b/src/js/Content/Features/Store/Common/UserNotes.ts
@@ -38,6 +38,10 @@ export default class UserNotes {
         return this._adapter.get(...appids);
     }
 
+    export(): Promise<Record<number, string>> {
+        return this._adapter.export();
+    }
+
     async set(appid: number, note: string): Promise<boolean> {
         let capInfo = null;
 

diff --git a/src/js/Options/Data/Settings.ts b/src/js/Options/Data/Settings.ts
@@ -3,7 +3,7 @@ import type {SettingsSchema} from "./_types";
 import type {SchemaKeys, SchemaValue, StorageInterface} from "@Core/Storage/Storage";
 import {SyncedStorage} from "@Core/Storage/SyncedStorage";
 
-const DefaultSettings: SettingsSchema = Object.freeze({
+export const DefaultSettings: SettingsSchema = Object.freeze({
     "language": "english",
 
     "version": Info.version,
@@ -268,10 +268,10 @@ export class SettingsStore {
         this.data = structuredClone(DefaultSettings);
     }
 
-    static import(data: SettingsSchema): void {
+    static async import(data: Partial<SettingsSchema>): Promise<void> {
         // TODO check data for valid keys and values
-        this.storage.setObject(data);
-        this.data = data;
+        await this.storage.setObject(data);
+        await this.load();
     }
 
     static asObject(): SettingsSchema {

diff --git a/src/js/Options/Modules/Footer.svelte b/src/js/Options/Modules/Footer.svelte
@@ -10,9 +10,12 @@
         __options_settingsMngmt_reset
     } from "@Strings/_strings";
     import {L} from "@Core/Localization/Localization";
-    import {SettingsStore} from "../Data/Settings";
+    import {DefaultSettings, SettingsStore} from "../Data/Settings";
     import Downloader from "@Core/Downloader";
     import {Info} from "@Core/Info";
+    import UserNotes from "@Content/Features/Store/Common/UserNotes";
+    import type {SettingsSchema} from "@Options/Data/_types";
+    import UserNotesAdapter from "@Content/Modules/UserNotes/UserNotesAdapter";
 
 
     function importSettings(e: Event & {currentTarget: EventTarget & HTMLInputElement}) {
@@ -23,8 +26,17 @@
             const data = reader.result as string;
 
             let importedSettings;
+            let importedNotes;
             try {
-                importedSettings = JSON.parse(data);
+                const importedData = JSON.parse(data);
+
+                const knownKeys = new Set(Object.keys(DefaultSettings));
+                importedSettings = Object.fromEntries(
+                    Object.entries(importedData)
+                        .filter(([key, _value]) => knownKeys.has(key))
+                ) as Partial<SettingsSchema>;
+
+                importedNotes = importedData.user_notes ?? {};
             } catch (err) {
                 console.group("Import");
                 console.error("Failed to read settings file");
@@ -39,6 +51,7 @@
             try {
                 console.log(importedSettings);
                 SettingsStore.import(importedSettings);
+                UserNotesAdapter.getAdapter().import(importedNotes);
             } catch (err) {
                 console.group("Import");
                 console.error("Failed to write settings to storage");
@@ -61,10 +74,13 @@
         }
     }
 
-    function exportSettings() {
+    async function exportSettings() {
+        const result: Record<string, any> = SettingsStore.asObject();
+        result.user_notes = await (new UserNotes()).export();
+
         Downloader.download(
             new Blob([
-                JSON.stringify(SettingsStore.asObject(), null, "  ")
+                JSON.stringify(result, null, "  ")
             ]),
             `AugmentedSteam_v${Info.version}.json`
         );