From c6dd4a4e972aae03f469fd88fbcdae37b8a96c13 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Sat, 22 Feb 2025 15:25:09 +1100
Subject: use state

---
 app.tsx                 | 6 +++---
 env.d.ts                | 1 +
 run.fish                | 7 ++++---
 src/services/math.ts    | 2 +-
 src/services/players.ts | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app.tsx b/app.tsx
index 113644e..17bbeea 100644
--- a/app.tsx
+++ b/app.tsx
@@ -12,8 +12,8 @@ import { App } from "astal/gtk3";
 
 const loadStyleAsync = async () => {
     let schemeColours;
-    if (GLib.file_test(`${CACHE}/scheme/current.txt`, GLib.FileTest.EXISTS)) {
-        const currentScheme = await readFileAsync(`${CACHE}/scheme/current.txt`);
+    if (GLib.file_test(`${STATE}/scheme/current.txt`, GLib.FileTest.EXISTS)) {
+        const currentScheme = await readFileAsync(`${STATE}/scheme/current.txt`);
         schemeColours = currentScheme
             .split("\n")
             .map(l => {
@@ -32,7 +32,7 @@ App.start({
     main() {
         const now = Date.now();
         loadStyleAsync().catch(console.error);
-        monitorFile(`${CACHE}/scheme/current.txt`, () => loadStyleAsync().catch(console.error));
+        monitorFile(`${STATE}/scheme/current.txt`, () => loadStyleAsync().catch(console.error));
 
         <Launcher />;
         <NotifPopups />;
diff --git a/env.d.ts b/env.d.ts
index eca9fc8..435553f 100644
--- a/env.d.ts
+++ b/env.d.ts
@@ -1,3 +1,4 @@
 declare const HOME: string;
 declare const CACHE: string;
+declare const STATE: string;
 declare const SRC: string;
diff --git a/run.fish b/run.fish
index 5e2d48e..2efd677 100755
--- a/run.fish
+++ b/run.fish
@@ -2,13 +2,14 @@
 
 cd (dirname (status filename)) || exit 1
 
-set -q XDG_RUNTIME_DIR && set bundle_dir $XDG_RUNTIME_DIR || set bundle_dir /tmp
-set -q XDG_CACHE_HOME && set cache_dir $XDG_CACHE_HOME/caelestia || set cache_dir $HOME/.cache/caelestia
+set -q XDG_RUNTIME_DIR && set -l bundle_dir $XDG_RUNTIME_DIR || set -l bundle_dir /tmp
+set -q XDG_CACHE_HOME && set -l cache_dir $XDG_CACHE_HOME/caelestia || set -l cache_dir $HOME/.cache/caelestia
+set -q XDG_STATE_HOME && set -l state_dir $XDG_STATE_HOME/caelestia || set -l state_dir $HOME/.local/state/caelestia
 
 mkdir -p $cache_dir
 
 ./node_modules/.bin/esbuild app.tsx --bundle --outfile=$bundle_dir/caelestia.js \
     --external:console --external:system --external:cairo --external:gettext --external:'file://*' --external:'gi://*' --external:'resource://*' \
-    --define:HOME=\"$HOME\" --define:CACHE=\"$cache_dir\" --define:SRC=\"(pwd)\" --format=esm --platform=neutral --main-fields=module,main
+    --define:HOME=\"$HOME\" --define:CACHE=\"$cache_dir\" --define:STATE=\"$state_dir\" --define:SRC=\"(pwd)\" --format=esm --platform=neutral --main-fields=module,main
 
 gjs -m $bundle_dir/caelestia.js
diff --git a/src/services/math.ts b/src/services/math.ts
index 925bbcb..5c7dfce 100644
--- a/src/services/math.ts
+++ b/src/services/math.ts
@@ -18,7 +18,7 @@ export default class Math extends GObject.Object {
     }
 
     readonly #maxHistory = config.maxHistory;
-    readonly #path = `${CACHE}/math-history.json`;
+    readonly #path = `${STATE}/math-history.json`;
     readonly #history: HistoryItem[] = [];
 
     #variables: Record<string, string> = {};
diff --git a/src/services/players.ts b/src/services/players.ts
index b81d4b5..afac78b 100644
--- a/src/services/players.ts
+++ b/src/services/players.ts
@@ -11,7 +11,7 @@ export default class Players extends GObject.Object {
         return this.instance;
     }
 
-    readonly #path = `${CACHE}/players.txt`;
+    readonly #path = `${STATE}/players.txt`;
     readonly #players: AstalMpris.Player[] = [];
     readonly #subs = new Map<
         JSX.Element,
-- 
cgit v1.2.3-freya