feat: make path with expand

core_model/src/support/path_format.rs

@@ -1,20 +1,18 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
-pub fn expand(path: &Path) -> PathBuf {
-    let input = &path.display().to_string();
+pub fn expand(path: &str) -> PathBuf {
+    let input = &PathBuf::from(path).display().to_string();
     let path = shellexpand::tilde(input);
     return PathBuf::from(path.to_string());
 }
 
 #[cfg(test)]
 mod test {
     use crate::support::path_format::expand;
-    use std::path::Path;
 
     #[test]
     fn format_path() {
-        let path = Path::new("~");
-        let string = expand(path);
+        let string = expand("~");
         assert_ne!(string.display().to_string(), "~");
     }
 }

core_model/src/support/url_format.rs

@@ -2,6 +2,7 @@ use std::path::{Path, PathBuf};
 
 use url::Url;
 
+use crate::support::path_format;
 use crate::Settings;
 
 pub fn json_filename_suffix(text: &str, suffix_str: Option<&str>) -> String {
@@ -67,13 +68,13 @@ pub fn uri_to_path(url: &str) -> PathBuf {
     let uri_path = match Url::parse(url) {
         Ok(url) => url,
         Err(_e) => {
-            return PathBuf::from(url);
+            return path_format::expand(url);
         }
     };
 
     let root = Path::new(Settings::root());
     if uri_path.host().is_none() {
-        return PathBuf::from(url);
+        return path_format::expand(url);
     }
     let mut buf = root.join(PathBuf::from(uri_path.host().unwrap().to_string()));