sin_serhao/timr-tui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: initial values via args

Browse Source
This commit is contained in:
jk 2024-12-26 20:03:55 +01:00
parent ca81094a36
commit 3ea715f83b
No known key found for this signature in database
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app.rs
View File

@ -82,11 +82,14 @@ impl From<(Args, AppStorage)> for AppArgs {
style: args.style.unwrap_or(stg.style), style: args.style.unwrap_or(stg.style),
pomodoro_mode: stg.pomodoro_mode, pomodoro_mode: stg.pomodoro_mode,
initial_value_work: args.work.unwrap_or(stg.inital_value_work), initial_value_work: args.work.unwrap_or(stg.inital_value_work),
current_value_work: stg.current_value_work, // invalidate `current_value_work` if an initial value is set via args
initial_value_pause: args.pause, current_value_work: args.work.unwrap_or(stg.current_value_work),
current_value_pause: stg.current_value_pause, initial_value_pause: args.pause.unwrap_or(stg.inital_value_pause),
initial_value_countdown: args.countdown, // invalidate `current_value_pause` if an initial value is set via args
current_value_countdown: stg.current_value_countdown, current_value_pause: args.pause.unwrap_or(stg.current_value_pause),
initial_value_countdown: args.countdown.unwrap_or(stg.inital_value_countdown),
// invalidate `current_value_countdown` if an initial value is set via args
current_value_countdown: args.countdown.unwrap_or(stg.current_value_countdown),
current_value_timer: stg.current_value_timer, current_value_timer: stg.current_value_timer,
} }
} }

6
src/args.rs
View File

@ -10,10 +10,9 @@ use crate::{app::Content, widgets::clock::Style};
#[derive(Parser)] #[derive(Parser)]
pub struct Args { pub struct Args {
#[arg(long, short, value_parser = parse_duration, #[arg(long, short, value_parser = parse_duration,
default_value="10:00" /* 10min */,
help = "Countdown time to start from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'" help = "Countdown time to start from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'"
)] )]
pub countdown: Duration, pub countdown: Option<Duration>,
#[arg(long, short, value_parser = parse_duration, #[arg(long, short, value_parser = parse_duration,
help = "Work time to count down from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'" help = "Work time to count down from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'"
@ -21,10 +20,9 @@ pub struct Args {
pub work: Option<Duration>, pub work: Option<Duration>,
#[arg(long, short, value_parser = parse_duration, #[arg(long, short, value_parser = parse_duration,
default_value="5:00" /* 5min */,
help = "Pause time to count down from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'" help = "Pause time to count down from. Formats: 'ss', 'mm:ss', or 'hh:mm:ss'"
)] )]
pub pause: Duration, pub pause: Option<Duration>,
#[arg(long, short = 'd', help = "Whether to show deciseconds or not.")] #[arg(long, short = 'd', help = "Whether to show deciseconds or not.")]
pub decis: bool, pub decis: bool,

4
src/main.rs
View File

@ -12,7 +12,7 @@ mod terminal;
mod utils; mod utils;
mod widgets; mod widgets;
use app::App; use app::{App, AppArgs};
use args::Args; use args::Args;
use clap::Parser; use clap::Parser;
use color_eyre::Result; use color_eyre::Result;
@ -43,7 +43,7 @@ async fn main() -> Result<()> {
}; };
// merge `Args` and `AppStorage`. // merge `Args` and `AppStorage`.
let app_args = (args, stg).into(); let app_args: AppArgs = (args, stg).into();
let app_storage = App::new(app_args).run(terminal, events).await?.to_storage(); let app_storage = App::new(app_args).run(terminal, events).await?.to_storage();
// store app state persistantly // store app state persistantly
storage.save(app_storage)?; storage.save(app_storage)?;