gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not fail when attributes are unavailable

Browse Source
This commit is contained in:
Denis Benato
2026-02-01 16:55:38 +01:00
parent 8161005096
commit e512d0e2a0
1 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
asusctl/src/main.rs
View File

@@ -970,52 +970,72 @@ fn print_firmware_attr(attr: &AsusArmouryProxyBlocking) -> Result<(), Box<dyn st
let name = attr.name()?; let name = attr.name()?;
println!("{}:", <&str>::from(name)); println!("{}:", <&str>::from(name));
let attrs = attr.available_attrs()?; // Be resilient to DBus read failures: if any read fails, show "unavailable"
if attrs.contains(&"min_value".to_string()) let attrs = attr.available_attrs().unwrap_or_default();
&& attrs.contains(&"max_value".to_string())
&& attrs.contains(&"current_value".to_string()) let has_min = attrs.contains(&"min_value".to_string());
{ let has_max = attrs.contains(&"max_value".to_string());
let c = attr.current_value()?; let has_current = attrs.contains(&"current_value".to_string());
let min = attr.min_value()?; let has_possible = attrs.contains(&"possible_values".to_string());
let max = attr.max_value()?; let has_default = attrs.contains(&"default_value".to_string());
println!(" current: {min}..[{c}]..{max}");
if attrs.contains(&"default_value".to_string()) { if has_min && has_max && has_current {
println!(" default: {}\n", attr.default_value()?); let c = attr.current_value().ok();
let min = attr.min_value().ok();
let max = attr.max_value().ok();
match (min, c, max) {
(Some(min), Some(c), Some(max)) => println!(" current: {min}..[{c}]..{max}"),
_ => println!(" current: unavailable"),
}
if has_default {
match attr.default_value().ok() {
Some(d) => println!(" default: {}\n", d),
None => println!(" default: unavailable\n"),
}
} else { } else {
println!(); println!();
} }
} else if attrs.contains(&"possible_values".to_string()) } else if has_possible && has_current {
&& attrs.contains(&"current_value".to_string()) let c = attr.current_value().ok();
{ let v = attr.possible_values().ok();
let c = attr.current_value()?; if let (Some(c), Some(v)) = (c, v) {
let v = attr.possible_values()?; for p in v.iter().enumerate() {
for p in v.iter().enumerate() { if p.0 == 0 {
if p.0 == 0 { print!(" current: [");
print!(" current: ["); }
if *p.1 == c {
print!("({c})");
} else {
print!("{}", p.1);
}
if p.0 < v.len() - 1 {
print!(",");
}
if p.0 == v.len() - 1 {
print!("]");
}
} }
if *p.1 == c { if has_default {
print!("({c})"); match attr.default_value().ok() {
Some(d) => println!(" default: {}\n", d),
None => println!(" default: unavailable\n"),
}
} else { } else {
print!("{}", p.1); println!("\n");
} }
if p.0 < v.len() - 1 {
print!(",");
}
if p.0 == v.len() - 1 {
print!("]");
}
}
if attrs.contains(&"default_value".to_string()) {
println!(" default: {}\n", attr.default_value()?);
} else { } else {
println!("\n"); println!(" current: unavailable\n");
}
} else if has_current {
match attr.current_value().ok() {
Some(c) => println!(" current: {c}\n"),
None => println!(" current: unavailable\n"),
} }
} else if attrs.contains(&"current_value".to_string()) {
let c = attr.current_value()?;
println!(" current: {c}\n");
} else { } else {
println!(); println!(" unavailable\n");
} }
Ok(()) Ok(())
} }