1 files changed, 45 insertions, 25 deletions

diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index 358e4b5..3abe238 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -2,34 +2,59 @@ pub mod message;
 pub mod question;
 pub mod util;
 
-use crate::{db, space_repetition, util::event::Events, util::time};
+use crate::sync;
+use crate::{db, space_repetition, util::time};
 use anyhow::Result;
+use crossterm::terminal;
 use rusqlite::Connection;
-use std::io;
-use termion::{raw::IntoRawMode, raw::RawTerminal, screen::AlternateScreen};
-use tui::{backend::TermionBackend, Terminal};
+use std::fs;
+use std::io::Stdout;
+use tui::{backend::CrosstermBackend, Terminal};
 
-pub type Term = Terminal<TermionBackend<AlternateScreen<RawTerminal<io::Stdout>>>>;
+pub type Term = Terminal<CrosstermBackend<Stdout>>;
 
-pub fn terminal() -> Result<Term> {
-    let stdout = io::stdout().into_raw_mode()?;
-    let stdout = AlternateScreen::from(stdout);
-    let backend = TermionBackend::new(stdout);
+pub fn setup_terminal() -> Result<Term> {
+    terminal::enable_raw_mode()?;
+    let mut stdout = std::io::stdout();
+    crossterm::execute!(stdout, terminal::EnterAlternateScreen)?;
+    let backend = CrosstermBackend::new(stdout);
     Ok(Terminal::new(backend)?)
 }
 
-pub fn start(conn: &Connection, term: &mut Term, events: &Events, deck_name: &str) -> Result<()> {
-    let mut answers = 0;
+pub fn restore_terminal(term: &mut Term) -> Result<()> {
+    terminal::disable_raw_mode()?;
+    crossterm::execute!(term.backend_mut(), terminal::LeaveAlternateScreen)?;
+    term.show_cursor()?;
+    Ok(())
+}
 
+pub fn start(
+    conn: &mut Connection,
+    term: &mut Term,
+    deck_path: &str,
+    deck_name: &str,
+    mut deck_last_sync: u64,
+    hide_remaining: bool,
+) -> Result<()> {
     loop {
-        let now = time::seconds_since_unix_epoch()?;
-        let title = title(deck_name, answers, db::count_available(conn).unwrap_or(0));
+        // Synchronize deck if necessary
+        let deck_last_update =
+            time::seconds_since_unix_epoch_of(fs::metadata(deck_path)?.modified()?)?;
+        if deck_last_update > deck_last_sync {
+            sync::run(conn, deck_path)?;
+            deck_last_sync = time::seconds_since_unix_epoch()?;
+        }
+
+        let title = title(
+            deck_name,
+            db::count_available(conn).unwrap_or(0),
+            hide_remaining,
+        );
 
         match db::pick_random_ready(conn) {
-            Some(card) => match question::ask(term, events, &title, &card)? {
+            Some(card) => match question::ask(term, &title, &card)? {
                 question::Response::Aborted => break,
                 question::Response::Answered { difficulty } => {
-                    answers += 1;
                     db::update(
                         conn,
                         &card.question,
@@ -40,12 +65,13 @@ pub fn start(conn: &Connection, term: &mut Term, events: &Events, deck_name: &st
             None => {
                 let message = match db::next_ready(conn) {
                     Some(ready) => {
+                        let now = time::seconds_since_unix_epoch()?;
                         let duration = time::pp_duration(ready - now);
                         format!("Prochaine carte disponible dans {duration}.")
                     }
                     None => "Aucune carte n’est disponible. Votre deck est-il vide ?".to_string(),
                 };
-                let _ = message::show(term, events, &title, &message, true);
+                let _ = message::show(term, &title, &message, true);
                 break;
             }
         }
@@ -54,16 +80,10 @@ pub fn start(conn: &Connection, term: &mut Term, events: &Events, deck_name: &st
     Ok(())
 }
 
-fn title(deck_name: &str, answers: i32, available_cards: i32) -> String {
-    if answers == 0 && available_cards == 0 {
+fn title(deck_name: &str, available_cards: i32, hide_remaining: bool) -> String {
+    if available_cards == 0 || hide_remaining {
         deck_name.to_string()
-    } else if available_cards == 0 {
-        let from = answers;
-        let to = answers + available_cards;
-        format!("{deck_name} ({from} / {to})")
     } else {
-        let from = answers + 1;
-        let to = answers + available_cards;
-        format!("{deck_name} ({from} / {to})")
+        format!("{deck_name} ({available_cards})")
     }
 }