1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
use chrono::prelude::*;
use std::cmp;
use std::str::FromStr;
use crate::utils::dateutil;
use crate::utils::misc;
pub struct SelectFilterFrom {
pub date: Option<Date<Local>>,
pub bucket: Option<String>,
}
pub struct SelectFilterTo {
pub date: Option<Date<Local>>,
pub bucket: Option<String>,
}
impl SelectFilterFrom {
pub fn includes_date(&self, cmp_date: DateTime<Local>) -> bool {
self.date.map_or(true, |date| date <= cmp_date.date())
}
fn from_date(date: Option<Date<Local>>) -> Self {
Self {
date,
bucket: date.map(misc::get_bucket_for_date),
}
}
pub fn combine_with(self, other: &Self) -> Self {
let date = if self.date.is_some() {
cmp::max(self.date, other.date)
} else {
other.date
};
Self::from_date(date)
}
}
impl SelectFilterTo {
pub fn includes_date(&self, cmp_date: DateTime<Local>) -> bool {
self.date.map_or(true, |date| cmp_date.date() <= date)
}
fn from_date(date: Option<Date<Local>>) -> Self {
Self {
date,
bucket: date.map(misc::get_bucket_for_date),
}
}
pub fn combine_with(self, other: &Self) -> Self {
let date = if self.date.is_some() {
cmp::min(self.date, other.date)
} else {
other.date
};
Self::from_date(date)
}
}
impl FromStr for SelectFilterFrom {
type Err = String;
fn from_str(s: &str) -> Result<SelectFilterFrom, Self::Err> {
if let Ok(date) = dateutil::date_from_str(s) {
return Ok(SelectFilterFrom::from_date(Some(date)));
}
if let Ok(weekdate) = dateutil::week_from_str_begin(s) {
return Ok(SelectFilterFrom::from_date(Some(weekdate)));
}
Err(format!("Could not parse date '{}'", s).to_string())
}
}
impl FromStr for SelectFilterTo {
type Err = String;
fn from_str(s: &str) -> Result<SelectFilterTo, Self::Err> {
if let Ok(date) = dateutil::date_from_str(s) {
return Ok(SelectFilterTo::from_date(Some(date)));
}
if let Ok(weekdate) = dateutil::week_from_str_end(s) {
return Ok(SelectFilterTo::from_date(Some(weekdate)));
}
Err(format!("Could not parse date '{}'", s).to_string())
}
}
impl Default for SelectFilterTo {
fn default() -> SelectFilterTo {
SelectFilterTo::from_date(None)
}
}
impl Default for SelectFilterFrom {
fn default() -> SelectFilterFrom {
SelectFilterFrom::from_date(None)
}
}
#[cfg(test)]
mod tests {
use crate::selectors::test::test_filter_event;
use crate::testdata;
#[test]
fn test_from_ends_before() {
// DTSTART: 2007-06-28
// DTEND: 2007-07-09
let filtered = test_filter_event(
&testdata::TEST_EVENT_MULTIDAY,
None,
&["from", "2007-08-01"],
);
assert_eq!(false, filtered)
}
#[test]
fn test_from_begins_after() {
let filtered = test_filter_event(
&testdata::TEST_EVENT_MULTIDAY,
None,
&["from", "2007-06-01"],
);
assert_eq!(true, filtered);
}
#[test]
fn test_from_begins_before_ends_after() {
let filtered = test_filter_event(
&testdata::TEST_EVENT_MULTIDAY,
None,
&["from", "2007-07-01"],
);
assert_eq!(true, filtered);
}
#[test]
fn test_from_week_before() {
let filtered = test_filter_event(&testdata::TEST_EVENT_MULTIDAY, None, &["from", "2007-W17"]);
assert_eq!(true, filtered);
}
#[test]
fn test_from_week_after() {
let filtered = test_filter_event(&testdata::TEST_EVENT_MULTIDAY, None, &["from", "2007-W30"]);
assert_eq!(false, filtered);
}
#[test]
fn test_from_redundant() {
let filtered = test_filter_event(
&testdata::TEST_EVENT_MULTIDAY,
None,
&["from", "2007-06-01", "from", "2007-08-01"],
);
assert_eq!(false, filtered);
}
#[test]
fn test_to_ends_before() {
let filtered = test_filter_event(&testdata::TEST_EVENT_MULTIDAY, None, &["to", "2007-08-01"]);
assert_eq!(true, filtered);
}
#[test]
fn test_to_begins_after() {
let filtered = test_filter_event(&testdata::TEST_EVENT_MULTIDAY, None, &["to", "2007-06-01"]);
assert_eq!(false, filtered);
}
#[test]
fn test_to_begins_before_ends_after() {
let filtered = test_filter_event(&testdata::TEST_EVENT_MULTIDAY, None, &["to", "2007-07-01"]);
assert_eq!(true, filtered);
}
#[test]
fn test_to_week_before() {
let filtered = test_filter_event(&testdata::TEST_EVENT_MULTIDAY, None, &["to", "2007-W17"]);
assert_eq!(false, filtered);
}
#[test]
fn test_to_week_after() {
let filtered = test_filter_event(&testdata::TEST_EVENT_MULTIDAY, None, &["to", "2007-W30"]);
assert_eq!(true, filtered);
}
#[test]
fn test_to_begins_redundant() {
let filtered = test_filter_event(
&testdata::TEST_EVENT_MULTIDAY,
None,
&["to", "2007-06-01", "to", "2007-08-01"],
);
assert_eq!(false, filtered);
}
}
|
