From 19ca59c98032906c9c8086ec2698325dd6972db8 Mon Sep 17 00:00:00 2001
From: BrewingWeasel <weeaseled@gmail.com>
Date: Sun, 28 Jan 2024 17:50:08 -0800
Subject: [PATCH] feat: load and save from settings file

---
 Cargo.lock                                | 10 ++++++++
 shared/Cargo.toml                         |  1 +
 shared/src/lib.rs                         | 28 +++++++++++++++++++++--
 src-tauri/Cargo.toml                      |  2 +-
 src-tauri/src/main.rs                     | 22 ++++++++----------
 src/components/Settings.vue               | 22 ++++++++++++++++--
 src/components/SettingsPage.vue           |  8 +++++++
 src/components/settings/Deck.vue          |  9 +++++---
 src/components/settings/Notes.vue         | 15 ++++++++----
 src/components/settings/WordKnowledge.vue |  9 ++++----
 src/main.ts                               | 18 +++++++--------
 11 files changed, 106 insertions(+), 38 deletions(-)
 create mode 100644 src/components/SettingsPage.vue

diff --git a/Cargo.lock b/Cargo.lock
index a5d21a7..6ccb491 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2815,6 +2815,15 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-map-to-array"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c14b52efc56c711e0dbae3f26e0cc233f5dac336c1bf0b07e1b7dc2dca3b2cc7"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.189"
@@ -2956,6 +2965,7 @@ version = "0.1.0"
 dependencies = [
  "rusty-hook",
  "serde",
+ "serde-map-to-array",
 ]
 
 [[package]]
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 6302577..0dfe966 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.189", features = ["derive"] }
+serde-map-to-array = { version = "1.1.1", features = ["std"] }
 
 [dev-dependencies]
 rusty-hook = "^0.11.2"
diff --git a/shared/src/lib.rs b/shared/src/lib.rs
index fe3c107..9a5e22f 100644
--- a/shared/src/lib.rs
+++ b/shared/src/lib.rs
@@ -2,6 +2,22 @@ use std::collections::HashMap;
 
 use serde::{Deserialize, Serialize};
 
