leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(config): check default_path if key_path fails

Browse source
This commit is contained in:
Ashley Wulber 2024-03-08 15:08:37 -05:00 • committed by Jeremy Soller
parent 3e6f314c6b
commit 52491e08ee
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cosmic-config/src/lib.rs
View file

@ -280,14 +280,18 @@ impl ConfigGet for Config {
//TODO: check for transaction //TODO: check for transaction
fn get<T: DeserializeOwned>(&self, key: &str) -> Result<T, Error> { fn get<T: DeserializeOwned>(&self, key: &str) -> Result<T, Error> {
// If key path exists // If key path exists
let key_path = self.key_path(key)?; let key_path = self.key_path(key);
let data = if key_path.is_file() { let data = match key_path {
// Load user override Ok(key_path) if key_path.is_file() => {
fs::read_to_string(key_path).map_err(|err| Error::GetKey(key.to_string(), err))? // Load user override
} else { fs::read_to_string(key_path).map_err(|err| Error::GetKey(key.to_string(), err))?
// Load system default }
let default_path = self.default_path(key)?; _ => {
fs::read_to_string(default_path).map_err(|err| Error::GetKey(key.to_string(), err))? // Load system default
let default_path = self.default_path(key)?;
fs::read_to_string(default_path)
.map_err(|err| Error::GetKey(key.to_string(), err))?
}
}; };
let t = ron::from_str(&data)?; let t = ron::from_str(&data)?;
Ok(t) Ok(t)