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

Enforce valid image brightness in daemon and asusctl

Browse Source
This commit is contained in:
I Al Istannen
2022-07-16 03:00:22 +00:00
committed by Luke Jones
parent ef04549c8e
commit c0e36295b7
6 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
asusctl/src/main.rs
View File

@@ -232,7 +232,8 @@ fn handle_anime(
dbus.proxies().anime().set_boot_on_off(anime_boot)?
}
if let Some(bright) = cmd.brightness {
dbus.proxies().anime().set_brightness(bright as f32)?
verify_brightness(bright);
dbus.proxies().anime().set_brightness(bright)?
}
if let Some(action) = cmd.command.as_ref() {
let anime_type = get_anime_type()?;
@@ -245,6 +246,7 @@ fn handle_anime(
}
std::process::exit(1);
}
verify_brightness(image.bright);
let matrix = AnimeImage::from_png(
Path::new(&image.path),
@@ -267,6 +269,7 @@ fn handle_anime(
}
std::process::exit(1);
}
verify_brightness(image.bright);
let matrix = AnimeDiagonal::from_png(
Path::new(&image.path),
@@ -287,6 +290,7 @@ fn handle_anime(
}
std::process::exit(1);
}
verify_brightness(gif.bright);
let matrix = AnimeGif::from_gif(
Path::new(&gif.path),
@@ -320,6 +324,7 @@ fn handle_anime(
}
std::process::exit(1);
}
verify_brightness(gif.bright);
let matrix = AnimeGif::from_diagonal_gif(
Path::new(&gif.path),
@@ -347,6 +352,16 @@ fn handle_anime(
Ok(())
}
fn verify_brightness(brightness: f32) {
if brightness < 0.0 || brightness > 1.0 {
println!(
"Image and global brightness must be between 0.0 and 1.0 (inclusive), was {}",
brightness
);
std::process::exit(1);
}
}
fn handle_led_mode(
dbus: &RogDbusClientBlocking,
supported: &LedSupportedFunctions,