felixm/antidrift
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Ability to pause session to resolve #8

Browse Source
This commit is contained in:
felixm 2024-07-10 20:31:16 -04:00
parent 4fbd53efa5
commit 10b5511ff9
2 changed files with 79 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/constants.rs
View File

@ -1,11 +1,14 @@
pub const APP_TITLE: &str = "AntiDrift";
pub const INTENTION_TITLE: &str = "Intention";
pub const DURATION_TITLE: &str = "Duration";
pub const INTENTION_TITLE: &str = "Intention";
pub const PREVIOUS_SESSIONS_TITLE: &str = "Previous Sessions";
pub const SESSION_STATS_TITLE: &str = "Session Stats";
pub const STATUS_TITLE: &str = "Status";
pub const PROVIDE_INTENTION: &str = "Provide intention! ";
pub const PROVIDE_VALID_DURATION: &str = "Provide valid duration in minutes! ";
pub const READY_TO_START: &str = "Ready to start next session.";
pub const SESSION_IN_PROGRESS: &str = "Session In-Progress";
pub const RATE_TITLES: &str = "Press 1, 2, 3 to rate titles!";
pub const READY_TO_START: &str = "Ready to start next session.";
pub const SESSION_PAUSED: &str = "Session is paused. Unpause with 'p'.";
pub const SESSION_IN_PROGRESS: &str = "Session In-Progress";
pub const SESSION_STATS_TITLE: &str = "Session Stats";
pub const STATUS_TITLE: &str = "Status";
pub const DEFAULT_DURATION: &str = "25";
pub const PAUSED: &str = "paused";

113
src/main.rs
View File

