simplify spinner and mainloop to reduce log noise (#156)

extrawurst · Jun 29, 2020 · b54e90a · b54e90a
1 parent 51d17b2
commit b54e90a
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 47 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -208,11 +208,14 @@ impl App {
     /// forward ticking to components that require it
     pub fn update(&mut self) -> Result<()> {
         log::trace!("update");
+
         self.status_tab.update()?;
         self.revlog.update()?;
         self.stashing_tab.update()?;
         self.stashlist_tab.update()?;
 
+        self.update_commands();
+
         Ok(())
     }
 
@@ -259,6 +262,7 @@ impl App {
     }
 
     ///
+    //TODO: rename
     pub const fn set_polling(&self) -> bool {
         self.set_polling
     }

diff --git a/src/main.rs b/src/main.rs
@@ -57,7 +57,7 @@ use tui::{
 };
 
 static TICK_INTERVAL: Duration = Duration::from_secs(5);
-static SPINNER_INTERVAL: Duration = Duration::from_millis(50);
+static SPINNER_INTERVAL: Duration = Duration::from_millis(80);
 
 ///
 #[derive(Clone, Copy)]
@@ -97,46 +97,46 @@ fn main() -> Result<()> {
     let ticker = tick(TICK_INTERVAL);
     let spinner_ticker = tick(SPINNER_INTERVAL);
 
-    app.update()?;
-    draw(&mut terminal, &app)?;
-
     let mut spinner = Spinner::default();
+    let mut first_update = true;
 
     loop {
-        let events: Vec<QueueEvent> = select_event(
-            &rx_input,
-            &rx_git,
-            &ticker,
-            &spinner_ticker,
-        )?;
+        let event = if first_update {
+            first_update = false;
+            QueueEvent::Tick
+        } else {
+            select_event(
+                &rx_input,
+                &rx_git,
+                &ticker,
+                &spinner_ticker,
+            )?
+        };
 
         {
+            if let QueueEvent::SpinnerUpdate = event {
+                spinner.update();
+                spinner.draw(&mut terminal)?;
+                continue;
+            }
+
             scope_time!("loop");
 
-            let mut needs_draw = true;
-
-            for e in events {
-                match e {
-                    QueueEvent::InputEvent(ev) => app.event(ev)?,
-                    QueueEvent::Tick => app.update()?,
-                    QueueEvent::GitEvent(ev) => app.update_git(ev)?,
-                    QueueEvent::SpinnerUpdate => {
-                        needs_draw = false;
-                        spinner.update()
-                    }
-                }
+            match event {
+                QueueEvent::InputEvent(ev) => app.event(ev)?,
+                QueueEvent::Tick => app.update()?,
+                QueueEvent::GitEvent(ev) => app.update_git(ev)?,
+                QueueEvent::SpinnerUpdate => unreachable!(),
             }
 
             input.set_polling(app.set_polling());
 
-            if needs_draw {
-                draw(&mut terminal, &app)?;
-            }
+            draw(&mut terminal, &app)?;
 
-            spinner.draw(
-                &mut terminal,
+            spinner.set_state(
                 app.any_work_pending() || input.is_state_changing(),
-            )?;
+            );
+            spinner.draw(&mut terminal)?;
 
             if app.is_quit() {
                 break;
@@ -184,9 +184,7 @@ fn select_event(
     rx_git: &Receiver<AsyncNotification>,
     rx_ticker: &Receiver<Instant>,
     rx_spinner: &Receiver<Instant>,
-) -> Result<Vec<QueueEvent>> {
-    let mut events: Vec<QueueEvent> = Vec::new();
-
+) -> Result<QueueEvent> {
     let mut sel = Select::new();
 
     sel.recv(rx_input);
@@ -197,23 +195,15 @@ fn select_event(
     let oper = sel.select();
     let index = oper.index();
 
-    match index {
-        0 => oper
-            .recv(rx_input)
-            .map(|input| events.push(QueueEvent::InputEvent(input))),
-        1 => oper
-            .recv(rx_git)
-            .map(|ev| events.push(QueueEvent::GitEvent(ev))),
-        2 => oper
-            .recv(rx_ticker)
-            .map(|_| events.push(QueueEvent::Tick)),
-        3 => oper
-            .recv(rx_spinner)
-            .map(|_| events.push(QueueEvent::SpinnerUpdate)),
+    let ev = match index {
+        0 => oper.recv(rx_input).map(QueueEvent::InputEvent),
+        1 => oper.recv(rx_git).map(QueueEvent::GitEvent),
+        2 => oper.recv(rx_ticker).map(|_| QueueEvent::Tick),
+        3 => oper.recv(rx_spinner).map(|_| QueueEvent::SpinnerUpdate),
         _ => return Err(anyhow!("unknown select source")),
     }?;
 
-    Ok(events)
+    Ok(ev)
 }
 
 fn start_terminal<W: Write>(

diff --git a/src/spinner.rs b/src/spinner.rs
@@ -7,6 +7,7 @@ static SPINNER_CHARS: &[char] = &['|', '/', '-', '\\'];
 #[derive(Default)]
 pub struct Spinner {
     idx: usize,
+    pending: bool,
 }
 
 impl Spinner {
@@ -16,16 +17,24 @@ impl Spinner {
         self.idx %= SPINNER_CHARS.len();
     }
 
+    ///
+    pub fn set_state(&mut self, pending: bool) {
+        self.pending = pending;
+    }
+
     /// draws or removes spinner char depending on `pending` state
     pub fn draw<B: Backend>(
         &self,
         terminal: &mut Terminal<B>,
-        pending: bool,
     ) -> io::Result<()> {
         let idx = self.idx;
 
         let c: Cell = Cell::default()
-            .set_char(if pending { SPINNER_CHARS[idx] } else { ' ' })
+            .set_char(if self.pending {
+                SPINNER_CHARS[idx]
+            } else {
+                ' '
+            })
             .clone();
         terminal
             .backend_mut()