replace zshrc strat with eval

Author: cxreiff

src/main.rs

@@ -1,4 +1,4 @@
-use std::fmt::Display;
+use std::{env, fmt::Display};
 
 use bevy::app::App;
 use clap::{Parser, Subcommand};
@@ -9,62 +9,52 @@ use ttysvr::{AppPlugin, SaverVariant};
 #[command(propagate_version = true)]
 struct Cli {
     #[command(subcommand)]
-    subcommand: Subcommands,
-}
+    variant: Variant,
 
-#[derive(Subcommand)]
-pub enum Subcommands {
-    Run {
-        #[command(subcommand)]
-        variant: Variant,
-    },
-    Init,
+    #[arg(short, long, global = true, name = "DELAY")]
+    init: Option<u32>,
 }
 
-#[derive(Clone, Subcommand)]
+#[derive(Subcommand)]
 pub enum Variant {
     Maze,
     Pipes,
+    Shuffle,
 }
 
 impl Display for Variant {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Variant::Maze { .. } => write!(f, "maze"),
-            Variant::Pipes { .. } => write!(f, "pipes"),
+            Variant::Maze => write!(f, "maze"),
+            Variant::Pipes => write!(f, "pipes"),
+            Variant::Shuffle => write!(f, "shuffle"),
         }
     }
 }
 
 fn main() {
-    let Cli { subcommand } = Cli::parse();
+    let Cli { variant, init } = Cli::parse();
 
-    match subcommand {
-        Subcommands::Run { variant } => {
-            let saver_variant = match variant {
-                Variant::Maze => SaverVariant::Maze,
-                Variant::Pipes => SaverVariant::Pipes,
-            };
+    let saver_variant = match variant {
+        Variant::Maze => SaverVariant::Maze,
+        Variant::Pipes => SaverVariant::Pipes,
+        Variant::Shuffle => rand::random(),
+    };
 
-            App::new().add_plugins(AppPlugin(saver_variant)).run();
-        }
-        Subcommands::Init => {
-            #[rustfmt::skip]
-            println!(
+    if let Some(delay) = init {
+        let executable = env::args().next().unwrap_or("ttysvr".into());
+
+        #[rustfmt::skip]
+        println!(
 "
-# ttysvr
-#
-# Append this command's output to .zshrc
-# e.g. `ttysaver init >> ~/.zshrc && source ~/.zshrc`
-#
-# call with `svr [variant] [seconds]`
-# e.g. `svr maze 1000` for maze screensaver after 1000 seconds.
-#
-svr() {{ TMOUT=$2; trap \"cargo run -- run $1; zle reset-prompt\" ALRM }}
-svr_off() {{ TMOUT=0 }}
-# ttysvr end
+TMOUT={delay}; trap \"{executable} {variant}; zle reset-prompt\" ALRM
+
+# WRAP THIS COMMAND IN EVAL WITH BACKTICKS (ZSH ONLY)
+# EXAMPLE: eval `ttysvr {variant} --init {delay}`
 "
-            );
-        }
-    }
+        );
+        return;
+    };
+
+    App::new().add_plugins(AppPlugin(saver_variant)).run();
 }

src/maze.rs

@@ -11,18 +11,28 @@ fn maze_setup_system(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    commands.spawn(Camera3dBundle {
-        camera: Camera {
-            target: ratatui_render.target("main").unwrap_or_default(),
+    commands
+        .spawn(Camera3dBundle {
+            camera: Camera {
+                target: ratatui_render.target("main").unwrap_or_default(),
+                ..default()
+            },
+            transform: Transform::from_xyz(0., 5., 0.).looking_at(Vec3::ZERO, Vec3::Y),
             ..default()
-        },
-        transform: Transform::from_xyz(0., 5., 0.).looking_at(Vec3::ZERO, Vec3::Y),
-        ..default()
-    });
+        })
+        .with_children(|commands| {
+            commands.spawn(PointLightBundle {
+                point_light: PointLight {
+                    intensity: 100_000.,
+                    ..default()
+                },
+                ..default()
+            });
+        });
 
     commands.spawn(PbrBundle {
         mesh: meshes.add(Cuboid::from_size(Vec3::splat(1.))),
-        material: materials.add(StandardMaterial::from_color(Color::hsl(220., 0.8, 0.5))),
+        material: materials.add(StandardMaterial::from_color(Color::hsl(0., 0.5, 0.5))),
         ..default()
     });
 }