Change default openpal3.toml and yaobow-assets path for linux (#57)

* set opeanpal3.toml default at ~/.config on linux

* allow yaobow-assets at /usr/share/yaobow/ on linux

Author: amazingfate

yaobow/shared/Cargo.toml

@@ -43,6 +43,7 @@ thiserror = "1.0"
 uuid = "0.8"
 wavefront_obj = "5.1.0"
 xxtea = "0.2.0"
+shellexpand = "3.1"
 
 [target.'cfg(target_os = "android")'.dependencies]
 ndk-glue = "0.5.0"

yaobow/shared/src/config.rs

@@ -11,8 +11,11 @@ impl YaobowConfig {
 
         let mut builder = config::Config::builder();
 
-        if std::path::PathBuf::from(config_name).exists() {
-            builder = builder.add_source(config::File::new(config_name, config::FileFormat::Toml));
+        if let Ok(expanded) = shellexpand::full(config_name) {
+            let path = std::path::PathBuf::from(expanded.as_ref());
+            if path.exists() {
+                builder = builder.add_source(config::File::new(expanded.as_ref(), config::FileFormat::Toml));
+            }
         }
 
         let cfg = ydirs::config_dir().join(config_name);

yaobow/yaobow/src/application/director.rs

@@ -144,6 +144,7 @@ impl TitleSelectionDirector {
         let zip = PathBuf::from(ASSET_PATH);
         let local1 = PathBuf::from("./yaobow/yaobow-assets");
         let local2 = PathBuf::from("../yaobow-assets");
+        let local3 = PathBuf::from("/usr/share/yaobow/yaobow-assets");
 
         if Path::exists(&zip) {
             let local = ZipFs::new(std::fs::File::open(zip).unwrap());
@@ -157,6 +158,10 @@ impl TitleSelectionDirector {
             let local = LocalFs::new(&local2);
             vfs = vfs.mount(PathBuf::from("/"), local);
             Some(Rc::new(vfs))
+        } else if Path::exists(&local3) {
+            let local = LocalFs::new(&local3);
+            vfs = vfs.mount(PathBuf::from("/"), local);
+            Some(Rc::new(vfs))
         } else {
             None
         }

yaobow/yaobow/src/application/mod.rs

@@ -73,6 +73,9 @@ impl YaobowApplicationLoader {
     pub fn new(app: ComRc<IApplication>) -> Self {
         Self {
             app,
+            #[cfg(linux)]
+            config: YaobowConfig::load("~/.config/openpal3.toml", "OPENPAL3"),
+            #[cfg(not(linux))]
             config: YaobowConfig::load("openpal3.toml", "OPENPAL3"),
             selected_game: Rc::new(RefCell::new(None)),
         }