Stevan/termato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: simplify state machine.

Browse Source
This commit is contained in:
Stevan Freeborn
2026-07-22 22:46:14 -05:00
parent 41898c1b53
commit 0a533b1757
1 changed files with 42 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+42 -64
View File
@@ -21,13 +21,12 @@ use ratatui::{
widgets::{Block, Borders, Clear, Paragraph}, widgets::{Block, Borders, Clear, Paragraph},
}; };
const SECONDS_PER_MIN: i64 = 60; const SECONDS_PER_MIN: u32 = 60;
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Eq, Clone, Copy)]
enum TimerState { enum TimerMode {
Work, Work,
Break, Break,
Paused,
} }
fn send_desktop_notification(title: &str, body: &str) { fn send_desktop_notification(title: &str, body: &str) {
@@ -44,23 +43,21 @@ fn send_desktop_notification(title: &str, body: &str) {
} }
struct Termato { struct Termato {
work_mins: i64, work_mins: u32,
break_mins: i64, break_mins: u32,
state: TimerState, mode: TimerMode,
prior_state: TimerState,
is_running: bool, is_running: bool,
duration_in_secs: i64, duration_in_secs: u32,
time_remaining_in_sec: i64, time_remaining_in_sec: u32,
show_help: bool, show_help: bool,
} }
impl Termato { impl Termato {
fn new(work_mins: i64, break_mins: i64) -> Self { fn new(work_mins: u32, break_mins: u32) -> Self {
Termato { Termato {
work_mins, work_mins,
break_mins, break_mins,
state: TimerState::Work, mode: TimerMode::Work,
prior_state: TimerState::Work,
is_running: false, is_running: false,
duration_in_secs: work_mins * SECONDS_PER_MIN, duration_in_secs: work_mins * SECONDS_PER_MIN,
time_remaining_in_sec: work_mins * SECONDS_PER_MIN, time_remaining_in_sec: work_mins * SECONDS_PER_MIN,
@@ -69,30 +66,18 @@ impl Termato {
} }
fn toggle_running(&mut self) { fn toggle_running(&mut self) {
if self.is_running { self.is_running = !self.is_running;
self.prior_state = self.state.clone();
self.state = TimerState::Paused;
self.is_running = false;
} else {
self.state = self.prior_state.clone();
self.is_running = true;
}
} }
fn toggle_mode(&mut self) { fn toggle_mode(&mut self) {
let is_on_break = self.state == TimerState::Break self.mode = match self.mode {
|| (self.state == TimerState::Paused && self.prior_state == TimerState::Break); TimerMode::Work => TimerMode::Break,
TimerMode::Break => TimerMode::Work,
if is_on_break { };
self.state = TimerState::Work; self.duration_in_secs = match self.mode {
self.prior_state = TimerState::Work; TimerMode::Work => self.work_mins * SECONDS_PER_MIN,
self.duration_in_secs = self.work_mins * SECONDS_PER_MIN; TimerMode::Break => self.break_mins * SECONDS_PER_MIN,
} else { };
self.state = TimerState::Break;
self.prior_state = TimerState::Break;
self.duration_in_secs = self.break_mins * SECONDS_PER_MIN;
}
self.time_remaining_in_sec = self.duration_in_secs; self.time_remaining_in_sec = self.duration_in_secs;
} }
@@ -101,10 +86,9 @@ impl Termato {
self.time_remaining_in_sec -= 1; self.time_remaining_in_sec -= 1;
if self.time_remaining_in_sec == 0 { if self.time_remaining_in_sec == 0 {
if self.state == TimerState::Work { match self.mode {
send_desktop_notification("Work Done", "Time to take a break."); TimerMode::Work => send_desktop_notification("Work Done", "Time to take a break."),
} else { TimerMode::Break => send_desktop_notification("Break Over", "Time to focus."),
send_desktop_notification("Break Over", "Time to focus.");
} }
self.toggle_mode(); self.toggle_mode();
@@ -114,8 +98,7 @@ impl Termato {
fn reset(&mut self) { fn reset(&mut self) {
self.is_running = false; self.is_running = false;
self.state = TimerState::Work; self.mode = TimerMode::Work;
self.prior_state = TimerState::Work;
self.duration_in_secs = self.work_mins * SECONDS_PER_MIN; self.duration_in_secs = self.work_mins * SECONDS_PER_MIN;
self.time_remaining_in_sec = self.duration_in_secs; self.time_remaining_in_sec = self.duration_in_secs;
} }
@@ -169,10 +152,13 @@ fn main() -> Result<(), io::Error> {
let seconds = termato.time_remaining_in_sec % SECONDS_PER_MIN; let seconds = termato.time_remaining_in_sec % SECONDS_PER_MIN;
let time_str = format!("{:02}:{:02}", minutes, seconds); let time_str = format!("{:02}:{:02}", minutes, seconds);
let time_color = match termato.state { let time_color = if !termato.is_running {
TimerState::Work => Color::Red, Color::Yellow
TimerState::Break => Color::Green, } else {
TimerState::Paused => Color::Yellow, match termato.mode {
TimerMode::Work => Color::Red,
TimerMode::Break => Color::Green,
}
}; };
let big_time_text = if let Some(fig) = font.convert(&time_str) { let big_time_text = if let Some(fig) = font.convert(&time_str) {
@@ -278,8 +264,7 @@ mod tests {
assert_eq!(result.work_mins, 25); assert_eq!(result.work_mins, 25);
assert_eq!(result.break_mins, 5); assert_eq!(result.break_mins, 5);
assert_eq!(result.state, TimerState::Work); assert_eq!(result.mode, TimerMode::Work);
assert_eq!(result.prior_state, TimerState::Work);
assert!(!result.is_running); assert!(!result.is_running);
assert_eq!(result.duration_in_secs, 1500); assert_eq!(result.duration_in_secs, 1500);
assert_eq!(result.time_remaining_in_sec, 1500); assert_eq!(result.time_remaining_in_sec, 1500);
@@ -323,8 +308,7 @@ mod tests {
termato.tick(); termato.tick();
assert_eq!(termato.state, TimerState::Break); assert_eq!(termato.mode, TimerMode::Break);
assert_eq!(termato.prior_state, TimerState::Break);
assert_eq!(termato.duration_in_secs, 120); assert_eq!(termato.duration_in_secs, 120);
assert_eq!(termato.time_remaining_in_sec, 120); assert_eq!(termato.time_remaining_in_sec, 120);
} }
@@ -332,28 +316,28 @@ mod tests {
#[test] #[test]
fn termato_tick_when_running_on_break_and_time_remaining_reaches_zero_it_should_toggle_to_work() { fn termato_tick_when_running_on_break_and_time_remaining_reaches_zero_it_should_toggle_to_work() {
let mut termato = Termato::new(2, 1); let mut termato = Termato::new(2, 1);
termato.state = TimerState::Break; termato.mode = TimerMode::Break;
termato.is_running = true; termato.is_running = true;
termato.time_remaining_in_sec = 1; termato.time_remaining_in_sec = 1;
termato.tick(); termato.tick();
assert_eq!(termato.state, TimerState::Work); assert_eq!(termato.mode, TimerMode::Work);
assert_eq!(termato.prior_state, TimerState::Work);
assert_eq!(termato.duration_in_secs, 120); assert_eq!(termato.duration_in_secs, 120);
assert_eq!(termato.time_remaining_in_sec, 120); assert_eq!(termato.time_remaining_in_sec, 120);
} }
#[test] #[test]
fn termato_toggle_mode_when_paused_and_previous_state_is_break_it_should_toggle_to_work() { fn termato_toggle_mode_when_called_it_should_toggle_the_mode() {
let mut termato = Termato::new(2, 1); let mut termato = Termato::new(2, 1);
termato.state = TimerState::Paused;
termato.prior_state = TimerState::Break;
termato.toggle_mode(); termato.toggle_mode();
assert_eq!(termato.mode, TimerMode::Break);
assert_eq!(termato.duration_in_secs, 60);
assert_eq!(termato.time_remaining_in_sec, 60);
assert_eq!(termato.state, TimerState::Work); termato.toggle_mode();
assert_eq!(termato.prior_state, TimerState::Work); assert_eq!(termato.mode, TimerMode::Work);
assert_eq!(termato.duration_in_secs, 120); assert_eq!(termato.duration_in_secs, 120);
assert_eq!(termato.time_remaining_in_sec, 120); assert_eq!(termato.time_remaining_in_sec, 120);
} }
@@ -365,8 +349,6 @@ mod tests {
termato.toggle_running(); termato.toggle_running();
assert_eq!(termato.state, TimerState::Paused);
assert_eq!(termato.prior_state, TimerState::Work);
assert!(!termato.is_running) assert!(!termato.is_running)
} }
@@ -376,8 +358,6 @@ mod tests {
termato.toggle_running(); termato.toggle_running();
assert_eq!(termato.state, TimerState::Work);
assert_eq!(termato.prior_state, TimerState::Work);
assert!(termato.is_running) assert!(termato.is_running)
} }
@@ -385,16 +365,14 @@ mod tests {
fn termato_rest_when_called_it_should_reset_the_apps_state() { fn termato_rest_when_called_it_should_reset_the_apps_state() {
let mut termato = Termato::new(1, 1); let mut termato = Termato::new(1, 1);
termato.is_running = true; termato.is_running = true;
termato.state = TimerState::Break; termato.mode = TimerMode::Break;
termato.prior_state = TimerState::Break;
termato.duration_in_secs = 1; termato.duration_in_secs = 1;
termato.time_remaining_in_sec = 1; termato.time_remaining_in_sec = 1;
termato.reset(); termato.reset();
assert!(!termato.is_running); assert!(!termato.is_running);
assert_eq!(termato.state, TimerState::Work); assert_eq!(termato.mode, TimerMode::Work);
assert_eq!(termato.prior_state, TimerState::Work);
assert_eq!(termato.duration_in_secs, 60); assert_eq!(termato.duration_in_secs, 60);
assert_eq!(termato.time_remaining_in_sec, 60); assert_eq!(termato.time_remaining_in_sec, 60);
} }