Garmelon/today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix brackets of entries that end before the range starts

Browse source
This commit is contained in:
Joscha 2021-12-14 22:47:58 +01:00
parent b476a95afb
commit 2e7ab3c4a1
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/cli/layout/day.rs
View file

@ -32,6 +32,7 @@ pub struct DayLayout {
pub range: DateRange, pub range: DateRange,
pub today: NaiveDate, pub today: NaiveDate,
pub time: Time, pub time: Time,
/// Entries that are required to draw brackets correctly.
pub earlier: Vec<DayEntry>, pub earlier: Vec<DayEntry>,
pub days: HashMap<NaiveDate, Vec<DayEntry>>, pub days: HashMap<NaiveDate, Vec<DayEntry>>,
} }
@ -131,18 +132,22 @@ impl DayLayout {
fn layout_dated_entry(&mut self, index: usize, dates: Dates) { fn layout_dated_entry(&mut self, index: usize, dates: Dates) {
let (start, end) = dates.start_end(); let (start, end) = dates.start_end();
#[allow(clippy::if_same_then_else)] // Makes the code easier to read
if let Some((date, time)) = dates.point_in_time() { if let Some((date, time)) = dates.point_in_time() {
let entry = match time { let entry = match time {
Some(time) => DayEntry::TimedAt(index, time, None), Some(time) => DayEntry::TimedAt(index, time, None),
None => DayEntry::At(index), None => DayEntry::At(index),
}; };
self.insert(date, entry); self.insert(date, entry);
} else if end < self.range.from() || self.range.until() < start {
// Since the entry is entirely outside the range, there is no point
// in adding the start or end entry anywhere. If the entry was
// entirely before the range and we didn't filter it out, we would
// get a bracket without any visible start or end.
} else if start < self.range.from() && self.range.until() < end { } else if start < self.range.from() && self.range.until() < end {
// Neither the start nor end layout entries would be visible // Since neither the start nor end entries are visible directly, we
// directly. However, the start layout entry would be added to // omit them both. Otherwise, we would get a bracket without any
// [`self.earlier`]. Since [`self.earlier`] only exists so that // visible start or end.
// every end entry has a corresponding start entry (for rendering),
// this would be pointless, so we don't add any entries.
} else { } else {
let (start_entry, end_entry) = match dates.start_end_time() { let (start_entry, end_entry) = match dates.start_end_time() {
Some((start_time, end_time)) => ( Some((start_time, end_time)) => (