snow/overcast
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

VdfValue::into_vec: better error handling

Browse source
This commit is contained in:
snow flurry 2023-07-10 14:46:19 -07:00
parent 3e6d025b74
commit 0a4a401953
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main.rs
View file

@ -149,6 +149,7 @@ fn get_shortcuts(path: PathBuf) -> Result<Vec<NonSteamGame>, String> {
let vec: Result<Vec<NonSteamGame>, String> = vdf_map["shortcuts"] let vec: Result<Vec<NonSteamGame>, String> = vdf_map["shortcuts"]
.clone() .clone()
.into_vec() .into_vec()
.map_or_else(|| Err("Malformed shortcuts.vdf".to_owned()), Ok)?
.into_iter() .into_iter()
.map(|x| { .map(|x| {
if let vdf::VdfValue::Dict(dict) = x { if let vdf::VdfValue::Dict(dict) = x {

6
src/vdf.rs
View file

@ -28,12 +28,12 @@ pub enum VdfValue {
} }
impl VdfValue { impl VdfValue {
pub fn into_vec(self) -> Vec<VdfValue> { pub fn into_vec(self) -> Option<Vec<VdfValue>> {
if let VdfValue::Dict(dict) = self { if let VdfValue::Dict(dict) = self {
// lazily assuming this is an array of strings // lazily assuming this is an array of strings
dict.into_values().collect() Some(dict.into_values().collect())
} else { } else {
panic!("Not a Dict! (maybe this should be less brutal of error mgmt!)"); None
} }
} }
} }