additive/subtractive filters and date filters

1 files changed, 18 insertions, 9 deletions

diff --git a/cli/src/main.rs b/cli/src/main.rs
index d1e793d..6b8da59 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -1,7 +1,8 @@
-use chrono::{naive::NaiveDate, Duration};
+use chrono::naive::NaiveDate;
 use rust_decimal::Decimal;
 use std::path::PathBuf;
 use std::str::FromStr;
+use structopt::clap::AppSettings;
 use structopt::StructOpt;
 use tabled::{Style, Table};
 
@@ -9,7 +10,7 @@ mod search;
 mod store;
 mod transaction;
 
-use search::{Constraint, DateFilter, Search};
+use search::Search;
 use store::Store;
 use transaction::{Transaction, TransactionKind};
 
@@ -41,7 +42,10 @@ enum Command {
     List {
         target: ListTarget,
     },
-    Show,
+    #[structopt(setting = AppSettings::AllowLeadingHyphen)]
+    Show {
+        filters: Vec<String>,
+    },
 }
 
 #[derive(Debug)]
@@ -71,12 +75,11 @@ struct Mn {
 fn main() {
     let mut store = Store::open(PathBuf::from("store")).unwrap();
 
-    let search = Search::new(store.transactions());
     // let search = search.subtract(Constraint::Category("a".to_string()));
-    let search = search.subtract(Constraint::Date(DateFilter::Relative {
-        start: None,
-        end: Some(Duration::days(-2)),
-    }));
+    // let search = search.subtract(Constraint::Date(DateFilter::Relative {
+    //     start: None,
+    //     end: Some(Duration::days(-2)),
+    // }));
 
     let args = Mn::from_args();
     eprintln!("{:?}", args);
@@ -111,7 +114,13 @@ fn main() {
         } => {
             println!("{}", store.categories().join("\n"));
         }
-        Command::Show => {
+        Command::Show {
+            filters
+        } => {
+            let mut search = Search::new(store.transactions());
+            if !filters.is_empty() {
+                search = search.parse(filters.join(" "));
+            }
             let mut transactions = search.get();
             transactions.sort_by(|t1, t2| t1.date.cmp(&t2.date));
             println!("{}", Table::new(transactions).with(Style::psql()));