+use serde_map_to_array::{HashMapToArray, KeyValueLabels};
+
+struct DeckKeyValueLabels;
+
+impl KeyValueLabels for DeckKeyValueLabels {
+    const KEY: &'static str = "name";
+    const VALUE: &'static str = "notes";
+}
+
+struct NoteKeyValueLabels;
+
+impl KeyValueLabels for NoteKeyValueLabels {
+    const KEY: &'static str = "model";
+    const VALUE: &'static str = "handling";
+}
+
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct Word {
     pub text: String,
@@ -61,6 +77,13 @@ pub struct NoteToWordHandling {
     pub tags_wanted: Vec<String>,
 }
 
+#[derive(Deserialize, Serialize, Clone)]
+
+pub struct Note(
+    #[serde(with = "HashMapToArray::<String, NoteToWordHandling, NoteKeyValueLabels>")]
+    pub  HashMap<String, NoteToWordHandling>,
+);
+
 #[derive(Deserialize, Serialize, Clone)]
 pub struct Settings {
     pub deck: String,
@@ -70,7 +93,8 @@ pub struct Settings {
     pub dicts: Vec<Dictionary>,
     pub to_remove: Option<usize>,
     pub css: Option<String>,
-    pub anki_parser: Option<HashMap<String, HashMap<String, NoteToWordHandling>>>,
+    #[serde(with = "HashMapToArray::<String, Note, DeckKeyValueLabels>")]
+    pub anki_parser: HashMap<String, Note>,
     pub to_run: Option<Vec<String>>,
 }
 
@@ -87,7 +111,7 @@ Back:{word}:{def}",
             dicts: Vec::new(),
             to_remove: None,
             css: None,
-            anki_parser: None,
+            anki_parser: HashMap::new(),
             to_run: None,
         }
     }
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index d6a7a79..e8639ed 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -17,7 +17,7 @@ tauri-build = { version = "1.5.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5.2", features = [ "shell-open"] }
+tauri = { version = "1.5.2", features = ["shell-open"] }
 stardict = "0.2.0"
 reqwest = { version = "0.11.22", features = ["json"] }
 shared = { path = "../shared" }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 58ee782..6e2760d 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -59,18 +59,16 @@ impl Default for SharedInfo {
             .num_days()
             + 1;
 
-        if let Some(ankiparsers) = &mut settings.anki_parser {
-            for (deck, note_parser) in ankiparsers {
-                block_on(get_anki_card_statuses(
-                    deck,
-                    note_parser,
-                    &mut to_save.words,
-                    days_passed,
-                    !to_save.decks_checked.contains(deck),
-                ))
-                .unwrap();
-                to_save.decks_checked.push(deck.clone());
-            }
+        for (deck, note_parser) in &mut settings.anki_parser {
+            block_on(get_anki_card_statuses(
+                deck,
+                &note_parser.0,
+                &mut to_save.words,
+                days_passed,
+                !to_save.decks_checked.contains(deck),
+            ))
+            .unwrap();
+            to_save.decks_checked.push(deck.clone());
         }
 
         if let Some(cmds) = &settings.to_run {
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index cd35672..abba0ab 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -7,20 +7,38 @@ import {
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
-import { Input } from "@/components/ui/input";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 import { Switch } from "@/components/ui/switch";
+import { Button } from "@/components/ui/button";
 
 import WordKnowledge from "@/components/settings/WordKnowledge.vue";
+import { invoke } from "@tauri-apps/api/tauri";
+import { Ref, ref } from "vue";
+import { Deck } from "./settings/Deck.vue";
 
 function toggleDarkMode() {
   const body = document.querySelector("body");
   body!.classList.toggle("dark");
 }
+
+interface Settings {
+  deck: string;
+  note_type: string;
+  note_fields: string;
+  model: string;
+  anki_parser: Deck[];
+}
+
+const settings: Ref<Settings> = ref(await invoke("get_settings"));
+
+async function saveSettings() {
+  await invoke("write_settings", { settings: settings.value });
+}
 </script>
 
 <template>
+  <Button @click="saveSettings">Save</Button>
   <div class="w-full flex justify-center">
     <Tabs default-value="knowledge" class="object-center">
       <TabsList class="grid w-full grid-cols-6">
@@ -55,7 +73,7 @@ function toggleDarkMode() {
           </CardHeader>
           <CardContent class="space-y-2">
             <Suspense>
-              <WordKnowledge />
+              <WordKnowledge :decks="settings.anki_parser" />
             </Suspense>
           </CardContent>
         </Card>
diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue
new file mode 100644
index 0000000..44cf46f
--- /dev/null
+++ b/src/components/SettingsPage.vue
@@ -0,0 +1,8 @@
+<script setup lang="ts">
+import { Suspense } from "vue";
+import Settings from "./Settings.vue";
+</script>
+
+<template>
+  <Suspense><Settings /></Suspense>
+</template>
diff --git a/src/components/settings/Deck.vue b/src/components/settings/Deck.vue
index c45bc8f..2f0d0fc 100644
--- a/src/components/settings/Deck.vue
+++ b/src/components/settings/Deck.vue
@@ -25,9 +25,12 @@ const props = defineProps<{
 function addNote() {
   props.deck.notes.push({
     model: "",
-    field: "",
-    removeParens: false,
-    firstWordOnly: false,
+    handling: {
+      field_to_use: "",
+      only_first_word_or_line: false,
+      remove_everything_in_parens: false,
+      tags_wanted: [],
+    },
   });
 }
 </script>
diff --git a/src/components/settings/Notes.vue b/src/components/settings/Notes.vue
index 342b025..5d23871 100644
--- a/src/components/settings/Notes.vue
+++ b/src/components/settings/Notes.vue
@@ -7,9 +7,14 @@ import { computedAsync } from "@vueuse/core";
 
 export interface Note {
   model: string;
-  field: string;
-  removeParens: boolean;
-  firstWordOnly: boolean;
+  handling: NoteToWordHandling;
+}
+
+interface NoteToWordHandling {
+  field_to_use: string;
+  only_first_word_or_line: boolean;
+  remove_everything_in_parens: boolean;
+  tags_wanted: string[];
 }
 
 const props = defineProps<{
@@ -18,7 +23,7 @@ const props = defineProps<{
 }>();
 
 const fields = computedAsync(async (): Promise<string[]> => {
-  props.note.field = "";
+  props.note.handling.field_to_use = "";
   return await invoke("get_note_field_names", {
     model: props.note.model,
   });
@@ -35,7 +40,7 @@ const fields = computedAsync(async (): Promise<string[]> => {
       />
       <StyledCombobox
         :options="fields"
-        v-model="props.note.field"
+        v-model="props.note.handling.field_to_use"
         item-being-selected="field"
       />
     </div>
diff --git a/src/components/settings/WordKnowledge.vue b/src/components/settings/WordKnowledge.vue
index d72d847..2b7e513 100644
--- a/src/components/settings/WordKnowledge.vue
+++ b/src/components/settings/WordKnowledge.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { Ref, ref } from "vue";
-
 import {
   Accordion,
   AccordionContent,
@@ -13,13 +11,16 @@ import { Button } from "@/components/ui/button";
 import IndividualDeck from "@/components/settings/Deck.vue";
 import { Deck } from "@/components/settings/Deck.vue";
 
-const decks: Ref<Array<Deck>> = ref([]);
 const models: string[] = await invoke("get_all_note_names", {});
 
 const deckNames: string[] = await invoke("get_all_deck_names", {});
 
+const props = defineProps<{
+  decks: Deck[];
+}>();
+
 function addDeck() {
-  decks.value.push({
+  props.decks.push({
     name: "",
     notes: [],
   });
diff --git a/src/main.ts b/src/main.ts
index 24a2027..c3ea1c3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,19 +4,19 @@ import { createRouter, createWebHistory } from "vue-router";
 import "./styles.css";
 import App from "./App.vue";
 import Input from "./components/Input.vue";
-import Settings from "./components/Settings.vue";
+import Settings from "./components/SettingsPage.vue";
 import WordView from "./components/WordView.vue";
 import ReaderView from "./components/ReaderView.vue";
 
 const router = createRouter({
-	history: createWebHistory(),
-	routes: [
-		{ path: "/", component: Input },
-		{ path: "/reader", component: ReaderView },
-		{ path: "/settings", component: Settings },
-		{ path: "/words/:word", component: WordView },
-		// { path: "/reader", component: Reader },
-	],
+  history: createWebHistory(),
+  routes: [
+    { path: "/", component: Input },
+    { path: "/reader", component: ReaderView },
+    { path: "/settings", component: Settings },
+    { path: "/words/:word", component: WordView },
+    // { path: "/reader", component: Reader },
+  ],
 });
 
 const app = createApp(App);