2021-07-07 11:58:13 -05:00
|
|
|
use std::convert::TryFrom;
|
2021-08-25 14:30:27 -05:00
|
|
|
use std::io::{BufRead, Write};
|
2021-07-07 11:58:13 -05:00
|
|
|
|
|
|
|
use clap::ArgMatches;
|
2021-08-25 14:30:27 -05:00
|
|
|
use chrono::{Utc, Local, Duration};
|
2021-07-07 11:58:13 -05:00
|
|
|
use regex::Regex;
|
|
|
|
|
|
|
|
use crate::error::{Result, Error};
|
|
|
|
use crate::database::Database;
|
|
|
|
use crate::formatters::Formatter;
|
|
|
|
use crate::regex::parse_regex;
|
2021-08-25 14:30:27 -05:00
|
|
|
use crate::io::Streams;
|
2021-07-07 11:58:13 -05:00
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
use super::{Command, Facts, display::{Sheet, entries_for_display}};
|
2021-07-07 11:58:13 -05:00
|
|
|
|
|
|
|
#[derive(Default)]
|
|
|
|
pub struct Args {
|
|
|
|
ids: bool,
|
2021-08-19 20:50:34 -05:00
|
|
|
format: Option<Formatter>,
|
2021-07-07 11:58:13 -05:00
|
|
|
grep: Option<Regex>,
|
|
|
|
sheet: Option<Sheet>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> TryFrom<&'a ArgMatches<'a>> for Args {
|
|
|
|
type Error = Error;
|
|
|
|
|
|
|
|
fn try_from(matches: &'a ArgMatches) -> Result<Args> {
|
|
|
|
Ok(Args {
|
|
|
|
ids: matches.is_present("ids"),
|
2021-08-19 20:50:34 -05:00
|
|
|
format: matches.value_of("format").map(|v| v.parse()).transpose()?,
|
2021-07-07 11:58:13 -05:00
|
|
|
grep: matches.value_of("grep").map(parse_regex).transpose()?,
|
|
|
|
sheet: matches.value_of("sheet").map(|s| s.parse()).transpose()?,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct YesterdayCommand { }
|
|
|
|
|
|
|
|
impl<'a> Command<'a> for YesterdayCommand {
|
|
|
|
type Args = Args;
|
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
fn handle<D, I, O, E>(args: Self::Args, streams: &mut Streams<D, I, O, E>, facts: &Facts) -> Result<()>
|
2021-07-07 11:58:13 -05:00
|
|
|
where
|
|
|
|
D: Database,
|
2021-08-25 14:30:27 -05:00
|
|
|
I: BufRead,
|
2021-07-07 11:58:13 -05:00
|
|
|
O: Write,
|
|
|
|
E: Write,
|
|
|
|
{
|
2021-08-25 14:30:27 -05:00
|
|
|
let today = facts.now.with_timezone(&Local).date();
|
2021-07-16 12:45:27 -05:00
|
|
|
let start = Some((today - Duration::days(1)).and_hms(0, 0, 0).with_timezone(&Utc));
|
|
|
|
let end = Some(today.and_hms(0, 0, 0).with_timezone(&Utc));
|
2021-07-07 11:58:13 -05:00
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
entries_for_display(
|
|
|
|
start,
|
|
|
|
end,
|
|
|
|
args.sheet,
|
|
|
|
streams,
|
|
|
|
args.format.unwrap_or_else(|| facts.config.default_formatter.clone()),
|
|
|
|
args.ids,
|
|
|
|
args.grep,
|
|
|
|
facts
|
|
|
|
)
|
2021-07-07 11:58:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2021-08-19 20:50:34 -05:00
|
|
|
use chrono::{Duration, TimeZone};
|
2021-07-07 11:58:13 -05:00
|
|
|
use pretty_assertions::assert_eq;
|
|
|
|
|
2021-08-03 20:56:40 -05:00
|
|
|
use crate::test_utils::Ps;
|
2021-08-25 14:30:27 -05:00
|
|
|
use crate::config::Config;
|
2021-07-07 11:58:13 -05:00
|
|
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn returns_yesterday_entries_only() {
|
|
|
|
let args = Args {
|
2021-08-19 20:50:34 -05:00
|
|
|
format: Some(Formatter::Csv),
|
2021-07-07 11:58:13 -05:00
|
|
|
..Default::default()
|
|
|
|
};
|
2021-08-25 14:30:27 -05:00
|
|
|
let mut streams = Streams::fake(b"");
|
2021-07-07 11:58:13 -05:00
|
|
|
let two_days_ago = Local::now().date() - Duration::days(2);
|
|
|
|
let yesterday = Local::now().date() - Duration::days(1);
|
|
|
|
let today = Local::now().date();
|
2021-08-25 14:30:27 -05:00
|
|
|
let facts = Facts::new();
|
2021-07-07 11:58:13 -05:00
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
streams.db.entry_insert(two_days_ago.and_hms(1, 2, 3).with_timezone(&Utc), None, None, "default".into()).unwrap();
|
|
|
|
streams.db.entry_insert(yesterday.and_hms(1, 2, 3).with_timezone(&Utc), None, Some("This!".into()), "default".into()).unwrap();
|
|
|
|
streams.db.entry_insert(today.and_hms(1, 2, 3).with_timezone(&Utc), None, None, "default".into()).unwrap();
|
2021-07-07 11:58:13 -05:00
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
YesterdayCommand::handle(args, &mut streams, &facts).unwrap();
|
2021-07-07 11:58:13 -05:00
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
assert_eq!(Ps(&String::from_utf8_lossy(&streams.out)), Ps(&format!("start,end,note,sheet
|
2021-07-07 11:58:13 -05:00
|
|
|
{},,This!,default
|
2021-08-11 17:54:37 -05:00
|
|
|
", yesterday.and_hms(1, 2, 3).with_timezone(&Utc).to_rfc3339_opts(chrono::SecondsFormat::Micros, true))));
|
2021-07-07 11:58:13 -05:00
|
|
|
|
|
|
|
assert_eq!(
|
2021-08-25 14:30:27 -05:00
|
|
|
String::from_utf8_lossy(&streams.err),
|
2021-07-07 11:58:13 -05:00
|
|
|
String::new(),
|
|
|
|
);
|
|
|
|
}
|
2021-08-19 20:50:34 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn respect_default_formatter() {
|
|
|
|
std::env::set_var("TZ", "CST+6");
|
|
|
|
|
|
|
|
let args = Default::default();
|
2021-08-25 14:30:27 -05:00
|
|
|
let mut streams = Streams::fake(b"");
|
|
|
|
let now = Utc.ymd(2021, 7, 1).and_hms(10, 0, 0);
|
|
|
|
let facts = Facts::new().with_config(Config {
|
2021-08-19 20:50:34 -05:00
|
|
|
default_formatter: Formatter::Ids,
|
|
|
|
..Default::default()
|
2021-08-25 14:30:27 -05:00
|
|
|
}).with_now(now);
|
2021-08-19 20:50:34 -05:00
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap();
|
|
|
|
streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default".into()).unwrap();
|
2021-08-19 20:50:34 -05:00
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
YesterdayCommand::handle(args, &mut streams, &facts).unwrap();
|
2021-08-19 20:50:34 -05:00
|
|
|
|
2021-08-25 14:30:27 -05:00
|
|
|
assert_eq!(&String::from_utf8_lossy(&streams.out), "1 2\n");
|
|
|
|
assert_eq!(String::from_utf8_lossy(&streams.err), "");
|
2021-08-19 20:50:34 -05:00
|
|
|
}
|
2021-07-07 11:58:13 -05:00
|
|
|
}
|