@ -25,6 +25,7 @@ enum State {
InputIntention,
InputDuration,
InProgress,
Paused,
End,
ShouldQuit,
}
@ -96,13 +97,13 @@ impl App {
App {
state: State::InputIntention,
user_intention: String::new(),
user_duration_str: "25".to_string(),
user_duration: Duration::new(0, 0),
user_duration_str: constants::DEFAULT_DURATION.to_string(),
user_duration: Duration::ZERO,
current_window_title: window_title.into(),
current_window_time: Instant::now(),
session_start: Instant::now(),
session_stats: HashMap::new(),
session_remaining: Duration::new(0, 0),
session_remaining: Duration::ZERO,
session_ratings: Vec::new(),
session_ratings_index: 0,
session_results: Vec::new(),
@ -152,11 +153,15 @@ impl App {
self.session_remaining = self.user_duration.saturating_sub(elapsed);
update_session_stats(self);
if self.session_remaining == Duration::new(0, 0) {
if self.session_remaining.is_zero() {
self.to_end();
}
}
State::ShouldQuit => {}
State::Paused => {
window::minimize_other(&constants::APP_TITLE);
update_session_stats(self);
}
State::End => {
window::minimize_other(&constants::APP_TITLE);
}
@ -167,6 +172,10 @@ impl App {
fn tick_1s(&mut self) {
self.last_tick_1s = Instant::now();
if self.state == State::Paused {
self.user_duration = self.user_duration.saturating_add(Duration::from_secs(1));
}
}
fn timeout(&self) -> Duration {
@ -242,7 +251,7 @@ fn session_stats_as_vec(session_stats: &HashMap<Rc<String>, Duration>) -> Vec<Se
fn main() -> Result<()> {
enable_raw_mode()?;
stdout().execute(EnterAlternateScreen)?;
execute!(stdout(), SetTitle("AntiDrift"))?;
execute!(stdout(), SetTitle(constants::APP_TITLE))?;
let mut terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
let mut app = App::new();
@ -274,8 +283,8 @@ fn handle_events(app: &mut App) -> Result<()> {
app.state = State::ShouldQuit;
}
if app.state == State::InputIntention {
match key.code {
match app.state {
State::InputIntention => match key.code {
KeyCode::Enter => app.state = State::InputDuration,
KeyCode::Tab => app.state = State::InputDuration,
KeyCode::Backspace => {
@ -285,9 +294,8 @@ fn handle_events(app: &mut App) -> Result<()> {
app.user_intention.push(c);
}
_ => {}
}
} else if app.state == State::InputDuration {
match key.code {
},
State::InputDuration => match key.code {
KeyCode::Enter => app.to_in_progress(),
KeyCode::Tab => app.state = State::InputIntention,
KeyCode::Backspace => {
@ -297,12 +305,14 @@ fn handle_events(app: &mut App) -> Result<()> {
app.user_duration_str.push(c);
}
_ => {}
}
} else if app.state == State::InProgress {
match key.code {
},
State::InProgress => match key.code {
KeyCode::Char('q') => {
app.to_end();
}
KeyCode::Char('p') => {
app.state = State::Paused;
}
KeyCode::Char('a') => {
app.user_duration = app.user_duration.saturating_add(Duration::from_secs(60));
}
@ -310,31 +320,38 @@ fn handle_events(app: &mut App) -> Result<()> {
app.user_duration = app.user_duration.saturating_sub(Duration::from_secs(60));
}
_ => {}
},
State::Paused => {
if key.code == KeyCode::Char('p') {
app.state = State::InProgress;
}
}
} else if app.state == State::End {
let code = match key.code {
KeyCode::Char('1') => 1,
KeyCode::Char('2') => 2,
KeyCode::Char('3') => 3,
_ => 0,
};
if app.session_ratings_index < app.session_ratings.len() && code != 0 {
app.session_ratings[app.session_ratings_index].rating = code;
app.session_ratings_index += 1;
}
if app.session_ratings_index >= app.session_ratings.len() {
app.state = State::InputIntention;
let mut session_result = SessionResult {
intention: app.user_intention.clone(),
duration: app.session_start.elapsed(),
session_ratings: std::mem::take(&mut app.session_ratings),
rating: 0,
rating_f64: 0.0,
State::ShouldQuit => (),
State::End => {
let code = match key.code {
KeyCode::Char('1') => 1,
KeyCode::Char('2') => 2,
KeyCode::Char('3') => 3,
_ => 0,
};
session_result.rate();
app.session_results.push(session_result);
if app.session_ratings_index < app.session_ratings.len() && code != 0 {
app.session_ratings[app.session_ratings_index].rating = code;
app.session_ratings_index += 1;
}
if app.session_ratings_index >= app.session_ratings.len() {
app.state = State::InputIntention;
let mut session_result = SessionResult {
intention: app.user_intention.clone(),
duration: app.session_start.elapsed(),
session_ratings: std::mem::take(&mut app.session_ratings),
rating: 0,
rating_f64: 0.0,
};
session_result.rate();
app.session_results.push(session_result);
}
}
}
@ -342,7 +359,12 @@ fn handle_events(app: &mut App) -> Result<()> {
}
fn update_session_stats(app: &mut App) {
let window_title = window::get_title_clean().into();
let window_title = if app.state == State::Paused {
constants::PAUSED.to_string().into()
} else {
window::get_title_clean().into()
};
let delta = app.current_window_time.elapsed();
if app.current_window_title != window_title || (delta > Duration::from_secs(1)) {
let entry = app
@ -381,11 +403,14 @@ fn ui(frame: &mut Frame, app: &App) {
layout_intention,
);
let input_duration: Vec<Line> = if app.state == State::InProgress {
let s = duration_as_str(&app.session_remaining);
vec![Line::from(Span::raw(s))]
} else {
vec![Line::from(Span::raw(&app.user_duration_str))]
let input_duration: Vec<Line> = match app.state {
State::InProgress | State::Paused => {
let s = duration_as_str(&app.session_remaining);
vec![Line::from(Span::raw(s))]
}
_ => {
vec![Line::from(Span::raw(&app.user_duration_str))]
}
};
let border_type_duration = if app.state == State::InputDuration {
BorderType::Thick
@ -450,6 +475,10 @@ fn ui(frame: &mut Frame, app: &App) {
);
spans.push(span);
}
State::Paused => {
let span = Span::styled(constants::SESSION_PAUSED, Style::new().fg(Color::LightBlue));
spans.push(span);
}
State::ShouldQuit => {}
State::End => {
let span = Span::styled(constants::RATE_TITLES, Style::new().fg(Color::LightBlue));