fix: fix remote dictonary server address parsing

ikey4u · Nov 28, 2021 · d647366 · d647366
1 parent 3d06b62
commit d647366
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/core/src/error.rs b/core/src/error.rs
@@ -34,6 +34,9 @@ pub enum WikitError {
 
     #[error("FSTLevenshteinError error")]
     FSTLevenshteinError(#[from] fst::automaton::LevenshteinError),
+
+    #[error("Reqwest Error")]
+    ReqwestError(#[from] reqwest::Error),
 }
 
 pub type WikitResult<T> = std::result::Result<T, WikitError>;

diff --git a/core/src/wikit.rs b/core/src/wikit.rs
@@ -192,29 +192,34 @@ impl RemoteDictionary {
     }
 
     pub fn get_dict_list(&self) -> WikitResult<Vec<DictList>> {
-        let r = reqwest::blocking::get(format!("{}/wikit/list", self.url)).unwrap().json::<Vec<DictList>>().unwrap();
+        let url = format!("{}/wikit/list", self.url);
+        let r = reqwest::blocking::get(url)?.json::<Vec<DictList>>()?;
         Ok(r)
     }
 
     pub fn lookup<P>(&self, word: P, dict: P) -> WikitResult<Vec<(String, String)>> where P: AsRef<str> {
         let r = reqwest::blocking::get(
             format!("{}/wikit/query?word={}&dictname={}", self.url, word.as_ref(), dict.as_ref())
-        ).unwrap().json::<Vec<(String, String)>>().unwrap();
+        )?.json::<Vec<(String, String)>>()?;
         Ok(r)
     }
 
     pub fn get_script<S>(&self, dict: S) -> String where S: AsRef<str> {
-        let r = reqwest::blocking::get(
-            format!("{}/wikit/script?dictname={}", self.url, dict.as_ref())
-        ).unwrap().text().unwrap();
-        r
+        if let Ok(r) = reqwest::blocking::get(format!("{}/wikit/script?dictname={}", self.url, dict.as_ref())) {
+            if let Ok(r) = r.text() {
+                return r;
+            }
+        }
+        "".to_string()
     }
 
     pub fn get_style<S>(&self, dict: S) -> String where S: AsRef<str> {
-        let r = reqwest::blocking::get(
-            format!("{}/wikit/style?dictname={}", self.url, dict.as_ref())
-        ).unwrap().text().unwrap();
-        r
+        if let Ok(r) = reqwest::blocking::get(format!("{}/wikit/style?dictname={}", self.url, dict.as_ref())) {
+            if let Ok(r) = r.text() {
+                return r;
+            }
+        }
+        "".to_string()
     }
 }
 
@@ -496,7 +501,7 @@ pub fn load_dictionary_from_uri<S>(uri: S) -> Option<WikitDictionary> where S: A
                     ""
                 };
                 let dict = RemoteDictionary::new(
-                    format!("{}://{}{}", url.scheme(), host, port),
+                    format!("{}://{}{}{}", url.scheme(), host, port, url.path()),
                     user.to_string(),
                     token.to_string(),
                 );

diff --git a/desktop/src-tauri/src/main.rs b/desktop/src-tauri/src/main.rs
@@ -84,6 +84,8 @@ fn get_dict_list() -> Vec<String> {
                         for d in ds {
                             dictdb.insert(d.id.clone(), dict.clone());
                         }
+                    } else {
+                        println!("failed to get remote dictionary list");
                     }
                 },
             }