ryze/mpv-rpc
2
1
Fork 0
Code Issues 6 Pull requests Releases 4 Activity

Use if let instead of or in get_config_path

Browse source
This commit is contained in:
Ryze 2023-02-07 16:25:08 +03:00
parent 7901e24bf9
commit ac36fe351d
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/config.rs
View file

@ -65,12 +65,22 @@ impl Config {
} }
fn get_config_path() -> String { fn get_config_path() -> String {
let mpv_home = env::var("MPV_HOME").or( Config::get_mpv_home() + "rpc.json"
env::var("HOME").and_then(|home| Ok(home + "/.config/mpv/")).or( }
env::var("XDG_CONFIG_HOME").and_then(|home| Ok(home + "/.mpv/"))
)
).unwrap_or("/etc/mpv/".to_string());
return mpv_home + "rpc.json" fn get_mpv_home() -> String {
if let Ok(home) = env::var("MPV_HOME") {
return home;
}
if let Ok(home) = env::var("HOME") {
return home + "/.config/mpv/";
}
if let Ok(home) = env::var("XDG_CONFIG_HOME") {
return home + "/.mpv/";
}
"/etc/mpv/".to_owned()
} }
} }