aboutsummaryrefslogtreecommitdiff
path: root/src/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/main.rs b/src/main.rs
index 4ca3822..a791f29 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,11 +3,11 @@ mod deck;
mod gui;
mod model;
mod space_repetition;
+mod sync;
mod util;
use crate::util::event::Events;
use anyhow::Result;
-use rusqlite::Connection;
use std::path::PathBuf;
use structopt::StructOpt;
@@ -20,11 +20,14 @@ struct Opt {
fn main() -> Result<()> {
let deck_path = Opt::from_args().deck;
- let conn = db::init(db_path(&deck_path))?;
+ let mut conn = db::init(db_path(&deck_path))?;
let deck_name = deck::pp_from_path(&deck_path).unwrap_or_else(|| "Deck".to_string());
+
+ sync::run(&mut conn, &deck_path)?;
+
let mut term = gui::terminal()?;
let events = Events::new();
- match run_tui(conn, &deck_path, &deck_name, &mut term, &events) {
+ match gui::start(&conn, &mut term, &events, &deck_name) {
Ok(()) => Ok(()),
Err(msg) => {
// Show errors in TUI, otherwise they are hidden
@@ -34,17 +37,6 @@ fn main() -> Result<()> {
}
}
-fn run_tui(
- conn: Connection,
- deck_path: &str,
- deck_name: &str,
- term: &mut gui::Term,
- events: &Events,
-) -> Result<()> {
- gui::synchronize(&conn, term, &events, &deck_path, &deck_name)?;
- gui::start(&conn, term, &events, &deck_name)
-}
-
fn db_path(deck_path: &str) -> String {
let mut path = PathBuf::from(deck_path);
path.set_extension("db");