fix: desktop local settings

feng19 · Dec 4, 2024 · ca117a5 · ca117a5
1 parent de45c97
commit ca117a5
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 18 deletions.
diff --git a/assets/svelte/dashboard.svelte b/assets/svelte/dashboard.svelte
@@ -86,12 +86,36 @@
       true
     );
 
-    let curr_settings = localStorage.getItem("x-trace-curr-settings");
-    if (curr_settings) {
-      live.pushEvent("apply-settings", { encoded: curr_settings, quiet: true });
+    // load current settings
+    if (window.__TAURI__) {
+      const { readTextFile, BaseDirectory } = window.__TAURI__.fs;
+      readTextFile("curr_settings.json", {
+        baseDir: BaseDirectory.AppData,
+      }).then((content) => {
+        if (content.length > 0) {
+          live.pushEvent("apply-settings", { encoded: content, quiet: true });
+        }
+      });
+    } else {
+      let curr_settings = localStorage.getItem("x-trace-curr-settings");
+      if (curr_settings) {
+        live.pushEvent("apply-settings", {
+          encoded: curr_settings,
+          quiet: true,
+        });
+      }
     }
+
+    // save current settings
     live.handleEvent("save-curr-settings", ({ encoded }) => {
-      localStorage.setItem("x-trace-curr-settings", encoded);
+      if (window.__TAURI__) {
+        const { writeTextFile, BaseDirectory } = window.__TAURI__.fs;
+        writeTextFile("curr_settings.json", encoded, {
+          baseDir: BaseDirectory.AppData,
+        });
+      } else {
+        localStorage.setItem("x-trace-curr-settings", encoded);
+      }
     });
   });
 </script>

diff --git a/assets/svelte/settings_local_storage.js b/assets/svelte/settings_local_storage.js
@@ -3,22 +3,43 @@ import { toast } from "svelte-sonner";
 
 function createStore() {
   const store = writable({ selected: null, items: [] });
-  let dump = () => {
-    localStorage.setItem("x-trace-settings", JSON.stringify(get(store).items));
-  };
+  function load() {
+    if (window.__TAURI__) {
+      const { readTextFile, BaseDirectory } = window.__TAURI__.fs;
+      readTextFile("settings.json", { baseDir: BaseDirectory.AppData }).then(
+        (content) => {
+          if (content.length > 0) {
+            store.update((obj) => ({ ...obj, items: JSON.parse(content) }));
+          }
+        }
+      );
+    } else {
+      let all_settings = localStorage.getItem("x-trace-settings");
+      if (all_settings) {
+        store.update((obj) => ({ ...obj, items: JSON.parse(all_settings) }));
+      }
+    }
+  }
+
+  function dump() {
+    let content = JSON.stringify(get(store).items);
+    if (window.__TAURI__) {
+      const { writeTextFile, BaseDirectory } = window.__TAURI__.fs;
+      writeTextFile("settings.json", content, {
+        baseDir: BaseDirectory.AppData,
+      });
+    } else {
+      localStorage.setItem("x-trace-settings", content);
+    }
+  }
 
   return {
     subscribe: store.subscribe,
     select: (id) => {
       console.log("select id:", id);
       store.update((obj) => ({ ...obj, selected: id }));
     },
-    load: () => {
-      let all_settings = localStorage.getItem("x-trace-settings");
-      if (all_settings) {
-        store.update((obj) => ({ ...obj, items: JSON.parse(all_settings) }));
-      }
-    },
+    load: load,
     dump: dump,
     remove: (item) => {
       store.update((obj) => ({

diff --git a/lib/x_trace_web/components/core_components.ex b/lib/x_trace_web/components/core_components.ex
@@ -3,6 +3,4 @@ defmodule XTraceWeb.CoreComponents do
   Provides core UI components.
   """
   use Phoenix.Component
-#  alias Phoenix.LiveView.JS
-
 end
diff --git a/lib/x_trace_web/components/layouts/app.html.heex b/lib/x_trace_web/components/layouts/app.html.heex
@@ -1,3 +1,3 @@
 <main class="h-screen overflow-hidden">
-  <%= @inner_content %>
+  {@inner_content}
 </main>
diff --git a/lib/x_trace_web/components/layouts/root.html.heex b/lib/x_trace_web/components/layouts/root.html.heex
@@ -5,13 +5,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="csrf-token" content={get_csrf_token()} />
     <.live_title suffix=" · Phoenix Framework">
-      <%= assigns[:page_title] || "XTrace" %>
+      {assigns[:page_title] || "XTrace"}
     </.live_title>
     <link phx-track-static rel="stylesheet" href={~p"/assets/app.css"} />
     <script defer phx-track-static type="text/javascript" src={~p"/assets/app.js"}>
     </script>
   </head>
   <body class="bg-white">
-    <%= @inner_content %>
+    {@inner_content}
   </body>
 </html>