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

Merge 00f7580012 into 0fc4638af3

Browse source
This commit is contained in:
Ian Douglas Scott 2026-04-16 08:58:06 +07:00 • committed by GitHub
commit 58e3d81b4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -357,23 +357,22 @@ impl ConfigGet for Config {
fn get<T: DeserializeOwned>(&self, key: &str) -> Result<T, Error> {
match self.get_local(key) {
Ok(value) => Ok(value),
Err(Error::NotFound) => self.get_system_default(key),
Err(Error::NoConfigDirectory | Error::NotFound) => self.get_system_default(key),
Err(why) => Err(why),
}
}
fn get_local<T: DeserializeOwned>(&self, key: &str) -> Result<T, Error> {
// If key path exists
match self.key_path(key) {
Ok(key_path) if key_path.is_file() => {
// Load user override
let data = fs::read_to_string(key_path)
.map_err(|err| Error::GetKey(key.to_string(), err))?;
let key_path = self.key_path(key)?;
if key_path.is_file() {
// Load user override
let data =
fs::read_to_string(key_path).map_err(|err| Error::GetKey(key.to_string(), err))?;
Ok(ron::from_str(&data)?)
}
_ => Err(Error::NotFound),
Ok(ron::from_str(&data)?)
} else {
Err(Error::NotFound)
}
}