Merge pull request #20 from Klectr/19-refactor-store-methods

19 refactor store methods

src-tauri/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2021"
 tauri-build = { version = "1", features = [] }
 
 [dependencies]
-tauri = { version = "1", features = [ "fs-write-file", "fs-read-file", "path-all", "fs-exists", "shell-open"] }
+tauri = { version = "1", features = [ "fs-read-file", "fs-create-dir", "fs-exists", "fs-write-file", "path-all", "shell-open"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 

src-tauri/tauri.conf.json

@@ -22,10 +22,11 @@
       },
       "fs": {
         "all": false, 
+        "createDir": true,
         "readFile": true,
         "writeFile": true,
         "exists": true,
-        "scope": ["$APPDATA/*"]
+        "scope": ["$APPDATA/*", "$HOME/Library/Application Support/com.KlectrRadio.dev"]
       },
         "path": {
           "all": true 

src/hooks/stationStores.ts

@@ -2,27 +2,20 @@ import { createStore } from "kaioken"
 
 export const useStationsStore = createStore(
   null as Station[] | null,
-  (set) => ({
+  (set, get) => ({
     add: (station: Station): Station[] => {
-      let newState: Station[] | null = null
+      let newState: Station[] = [...(get() ?? []), station]
-      set((state) => {
+      set(newState)
-        newState = [...(state ?? []), station]
-        return newState
-      })
-      //@ts-ignore
       return newState
     },
     rmStation: (stationId): Station[] => {
-      let newState: Station[] | null = null
+      let newState: Station[] | null =
-      set((state) => {
+        get()?.filter((station) => station.id !== stationId) ?? []
-        newState = state?.filter((station) => station.id !== stationId) ?? []
+      set(newState)
-        return newState
-      })
-      //@ts-ignore
       return newState
     },
     override: (stationsList: Station[]) => {
-      set((_state) => stationsList)
+      set(stationsList)
     },
   })
 )

src/hooks/storageStores.ts

@@ -1,4 +1,9 @@
-import { exists, readTextFile, writeTextFile } from "@tauri-apps/api/fs"
+import {
+  createDir,
+  exists,
+  readTextFile,
+  writeTextFile,
+} from "@tauri-apps/api/fs"
 import { appDataDir } from "@tauri-apps/api/path"
 import { createStore } from "kaioken"
 import { Station } from "../hooks/stationStores"
@@ -10,7 +15,11 @@ export const useStorageStore = createStore(
 
 export function useStorage() {
   async function _createStationsFile(path: string): Promise<Station[]> {
+    try {
       await writeTextFile(path, "[]", { append: false })
+    } catch (err) {
+      console.error("CUSTOM ERROR: ", err)
+    }
     return []
   }
 
@@ -22,9 +31,17 @@ export function useStorage() {
       console.error("getStationsFile: ", err)
       return undefined
     }
+
     if (!dir) return undefined
+
+    const dirExists = await exists(dir)
+    if (!dirExists) {
+      await createDir(dir)
+    }
+
     const path = `${dir}stations.json`
-    if (!(await exists(path))) return await _createStationsFile(path)
+    const pathExists = await exists(path)
+    if (!pathExists) return await _createStationsFile(path)
     const jsonString = await readTextFile(path)
     const json = JSON.parse(jsonString) as Station[]
     useStorageStore.setState(() => path)