Reenable basic cli interaction

src/cli.rs

@@ -6,19 +6,19 @@ use chrono::{NaiveDate, NaiveDateTime};
 use directories::ProjectDirs;
 use structopt::StructOpt;
 
-use crate::eval::{DateRange, Entry, EntryMode, SourceInfo};
+// use crate::eval::{DateRange, Entry, EntryMode, SourceInfo};
 use crate::files::arguments::Range;
 use crate::files::{self, Files};
 
-use self::error::Result;
+// use self::error::Result;
-use self::layout::line::LineLayout;
+// use self::layout::line::LineLayout;
 
-mod cancel;
+// mod cancel;
-mod done;
+// mod done;
-mod error;
+// mod error;
-mod layout;
+// mod layout;
-mod print;
+// mod print;
-mod show;
+// mod show;
 
 #[derive(Debug, StructOpt)]
 pub struct Opt {
@@ -67,11 +67,13 @@ fn default_file() -> PathBuf {
         .join("main.today")
 }
 
-fn load_files(opt: &Opt) -> result::Result<Files, files::Error> {
+fn load_files(opt: &Opt, files: &mut Files) -> result::Result<(), files::Error> {
     let file = opt.file.clone().unwrap_or_else(default_file);
-    Files::load(&file)
+    files.load(&file)
 }
 
+/*
+
 fn find_now(opt: &Opt, files: &Files) -> NaiveDateTime {
     let now = files.now().naive_local();
     if let Some(date) = opt.date {
@@ -127,16 +129,18 @@ fn run_command(opt: &Opt, files: &mut Files, range: DateRange, now: NaiveDateTim
     Ok(())
 }
 
+*/
+
 pub fn run() {
     let opt = Opt::from_args();
 
-    let mut files = match load_files(&opt) {
+    let mut files = Files::new();
-        Ok(result) => result,
+    if let Err(e) = load_files(&opt, &mut files) {
-        Err(e) => {
+        e.print(&files);
-            e.print();
         process::exit(1);
     }
-    };
+
+    /*
 
     let now = find_now(&opt, &files);
 
@@ -164,8 +168,10 @@ pub fn run() {
         process::exit(1);
     }
 
+    */
+
     if let Err(e) = files.save() {
-        e.print();
+        e.print(&files);
         process::exit(1);
     }
 }

src/main.rs

@@ -3,10 +3,10 @@
 #![warn(clippy::all)]
 #![warn(clippy::use_self)]
 
-// mod cli;
+mod cli;
 // mod eval;
 mod files;
 
 fn main() {
-    // cli::run();
+    cli::run();
 }