mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git
synced 2024-12-23 08:36:31 +00:00
gstreamer: Add StructureRef::get_optional()
This only returns Err on type mismatches. If the field does not exist or None it returns None, otherwise the value. StructureRef::get() returns Err also if the field does not exist.
This commit is contained in:
parent
39ef834cfe
commit
2829c7ee2f
1 changed files with 18 additions and 0 deletions
|
@ -387,6 +387,20 @@ impl StructureRef {
|
||||||
.map_err(|err| GetError::from_value_get_error(name, err))
|
.map_err(|err| GetError::from_value_get_error(name, err))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_optional<'structure, 'name, T: FromValueOptional<'structure>>(
|
||||||
|
&'structure self,
|
||||||
|
name: &'name str,
|
||||||
|
) -> Result<Option<T>, GetError<'name>> {
|
||||||
|
let value = self.get_value(name);
|
||||||
|
if let Ok(value) = value {
|
||||||
|
value
|
||||||
|
.get()
|
||||||
|
.map_err(|err| GetError::from_value_get_error(name, err))
|
||||||
|
} else {
|
||||||
|
Ok(None)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_some<'structure, 'name, T: FromValue<'structure>>(
|
pub fn get_some<'structure, 'name, T: FromValue<'structure>>(
|
||||||
&'structure self,
|
&'structure self,
|
||||||
name: &'name str,
|
name: &'name str,
|
||||||
|
@ -751,6 +765,10 @@ mod tests {
|
||||||
assert_eq!(s.get::<&str>("f1"), Ok(Some("abc")));
|
assert_eq!(s.get::<&str>("f1"), Ok(Some("abc")));
|
||||||
assert_eq!(s.get::<&str>("f2"), Ok(Some("bcd")));
|
assert_eq!(s.get::<&str>("f2"), Ok(Some("bcd")));
|
||||||
assert_eq!(s.get_some::<i32>("f3"), Ok(123i32));
|
assert_eq!(s.get_some::<i32>("f3"), Ok(123i32));
|
||||||
|
assert_eq!(s.get_optional::<&str>("f1"), Ok(Some("abc")));
|
||||||
|
assert_eq!(s.get_optional::<&str>("f4"), Ok(None));
|
||||||
|
assert_eq!(s.get_optional::<i32>("f3"), Ok(Some(123i32)));
|
||||||
|
assert_eq!(s.get_optional::<i32>("f4"), Ok(None));
|
||||||
|
|
||||||
// FIXME: use a proper `assert_eq!`, but that requires
|
// FIXME: use a proper `assert_eq!`, but that requires
|
||||||
// `glib::value::GetError fields to be public
|
// `glib::value::GetError fields to be public
|
||||||
|
|
Loading…
Reference in a new issue