2021-06-18 11:27:19 -05:00
|
|
|
use std::convert::TryFrom;
|
|
|
|
use std::io::Write;
|
|
|
|
|
|
|
|
use clap::ArgMatches;
|
2021-07-06 22:52:20 -05:00
|
|
|
use chrono::{DateTime, Utc};
|
2021-06-18 11:27:19 -05:00
|
|
|
|
2021-06-21 17:38:51 -05:00
|
|
|
use crate::error;
|
2021-07-06 22:52:20 -05:00
|
|
|
use crate::database::Database;
|
2021-06-21 17:38:51 -05:00
|
|
|
use crate::formatters::Formatter;
|
|
|
|
use crate::config::Config;
|
2021-07-01 23:42:59 -05:00
|
|
|
use crate::timeparse::parse_time;
|
2021-06-18 11:27:19 -05:00
|
|
|
|
2021-07-06 22:52:20 -05:00
|
|
|
use super::{Command, Sheet, entries_for_display};
|
2021-06-21 19:54:10 -05:00
|
|
|
|
2021-06-29 12:04:54 -05:00
|
|
|
#[derive(Default)]
|
2021-06-18 11:27:19 -05:00
|
|
|
pub struct Args {
|
2021-06-21 17:38:51 -05:00
|
|
|
ids: bool,
|
2021-06-24 00:07:52 -05:00
|
|
|
start: Option<DateTime<Utc>>,
|
|
|
|
end: Option<DateTime<Utc>>,
|
2021-06-21 17:38:51 -05:00
|
|
|
format: Formatter,
|
|
|
|
grep: Option<String>,
|
2021-06-21 19:54:10 -05:00
|
|
|
sheet: Option<Sheet>,
|
2021-06-18 11:27:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> TryFrom<&'a ArgMatches<'a>> for Args {
|
|
|
|
type Error = error::Error;
|
|
|
|
|
|
|
|
fn try_from(matches: &'a ArgMatches) -> error::Result<Args> {
|
2021-06-21 17:38:51 -05:00
|
|
|
Ok(Args {
|
|
|
|
ids: matches.is_present("ids"),
|
2021-07-01 23:42:59 -05:00
|
|
|
start: matches.value_of("start").map(|s| parse_time(s)).transpose()?,
|
|
|
|
end: matches.value_of("end").map(|s| parse_time(s)).transpose()?,
|
2021-06-21 17:38:51 -05:00
|
|
|
format: matches.value_of("format").unwrap().parse()?,
|
|
|
|
grep: matches.value_of("grep").map(|s| s.into()),
|
2021-06-21 19:54:10 -05:00
|
|
|
sheet: matches.value_of("sheet").map(|s| s.parse()).transpose()?,
|
2021-06-21 17:38:51 -05:00
|
|
|
})
|
2021-06-18 11:27:19 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-29 18:20:51 -05:00
|
|
|
pub struct DisplayCommand { }
|
2021-06-18 11:27:19 -05:00
|
|
|
|
|
|
|
impl<'a> Command<'a> for DisplayCommand {
|
|
|
|
type Args = Args;
|
|
|
|
|
2021-06-30 19:20:10 -05:00
|
|
|
fn handle<D, O, E>(args: Self::Args, db: &mut D, out: &mut O, err: &mut E, _config: &Config) -> error::Result<()>
|
2021-06-18 11:27:19 -05:00
|
|
|
where
|
|
|
|
D: Database,
|
2021-06-29 12:02:33 -05:00
|
|
|
O: Write,
|
|
|
|
E: Write,
|
2021-06-18 11:27:19 -05:00
|
|
|
{
|
2021-07-06 22:52:20 -05:00
|
|
|
entries_for_display(args.start, args.end, args.sheet, db, out, err, args.format, args.ids)
|
2021-06-18 11:27:19 -05:00
|
|
|
}
|
|
|
|
}
|
2021-06-29 12:04:54 -05:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2021-07-06 22:52:20 -05:00
|
|
|
use chrono::TimeZone;
|
|
|
|
use ansi_term::Color::Yellow;
|
2021-06-29 12:04:54 -05:00
|
|
|
|
|
|
|
use crate::database::SqliteDatabase;
|
|
|
|
use crate::test_utils::PrettyString;
|
|
|
|
|
2021-07-06 22:52:20 -05:00
|
|
|
use super::*;
|
|
|
|
|
2021-06-29 12:04:54 -05:00
|
|
|
#[test]
|
|
|
|
fn display_as_local_time_if_previous_version() {
|
|
|
|
let args = Default::default();
|
|
|
|
let mut db = SqliteDatabase::from_path("assets/test_old_db.db").unwrap();
|
|
|
|
let mut out = Vec::new();
|
|
|
|
let mut err = Vec::new();
|
|
|
|
let config = Default::default();
|
2021-06-30 19:20:10 -05:00
|
|
|
std::env::set_var("TZ", "UTC");
|
2021-06-29 12:04:54 -05:00
|
|
|
|
|
|
|
DisplayCommand::handle(args, &mut db, &mut out, &mut err, &config).unwrap();
|
|
|
|
|
|
|
|
assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("Timesheet: default
|
|
|
|
Day Start End Duration Notes
|
|
|
|
Tue Jun 29, 2021 06:26:49 - 07:26:52 1:00:03 lets do some rust
|
|
|
|
1:00:03
|
2021-06-29 18:20:51 -05:00
|
|
|
-------------------------------------------------------------------
|
2021-06-29 12:04:54 -05:00
|
|
|
Total 1:00:03
|
|
|
|
"));
|
|
|
|
|
|
|
|
assert_eq!(
|
2021-06-29 18:20:51 -05:00
|
|
|
String::from_utf8_lossy(&err),
|
|
|
|
format!("{} You are using the old timetrap format, it is advised that you update your database using t migrate\n", Yellow.bold().paint("[WARNING]")),
|
2021-06-29 12:04:54 -05:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2021-06-30 13:31:38 -05:00
|
|
|
#[ignore]
|
2021-06-29 12:04:54 -05:00
|
|
|
fn correctly_use_utc_if_new_version() {
|
|
|
|
assert!(false, "start with a newly created database");
|
|
|
|
assert!(false, "correctly display times in local timezone");
|
|
|
|
}
|
2021-06-30 19:20:10 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn filter_by_start() {
|
|
|
|
let args = Args {
|
|
|
|
format: Formatter::Csv,
|
|
|
|
start: Some(Utc.ymd(2021, 6, 30).and_hms(10, 5, 0)),
|
|
|
|
..Default::default()
|
|
|
|
};
|
|
|
|
let mut db = SqliteDatabase::from_memory().unwrap();
|
|
|
|
let mut out = Vec::new();
|
|
|
|
let mut err = Vec::new();
|
|
|
|
let config = Default::default();
|
|
|
|
|
|
|
|
db.init().unwrap();
|
|
|
|
|
|
|
|
db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap();
|
|
|
|
db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default".into()).unwrap();
|
|
|
|
|
|
|
|
DisplayCommand::handle(args, &mut db, &mut out, &mut err, &config).unwrap();
|
|
|
|
|
|
|
|
assert_eq!(PrettyString(&String::from_utf8_lossy(&out)), PrettyString("start,end,note,sheet
|
|
|
|
2021-06-30T10:10:00Z,,hola,default
|
|
|
|
"));
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
String::from_utf8_lossy(&err),
|
|
|
|
String::new(),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn filter_by_end() {
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn filter_by_start_and_end() {
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn filter_by_match() {
|
|
|
|
}
|
2021-06-29 12:04:54 -05:00
|
|
|
}
|