diff options
Diffstat (limited to 'src/filters/log.rs')
-rw-r--r-- | src/filters/log.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/filters/log.rs b/src/filters/log.rs index 59e6b8c..2d2fc37 100644 --- a/src/filters/log.rs +++ b/src/filters/log.rs @@ -12,7 +12,7 @@ use std::collections::HashSet; use evtclib::raw::parser::PartialEvtc; use evtclib::Boss; -use chrono::{Datelike, NaiveDateTime}; +use chrono::{DateTime, Datelike, Utc}; use num_traits::FromPrimitive as _; /// Filter trait used for filters that operate on complete logs. @@ -39,7 +39,6 @@ pub fn boss(bosses: HashSet<Boss>) -> Box<dyn LogFilter> { Box::new(BossFilter(bosses)) } - #[derive(Debug, Clone)] struct OutcomeFilter(HashSet<FightOutcome>); @@ -88,9 +87,8 @@ pub fn weekday(weekdays: HashSet<Weekday>) -> Box<dyn LogFilter> { Box::new(WeekdayFilter(weekdays)) } - #[derive(Debug, Clone)] -struct TimeFilter(Option<NaiveDateTime>, Option<NaiveDateTime>); +struct TimeFilter(Option<DateTime<Utc>>, Option<DateTime<Utc>>); impl Filter<PartialEvtc, LogResult> for TimeFilter { fn filter(&self, log: &LogResult) -> bool { @@ -111,20 +109,20 @@ impl Filter<PartialEvtc, LogResult> for TimeFilter { /// /// If a bound is not given, -Infinity is assumed for the lower bound, and Infinity for the upper /// bound. -pub fn time(lower: Option<NaiveDateTime>, upper: Option<NaiveDateTime>) -> Box<dyn LogFilter> { +pub fn time(lower: Option<DateTime<Utc>>, upper: Option<DateTime<Utc>>) -> Box<dyn LogFilter> { Box::new(TimeFilter(lower, upper)) } /// A `LogFilter` that only accepts logs after the given date. /// /// Also see [`time`][time] and [`before`][before]. -pub fn after(when: NaiveDateTime) -> Box<dyn LogFilter> { +pub fn after(when: DateTime<Utc>) -> Box<dyn LogFilter> { time(Some(when), None) } /// A `LogFilter` that only accepts logs before the given date. /// /// Also see [`time`][time] and [`after`][after]. -pub fn before(when: NaiveDateTime) -> Box<dyn LogFilter> { +pub fn before(when: DateTime<Utc>) -> Box<dyn LogFilter> { time(None, Some(when)) } |