t/audio-conv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix relative path handling in config

Browse Source
This commit is contained in:
Thomas Heck
2020-11-08 17:05:17 +01:00
parent cef350fca2
commit dac57fa4d1
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/config.rs
View File

@@ -55,6 +55,10 @@ pub fn config() -> Result<Config> {
.unwrap_or_else(|| AsRef::<Path>::as_ref("audio-conv.yaml")); .unwrap_or_else(|| AsRef::<Path>::as_ref("audio-conv.yaml"));
let config_path = current_dir.join(config_path); let config_path = current_dir.join(config_path);
let config_dir = config_path
.parent()
.context("could not get parent directory of the config file")?;
let config_file = load_config_file(&config_path) let config_file = load_config_file(&config_path)
.with_context(|| format!("failed loading config file \"{}\"", config_path.display()))?; .with_context(|| format!("failed loading config file \"{}\"", config_path.display()))?;
@@ -66,28 +70,34 @@ pub fn config() -> Result<Config> {
} }
Ok(Config { Ok(Config {
from: matches from: {
.value_of_os("from") matches
.map(AsRef::<Path>::as_ref) .value_of_os("from")
.or_else(|| { .map(|p| current_dir.join(p))
config_file .or_else(|| {
.as_ref() config_file
.map(|c| c.from.as_ref().map(AsRef::as_ref)) .as_ref()
.flatten() .map(|c| c.from.as_ref())
}) .flatten()
.map(|p| current_dir.join(p)) .map(|p| config_dir.join(p))
.ok_or_else(|| Error::msg("\"from\" not configured"))?, })
.ok_or_else(|| Error::msg("\"from\" not configured"))?
.canonicalize()
.context("could not canonicalize \"from\" path")?
},
to: matches to: matches
.value_of_os("to") .value_of_os("to")
.map(AsRef::<Path>::as_ref) .map(|p| current_dir.join(p))
.or_else(|| { .or_else(|| {
config_file config_file
.as_ref() .as_ref()
.map(|c| c.to.as_ref().map(AsRef::as_ref)) .map(|c| c.to.as_ref())
.flatten() .flatten()
.map(|p| config_dir.join(p))
}) })
.map(|p| current_dir.join(p)) .ok_or_else(|| Error::msg("\"to\" not configured"))?
.ok_or_else(|| Error::msg("\"to\" not configured"))?, .canonicalize()
.context("could not canonicalize \"to\" path")?,
}) })
} }