Anime: Enabled setting builtin animations

asusctl/src/anime_cli.rs

@@ -1,20 +1,14 @@
 use gumdrop::Options;
-use rog_anime::usb::Brightness;
+use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping, Brightness};
 
 #[derive(Options)]
 pub struct AnimeCommand {
     #[options(help = "print help message")]
     pub help: bool,
-    #[options(
-        meta = "",
-        help = "enable/disable the panel LEDs (does not erase last image)"
-    )]
-    pub enable: Option<bool>,
-    #[options(
-        meta = "",
-        help = "enable/disable system animations (boot/sleep/shutdown)"
-    )]
-    pub boot_enable: Option<bool>,
+    #[options(meta = "", help = "enable/disable the display")]
+    pub enable_display: Option<bool>,
+    #[options(meta = "", help = "enable/disable the builtin run/powersave animation")]
+    pub enable_powersave_anim: Option<bool>,
     #[options(
         meta = "",
         help = "set global base brightness value <Off, Low, Med, High>"
@@ -38,6 +32,24 @@ pub enum AnimeActions {
     Gif(AnimeGif),
     #[options(help = "display an animated diagonal/pixel-perfect GIF")]
     PixelGif(AnimeGifDiagonal),
+    #[options(help = "change which builtin animations are shown")]
+    SetBuiltins(Builtins),
+}
+
+#[derive(Options)]
+pub struct Builtins {
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = " <GlitchConstruction, StaticEmergence>")]
+    pub boot: AnimBooting,
+    #[options(meta = "", help = "<BinaryBannerScroll, RogLogoGlitch>")]
+    pub awake: AnimAwake,
+    #[options(meta = "", help = "<BannerSwipe, Starfield>")]
+    pub sleep: AnimSleeping,
+    #[options(meta = "", help = "<GlitchOut, SeeYa>")]
+    pub shutdown: AnimShutdown,
+    #[options(meta = "", help = "set/apply the animations")]
+    pub set: Option<bool>,
 }
 
 #[derive(Options)]

asusctl/src/main.rs

@@ -223,8 +223,8 @@ fn handle_anime(
     cmd: &AnimeCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
     if (cmd.command.is_none()
-        && cmd.enable.is_none()
-        && cmd.boot_enable.is_none()
+        && cmd.enable_display.is_none()
+        && cmd.enable_powersave_anim.is_none()
         && cmd.brightness.is_none()
         && cmd.image_brightness.is_none()
         && !cmd.clear)
@@ -235,11 +235,11 @@ fn handle_anime(
             println!("\n{}", lst);
         }
     }
-    if let Some(anime_turn) = cmd.enable {
-        dbus.proxies().anime().set_awake_enabled(anime_turn)?;
+    if let Some(enable) = cmd.enable_display {
+        dbus.proxies().anime().set_enable_display(enable)?;
     }
-    if let Some(anime_boot) = cmd.boot_enable {
-        dbus.proxies().anime().set_animation_enabled(anime_boot)?;
+    if let Some(enable) = cmd.enable_powersave_anim {
+        dbus.proxies().anime().set_builtins_enabled(enable)?;
     }
     if let Some(bright) = cmd.brightness {
         dbus.proxies().anime().set_brightness(bright)?;
@@ -367,6 +367,23 @@ fn handle_anime(
                     }
                 }
             }
+            AnimeActions::SetBuiltins(builtins) => {
+                if builtins.help_requested() || builtins.set.is_none() {
+                    println!("\nAny unspecified args will be set to default (first shown var)\n");
+                    println!("\n{}", builtins.self_usage());
+                    if let Some(lst) = builtins.self_command_list() {
+                        println!("\n{}", lst);
+                    }
+                    return Ok(());
+                }
+
+                dbus.proxies().anime().set_builtin_animations(
+                    builtins.boot,
+                    builtins.awake,
+                    builtins.sleep,
+                    builtins.shutdown,
+                )?;
+            }
         }
     }
     Ok(())