diff --git a/src/animation/mod.rs b/src/animation/mod.rs index b03c34d..a55e56e 100644 --- a/src/animation/mod.rs +++ b/src/animation/mod.rs @@ -43,7 +43,7 @@ impl AnimationEngine { self } - pub async fn run(&self, terminal: &mut TerminalManager) -> Result<()> { + pub async fn run(&self, terminal: &mut TerminalManager) -> Result { let renderer = renderer::Renderer::new( &self.ascii_art, self.duration_ms, diff --git a/src/animation/renderer.rs b/src/animation/renderer.rs index a17a5d3..245e461 100644 --- a/src/animation/renderer.rs +++ b/src/animation/renderer.rs @@ -33,7 +33,7 @@ impl<'a> Renderer<'a> { } } - pub async fn render(&self, terminal: &mut TerminalManager) -> Result<()> { + pub async fn render(&self, terminal: &mut TerminalManager) -> Result { let mut timeline = Timeline::new(self.timeline.duration_ms(), self.timeline.fps()); timeline.start(); @@ -67,7 +67,7 @@ impl<'a> Renderer<'a> { loop { // Check for exit FIRST if should_exit.load(Ordering::Relaxed) { - break; + return Ok(true); // User requested exit } let frame_start = std::time::Instant::now(); @@ -78,7 +78,7 @@ impl<'a> Renderer<'a> { // Check again before rendering if should_exit.load(Ordering::Relaxed) { - break; + return Ok(true); // User requested exit } // Apply effect @@ -93,7 +93,7 @@ impl<'a> Renderer<'a> { // Check before terminal operations if should_exit.load(Ordering::Relaxed) { - break; + return Ok(true); // User requested exit } // Render to terminal @@ -129,12 +129,12 @@ impl<'a> Renderer<'a> { // Check if user wants to exit if should_exit.load(Ordering::Relaxed) { - break; + return Ok(true); // User requested exit } // Check if animation is complete before advancing if timeline.is_complete() { - break; + return Ok(false); // Animation completed naturally } // Advance to next frame and wait @@ -150,7 +150,7 @@ impl<'a> Renderer<'a> { while remaining > Duration::ZERO { if should_exit.load(Ordering::Relaxed) { - break; + return Ok(true); // User requested exit during sleep } let sleep_time = remaining.min(chunk_duration); sleep(sleep_time).await; @@ -158,8 +158,6 @@ impl<'a> Renderer<'a> { } } } - - Ok(()) } fn apply_colors(&self, text: &str, progress: f64) -> String { diff --git a/src/main.rs b/src/main.rs index 4bb263f..0be5802 100644 --- a/src/main.rs +++ b/src/main.rs @@ -61,8 +61,14 @@ async fn run_piglet(args: PigletCli) -> Result<()> { // Run animation loop { - animation_engine.run(&mut terminal).await?; + let user_exited = animation_engine.run(&mut terminal).await?; + // If user pressed exit key, stop looping + if user_exited { + break; + } + + // If not looping, stop after one animation if !args.loop_animation { break; }