leyoda/dbus-settings-bindings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: zbus 4.2.1 update

Browse source
This commit is contained in:
Ashley Wulber 2024-05-16 15:24:53 -04:00 • committed by GitHub
parent ce9c789fe6
commit f05789c4ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
42 changed files with 390 additions and 389 deletions
Download patch file Download diff file Expand all files Collapse all files

32
mpris2/src/metadata.rs
View file

@ -448,27 +448,27 @@ impl MetadataValue {
impl<'a> From<&ZValue<'a>> for MetadataValue {
fn from(value: &ZValue) -> Self {
match value {
ZValue::U8(u) => Self::UInt(*u as u64),
ZValue::Bool(b) => Self::Bool(*b),
ZValue::I16(i) => Self::Int(*i as i64),
ZValue::U16(u) => Self::UInt(*u as u64),
ZValue::I32(i) => Self::Int(*i as i64),
ZValue::U32(u) => Self::UInt(*u as u64),
ZValue::I64(i) => Self::Int(*i),
ZValue::U64(u) => Self::UInt(*u),
ZValue::F64(f) => Self::Double(*f),
ZValue::Str(s) => Self::Str(s.to_string()),
ZValue::ObjectPath(path) => Self::Str(path.to_string()),
ZValue::Array(a) => Self::Array(a.iter().map(|v| v.into()).collect()),
ZValue::Dict(d) => Self::Dict(
HashMap::<String, ZValue>::try_from(d.to_owned())
match value.try_clone() {
Ok(ZValue::U8(u)) => Self::UInt(u as u64),
Ok(ZValue::Bool(b)) => Self::Bool(b),
Ok(ZValue::I16(i)) => Self::Int(i as i64),
Ok(ZValue::U16(u)) => Self::UInt(u as u64),
Ok(ZValue::I32(i)) => Self::Int(i as i64),
Ok(ZValue::U32(u)) => Self::UInt(u as u64),
Ok(ZValue::I64(i)) => Self::Int(i),
Ok(ZValue::U64(u)) => Self::UInt(u),
Ok(ZValue::F64(f)) => Self::Double(f),
Ok(ZValue::Str(s)) => Self::Str(s.to_string()),
Ok(ZValue::ObjectPath(path)) => Self::Str(path.to_string()),
Ok(ZValue::Array(a)) => Self::Array(a.iter().map(|v| v.into()).collect()),
Ok(ZValue::Dict(d)) => Self::Dict(
HashMap::<String, ZValue>::try_from(d)
.unwrap()
.into_iter()
.map(|(k, v)| (k, (&v).into()))
.collect(),
),
ZValue::Value(value) => Self::from(&**value),
Ok(ZValue::Value(value)) => Self::from(&*value),
_ => Self::__Unsupported,
}
}