feat: early timebar implementation

src/clock.rs

@@ -1,31 +1,176 @@
 #![warn(clippy::pedantic, clippy::style, clippy::nursery)]
 #![allow(clippy::question_mark_used)]
-use clap::Parser;
-use libpt::cli::{args::VerbosityLevel, args::HELP_TEMPLATE, clap};
 
-use chrono::SubsecRound;
+use chrono::{DateTime, Datelike, Local, NaiveDateTime, SubsecRound, Timelike};
+use clap::Parser;
+use libpt::cli::args::HELP_TEMPLATE;
+use libpt::cli::clap::ArgGroup;
+use libpt::cli::{args::VerbosityLevel, clap};
+use libpt::log::{debug, trace};
 use ratatui::backend::CrosstermBackend;
 use ratatui::crossterm::event::{self, poll, Event, KeyCode, KeyModifiers};
 use ratatui::layout::{Alignment, Constraint, Direction, Layout, Rect};
 use ratatui::style::{Style, Stylize};
-use ratatui::widgets::{Block, Padding, Paragraph};
+use ratatui::widgets::{Block, LineGauge, Padding, Paragraph};
 use ratatui::Terminal;
 use std::io::Stdout;
-use std::time::Duration;
+use std::time::{Duration, Instant};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum TimeBarLength {
+    Minute,
+    Hour,
+    Custom(i64),
+    Day,
+}
+
+impl TimeBarLength {
+    pub(crate) const fn as_secs(self) -> i64 {
+        match self {
+            Self::Minute => 60,
+            Self::Day => 24 * 60 * 60,
+            Self::Hour => 60 * 60,
+            Self::Custom(secs) => secs,
+        }
+    }
+}
+
+impl Default for TimeBarLength {
+    fn default() -> Self {
+        TimeBarLength::Minute
+    }
+}
 
 /// Make your terminal into a big clock
-#[derive(Parser, Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Parser, Debug, Clone)]
 #[command(help_template = HELP_TEMPLATE, author, version)]
