feat: allow hiding morphology info

BrewingWeasel · Nov 16, 2023 · 58f5cd8 · 58f5cd8
1 parent 4d6de1c
commit 58f5cd8
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 11 deletions.
diff --git a/shared/src/lib.rs b/shared/src/lib.rs
@@ -23,7 +23,7 @@ pub enum Dictionary {
     File(String, DictFileType),
     Url(String),
     Command(String),
-    Wiktionary(String),
+    Wiktionary(String, bool),
 }
 
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]

diff --git a/src-tauri/src/dictionary.rs b/src-tauri/src/dictionary.rs
@@ -63,7 +63,11 @@ fn to_title(language: &str) -> String {
     }
 }
 
-async fn get_def_wiktionary(lemma: &str, language: &str) -> Result<String, Box<dyn Error>> {
+async fn get_def_wiktionary(
+    lemma: &str,
+    language: &str,
+    ignore_morph: bool,
+) -> Result<String, Box<dyn Error>> {
     let language = to_title(language);
     let text = reqwest::get(format!("https://wiktionary.org/wiki/{lemma}"))
         .await?
@@ -85,6 +89,10 @@ async fn get_def_wiktionary(lemma: &str, language: &str) -> Result<String, Box<d
                     .next()
                     .is_none()
             {
+                if cur_node.is(Class("NavFrame")) && ignore_morph {
+                    node = cur_node;
+                    continue;
+                }
                 def.push_str(&cur_node.html());
             }
             node = cur_node;
@@ -117,7 +125,9 @@ async fn get_def(dict: &Dictionary, lemma: &str) -> Result<String, Box<dyn Error
         Dictionary::File(f, dict_type) => get_def_from_file(lemma, f, dict_type),
         Dictionary::Url(url) => get_def_url(lemma, url).await,
         Dictionary::Command(cmd) => get_def_command(lemma, cmd).await,
-        Dictionary::Wiktionary(lang) => get_def_wiktionary(lemma, lang).await,
+        Dictionary::Wiktionary(lang, ignore_morph) => {
+            get_def_wiktionary(lemma, lang, *ignore_morph).await
+        }
     }
 }
 

diff --git a/src-ui/src/settings/dictionary_settings.rs b/src-ui/src/settings/dictionary_settings.rs
@@ -75,8 +75,8 @@ fn DictionaryRepresentation(
             }
         }
         "wiktionary" => {
-            if !matches!(rdict(), Dictionary::Wiktionary(_)) {
-                wdict(Dictionary::Wiktionary(String::new()));
+            if !matches!(rdict(), Dictionary::Wiktionary(_, _)) {
+                wdict(Dictionary::Wiktionary(String::new(), false));
             }
         }
         _ => unreachable!(),
@@ -93,7 +93,7 @@ fn DictionaryRepresentation(
                 <option value="command" selected=matches!(rdict(), Dictionary::Command(_))>
                     From command
                 </option>
-                <option value="wiktionary" selected=matches!(rdict(), Dictionary::Wiktionary(_))>
+                <option value="wiktionary" selected=matches!(rdict(), Dictionary::Wiktionary(_, _))>
                     From wiktionary
                 </option>
             </select>
@@ -143,23 +143,28 @@ fn DictionaryRepresentation(
                 }
                     .into_view()
             }
-            Dictionary::Wiktionary(url) => {
-                let (read_sig, write_sig) = create_signal(url);
+            Dictionary::Wiktionary(url, _) => {
+                let (read_url, write_url) = create_signal(url);
                 view! {
                     <div class="labeledinput">
                         <label for="wiktionary">Language</label>
                         <input
                             id="wiktionary"
                             type="text"
                             on:input=move |ev| {
-                                write_sig(event_target_value(&ev));
+                                write_url(event_target_value(&ev));
                             }
 
                             on:change=move |_| {
-                                wdict.update(|v| { *v = Dictionary::Wiktionary(read_sig()) })
+                                wdict
+                                    .update(|v| {
+                                        if let Dictionary::Wiktionary(_, hide_morph) = v {
+                                            *v = Dictionary::Wiktionary(read_url(), *hide_morph);
+                                        }
+                                    })
                             }
 
-                            prop:value=read_sig
+                            prop:value=read_url
                         />
                     </div>
                 }
@@ -178,6 +183,30 @@ fn DictionaryRepresentation(
     }
 }
 
+// <div class="labeledcheckbox">
+// <label for="hidemorph">Hide morphology</label>
+// <input
+// id="hidemorph"
+// type="checkbox"
+// on:change=move |ev| {
+// // write_showmorph(event_target_checked(&ev));
+//
+// // FIX: writing breaks it
+// if let Dictionary::Wiktionary(lang, _) = rdict() {
+// console_log("got here");
+// wdict(Dictionary::Wiktionary(lang, event_target_checked(&ev)));
+// console_log("anndd got here");
+// } else {
+// console_log("didnt got here");
+// }
+// // write_showmorph(event_target_checked(&ev));
+// // wdict.update(move |v| if let Dictionary::Wiktionary(lang, _) = v { *v = Dictionary::Wiktionary(lang.to_owned(), read_showmorph()) });
+// }
+//
+// prop:value=move || if let Dictionary::Wiktionary(_, hide_morph) = rdict() { hide_morph } else { false }
+// />
+// </div>
+
 #[component]
 fn file_dictionary_representation(
     filename: String,