-pub struct Clock {
+#[clap(group( ArgGroup::new("timebarlen") .args(&["minute","day", "hour", "custom"]),))]
+pub(crate) struct Clock {
     #[command(flatten)]
     pub verbose: VerbosityLevel,
+    /// Show time since start
+    #[clap(short, long)]
+    pub timer: bool,
+
+    // timebar options
+    #[clap(short, long)]
+    pub minute: bool,
+    #[clap(short, long)]
+    pub day: bool,
+    #[clap(short = 'o', long)]
+    pub hour: bool,
+    #[clap(short, long)]
+    pub custom: Option<i64>,
+    #[clap(skip)]
+    last_reset: Option<DateTime<Local>>,
 }
 
 impl Clock {
+    #[must_use]
+    #[allow(clippy::missing_const_for_fn)]
+    fn timebar_len(&self) -> Option<TimeBarLength> {
+        if self.minute {
+            Some(TimeBarLength::Minute)
+        } else if self.day {
+            Some(TimeBarLength::Day)
+        } else if self.hour {
+            Some(TimeBarLength::Hour)
+        } else {
+            // this feels weird but is the same
+            self.custom.map(TimeBarLength::Custom)
+        }
+    }
+
+    fn timebar_ratio(&self) -> Option<f64> {
+        let len = self.timebar_len()?;
+        let since = (Local::now()
+            .signed_duration_since(self.last_reset.unwrap())
+            .num_seconds()
+            + 1) as f64;
+        Some((since / len.as_secs() as f64).min(1.0).max(0.0))
+    }
+
+    fn maybe_reset_since_zero(&mut self) {
+        if let Some(len) = self.timebar_len() {
+            trace!("Local Time: {}", Local::now());
+            // BUG: these resets trigger multiple times
+            match len {
+                TimeBarLength::Custom(_) => {
+                    if Local::now()
+                        .signed_duration_since(self.last_reset.unwrap())
+                        .num_seconds()
+                        == 0
+                    {
+                        self.last_reset = Some(Local::now());
+                    }
+                }
+                TimeBarLength::Minute => {
+                    if Local::now().second() == 0 {
+                        self.last_reset = Some(Local::now());
+                        debug!("reset the time of the time bar (minute)");
+                    }
+                }
+                TimeBarLength::Hour => {
+                    if Local::now().minute() == 0 {
+                        self.last_reset = Some(Local::now());
+                        debug!("reset the time of the time bar (hour)");
+                    }
+                }
+                TimeBarLength::Day => {
+                    if Local::now().hour() == 0 {
+                        self.last_reset = Some(Local::now());
+                        debug!("reset the time of the time bar (day)");
+                    }
+                }
+            }
+        }
+    }
+
+    fn setup_last_reset(&mut self) {
+        if let Some(len) = self.timebar_len() {
+            trace!("Local Time: {}", Local::now());
+            match len {
+                TimeBarLength::Custom(_) => {
+                    self.last_reset = Some(Local::now());
+                }
+                TimeBarLength::Minute => {
+                    self.last_reset = Some(
+                        Local::now()
+                            .with_second(0)
+                            .expect("tried to use a time that does not exist"),
+                    );
+                }
+                TimeBarLength::Hour => {
+                    self.last_reset = Some(
+                        Local::now()
+                            .with_minute(0)
+                            .expect("tried to use a time that does not exist"),
+                    );
+                }
+                TimeBarLength::Day => {
+                    self.last_reset = Some(
+                        Local::now()
+                            .with_hour(0)
+                            .expect("tried to use a time that does not exist"),
+                    );
+                }
+            }
+            debug!("set up initial last reset as {:#?}", self.last_reset);
+        }
+    }
+
+    fn setup(&mut self) -> anyhow::Result<()> {
+        self.setup_last_reset();
+        Ok(())
+    }
+
     pub(crate) fn run(
-        self,
+        mut self,
         terminal: &mut Terminal<CrosstermBackend<Stdout>>,
     ) -> anyhow::Result<()> {
+        let tick_rate = Duration::from_millis(100);
+        let mut last_tick = Instant::now();
+        self.setup()?;
         loop {
             let raw_time = chrono::Local::now().round_subsecs(0);
             let splits: Vec<String> = raw_time
@@ -36,60 +181,93 @@ impl Clock {
                 .collect();
             let fdate: String = splits[0].clone();
             let ftime: String = splits[1].clone();
-            terminal.draw(|frame| {
+            self.ui(terminal, ftime, fdate)?;
-                let root = frame.size();
+            let timeout = tick_rate.saturating_sub(last_tick.elapsed());
-                let space = Block::bordered()
+            if poll(timeout)? {
-                    .padding(Padding::new(
-                        root.width / 8,
-                        root.width / 8,
-                        root.height / 8,
-                        root.height / 8,
-                    ))
-                    .title(env!("CARGO_PKG_NAME"))
-                    .title_bottom(env!("CARGO_PKG_VERSION"))
-                    .title_alignment(Alignment::Center)
-                    .title_style(Style::new().bold());
-                let a = space.inner(root);
-                let parts = Self::partition(a);
-                let timew = tui_big_text::BigText::builder()
-                    .style(Style::new().red())
-                    .lines(vec![ftime.into()])
-                    .alignment(Alignment::Center)
-                    .build()
-                    .expect("could not render time widget");
-                let datew = Paragraph::new(fdate)
-                    .blue()
-                    .alignment(Alignment::Left)
-                    .block(Block::new().padding(Padding::new(
-                        parts.0.left(),
-                        parts.0.right() / 3,
-                        0,
-                        0,
-                    )));
-                frame.render_widget(space, root);
-                frame.render_widget(timew, parts.1);
-                frame.render_widget(datew, parts.0);
-            })?;
-            if poll(Duration::from_millis(100))? {
                 if let Event::Key(key) = event::read()? {
                     if key.code == KeyCode::Char('q')
                         || key.code == KeyCode::Esc
                         || (key.modifiers.contains(KeyModifiers::CONTROL)
                             && key.code == KeyCode::Char('c'))
                     {
-                        break;
+                        return Ok(());
                     }
                 }
             }
+            if last_tick.elapsed() >= tick_rate {
+                self.on_tick();
+                last_tick = Instant::now();
+            }
         }
+    }
+    fn on_tick(&mut self) {
+        self.maybe_reset_since_zero();
+    }
+    fn ui(
+        &self,
+        terminal: &mut Terminal<CrosstermBackend<Stdout>>,
+        ftime: String,
+        fdate: String,
+    ) -> anyhow::Result<()> {
+        terminal.draw(|frame| {
+            let root = frame.size();
+            let space = Block::bordered()
+                .padding(Padding::new(
+                    root.width / 8,
+                    root.width / 8,
+                    root.height / 8,
+                    root.height / 8,
+                ))
+                .title(env!("CARGO_PKG_NAME"))
+                .title_bottom(env!("CARGO_PKG_VERSION"))
+                .title_alignment(Alignment::Center)
+                .title_style(Style::new().bold());
+            let a = space.inner(root);
+            let parts = Self::partition(a);
+            let clockw = tui_big_text::BigText::builder()
+                .style(Style::new().red())
+                .lines(vec![ftime.into()])
+                .alignment(Alignment::Center)
+                .build()
+                .expect("could not render time widget");
+            let datew = Paragraph::new(fdate)
+                .blue()
+                .alignment(Alignment::Left)
+                .block(Block::new().padding(Padding::new(
+                    parts[1].left(),
+                    parts[1].right() / 3,
+                    0,
+                    0,
+                )));
+
+            frame.render_widget(space, root);
+            frame.render_widget(clockw, parts[0]);
+            frame.render_widget(datew, parts[1]);
+            if self.timebar_len().is_some() {
+                let timebarw = LineGauge::default()
+                    .block(Block::new().padding(Padding::new(
+                        parts[2].left() / 10,
+                        parts[2].right() / 6,
+                        0,
+                        0,
+                    )))
+                    .ratio(self.timebar_ratio().unwrap());
+                debug!("time bar ration: {}", self.timebar_ratio().unwrap());
+                frame.render_widget(timebarw, parts[2]);
+            }
+        })?;
         Ok(())
     }
-    fn partition(r: Rect) -> (Rect, Rect) {
+    fn partition(r: Rect) -> Vec<Rect> {
         let part = Layout::default()
             .direction(Direction::Vertical)
-            .constraints([Constraint::Percentage(13), Constraint::Min(0)])
+            .constraints([Constraint::Percentage(43), Constraint::Min(0)])
             .split(r);
+        let subparts = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Min(10), Constraint::Ratio(1, 2)])
+            .split(part[1]);
 
-        (part[0], part[1])
+        vec![part[0], subparts[0], subparts[1]]
     }
 }

src/main.rs

@@ -1,6 +1,7 @@
 use std::io;
 
 use libpt::cli::clap::Parser;
+use libpt::log::{debug, Level, Logger};
 use ratatui::backend::CrosstermBackend;
 use ratatui::crossterm::event::{DisableMouseCapture, EnableMouseCapture};
 use ratatui::crossterm::execute;
@@ -16,7 +17,19 @@ mod clock;
 fn main() -> anyhow::Result<()> {
     // setup the cli
     let clock = Clock::parse();
+    if clock.verbose.level() >= Level::DEBUG {
+        let _logger = Logger::builder()
+            .log_to_file(true)
+            .log_dir("/tmp/crock/".into())
+            .set_level(clock.verbose.level())
+            .display_time(false)
+            .build()?;
+    } else {
+        // no logger
+    }
+    debug!("set up logger");
 
+    debug!("taking over terminal");
     // setup terminal
     enable_raw_mode()?;
     let mut stdout = io::stdout();
@@ -24,8 +37,10 @@ fn main() -> anyhow::Result<()> {
     let backend = CrosstermBackend::new(stdout);
     let mut terminal = Terminal::new(backend)?;
 
+    debug!("entering clock");
     let result = clock.run(&mut terminal);
 
+    debug!("restoring terminal");
     // restore terminal
     disable_raw_mode()?;
     execute!(
@@ -35,5 +50,6 @@ fn main() -> anyhow::Result<()> {
     )?;
     terminal.show_cursor()?;
 
+    debug!("done");
     result
 }