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

Combine entry start and end if nothing is in-between

Browse source
This commit is contained in:
Joscha 2021-12-13 19:35:16 +00:00
parent 696009d34e
commit 25cb3dfe74
3 changed files with 60 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ pub enum DayEntry {
End(usize), End(usize),
Now(Time), Now(Time),
TimedEnd(usize, Time), TimedEnd(usize, Time),
TimedAt(usize, Time), TimedAt(usize, Time, Option<Time>),
TimedStart(usize, Time), TimedStart(usize, Time),
ReminderSince(usize, i64), ReminderSince(usize, i64),
At(usize), At(usize),
@ -66,7 +66,7 @@ impl DayLayout {
Self::sort_day(day); Self::sort_day(day);
} }
// TODO Combine TimedStart and TimedEnd if there is nothing in-between self.combine_times();
} }
fn layout_entry(&mut self, index: usize, entry: &Entry) { fn layout_entry(&mut self, index: usize, entry: &Entry) {
@ -133,7 +133,7 @@ impl DayLayout {
let (start, end) = dates.start_end(); let (start, end) = dates.start_end();
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), Some(time) => DayEntry::TimedAt(index, time, None),
None => DayEntry::At(index), None => DayEntry::At(index),
}; };
self.insert(date, entry); self.insert(date, entry);
@ -211,7 +211,7 @@ impl DayLayout {
day.sort_by_key(|e| match e { day.sort_by_key(|e| match e {
DayEntry::Now(_) => 1, DayEntry::Now(_) => 1,
DayEntry::TimedEnd(_, _) => 2, DayEntry::TimedEnd(_, _) => 2,
DayEntry::TimedAt(_, _) => 3, DayEntry::TimedAt(_, _, _) => 3,
DayEntry::TimedStart(_, _) => 4, DayEntry::TimedStart(_, _) => 4,
_ => 0, _ => 0,
}); });
@ -220,7 +220,7 @@ impl DayLayout {
day.sort_by_key(|e| match e { day.sort_by_key(|e| match e {
DayEntry::Now(t) => Some(*t), DayEntry::Now(t) => Some(*t),
DayEntry::TimedEnd(_, t) => Some(*t), DayEntry::TimedEnd(_, t) => Some(*t),
DayEntry::TimedAt(_, t) => Some(*t), DayEntry::TimedAt(_, t, _) => Some(*t),
DayEntry::TimedStart(_, t) => Some(*t), DayEntry::TimedStart(_, t) => Some(*t),
_ => None, _ => None,
}); });
@ -230,7 +230,7 @@ impl DayLayout {
DayEntry::End(_) => 0, DayEntry::End(_) => 0,
DayEntry::Now(_) => 1, DayEntry::Now(_) => 1,
DayEntry::TimedEnd(_, _) => 1, DayEntry::TimedEnd(_, _) => 1,
DayEntry::TimedAt(_, _) => 1, DayEntry::TimedAt(_, _, _) => 1,
DayEntry::TimedStart(_, _) => 1, DayEntry::TimedStart(_, _) => 1,
DayEntry::ReminderSince(_, _) => 2, DayEntry::ReminderSince(_, _) => 2,
DayEntry::At(_) => 3, DayEntry::At(_) => 3,
@ -240,4 +240,22 @@ impl DayLayout {
DayEntry::ReminderUntil(_, _) => 7, DayEntry::ReminderUntil(_, _) => 7,
}) })
} }
/// Combine matching [`DayEntry::TimedStart`]s and [`DayEntry::TimedEnd`]s
/// with nothing in-between into [`DayEntry::TimedAt`]s.
fn combine_times(&mut self) {
for day in self.days.values_mut() {
let mut i = 0;
while i + 1 < day.len() {
match (&day[i], &day[i + 1]) {
(DayEntry::TimedStart(i1, t1), DayEntry::TimedEnd(i2, t2)) if i1 == i2 => {
day[i] = DayEntry::TimedAt(*i1, *t1, Some(*t2));
day.remove(i + 1);
}
_ => {}
}
i += 1;
}
}
}
} }

43
src/cli/layout/line.rs
View file

@ -21,6 +21,13 @@ pub enum SpanSegment {
End, End,
} }
#[derive(Debug, Clone, Copy)]
pub enum Times {
Untimed,
At(Time),
FromTo(Time, Time),
}
pub enum LineEntry { pub enum LineEntry {
Day { Day {
spans: Vec<Option<SpanSegment>>, spans: Vec<Option<SpanSegment>>,
@ -33,7 +40,7 @@ pub enum LineEntry {
Entry { Entry {
number: Option<usize>, number: Option<usize>,
spans: Vec<Option<SpanSegment>>, spans: Vec<Option<SpanSegment>>,
time: Option<Time>, time: Times,
text: String, text: String,
}, },
} }
@ -115,7 +122,8 @@ impl LineLayout {
match l_entry { match l_entry {
DayEntry::End(i) => { DayEntry::End(i) => {
self.stop_span(*i); self.stop_span(*i);
self.line_entry(Some(*i), None, Self::format_entry(files, entries, *i)); let text = Self::format_entry(files, entries, *i);
self.line_entry(Some(*i), Times::Untimed, text);
} }
DayEntry::Now(t) => self.line(LineEntry::Now { DayEntry::Now(t) => self.line(LineEntry::Now {
spans: self.spans_for_line(), spans: self.spans_for_line(),
@ -123,14 +131,20 @@ impl LineLayout {
}), }),
DayEntry::TimedEnd(i, t) => { DayEntry::TimedEnd(i, t) => {
self.stop_span(*i); self.stop_span(*i);
self.line_entry(Some(*i), Some(*t), Self::format_entry(files, entries, *i)); let text = Self::format_entry(files, entries, *i);
self.line_entry(Some(*i), Times::At(*t), text);
} }
DayEntry::TimedAt(i, t) => { DayEntry::TimedAt(i, t, t2) => {
self.line_entry(Some(*i), Some(*t), Self::format_entry(files, entries, *i)); let time = t2
.map(|t2| Times::FromTo(*t, t2))
.unwrap_or_else(|| Times::At(*t));
let text = Self::format_entry(files, entries, *i);
self.line_entry(Some(*i), time, text);
} }
DayEntry::TimedStart(i, t) => { DayEntry::TimedStart(i, t) => {
self.start_span(*i); self.start_span(*i);
self.line_entry(Some(*i), Some(*t), Self::format_entry(files, entries, *i)); let text = Self::format_entry(files, entries, *i);
self.line_entry(Some(*i), Times::At(*t), text);
} }
DayEntry::ReminderSince(i, d) => { DayEntry::ReminderSince(i, d) => {
let text = Self::format_entry(files, entries, *i); let text = Self::format_entry(files, entries, *i);
@ -139,23 +153,26 @@ impl LineLayout {
} else { } else {
format!("{} ({} days ago)", text, d) format!("{} ({} days ago)", text, d)
}; };
self.line_entry(Some(*i), None, text); self.line_entry(Some(*i), Times::Untimed, text);
} }
DayEntry::At(i) => { DayEntry::At(i) => {
self.line_entry(Some(*i), None, Self::format_entry(files, entries, *i)) let text = Self::format_entry(files, entries, *i);
self.line_entry(Some(*i), Times::Untimed, text);
} }
DayEntry::ReminderWhile(i, d) => { DayEntry::ReminderWhile(i, d) => {
let text = Self::format_entry(files, entries, *i); let text = Self::format_entry(files, entries, *i);
let plural = if *d == 1 { "" } else { "s" }; let plural = if *d == 1 { "" } else { "s" };
let text = format!("{} ({} day{} left)", text, i, plural); let text = format!("{} ({} day{} left)", text, i, plural);
self.line_entry(Some(*i), None, text); self.line_entry(Some(*i), Times::Untimed, text);
} }
DayEntry::Undated(i) => { DayEntry::Undated(i) => {
self.line_entry(Some(*i), None, Self::format_entry(files, entries, *i)); let text = Self::format_entry(files, entries, *i);
self.line_entry(Some(*i), Times::Untimed, text);
} }
DayEntry::Start(i) => { DayEntry::Start(i) => {
self.start_span(*i); self.start_span(*i);
self.line_entry(Some(*i), None, Self::format_entry(files, entries, *i)); let text = Self::format_entry(files, entries, *i);
self.line_entry(Some(*i), Times::Untimed, text);
} }
DayEntry::ReminderUntil(i, d) => { DayEntry::ReminderUntil(i, d) => {
let text = Self::format_entry(files, entries, *i); let text = Self::format_entry(files, entries, *i);
@ -164,7 +181,7 @@ impl LineLayout {
} else { } else {
format!("{} (in {} days)", text, d) format!("{} (in {} days)", text, d)
}; };
self.line_entry(Some(*i), None, text); self.line_entry(Some(*i), Times::Untimed, text);
} }
} }
} }
@ -224,7 +241,7 @@ impl LineLayout {
self.step_spans(); self.step_spans();
} }
fn line_entry(&mut self, index: Option<usize>, time: Option<Time>, text: String) { fn line_entry(&mut self, index: Option<usize>, time: Times, text: String) {
let number = match index { let number = match index {
Some(index) => Some(match self.numbers.get(&index) { Some(index) => Some(match self.numbers.get(&index) {
Some(number) => *number, Some(number) => *number,

11
src/cli/show.rs
View file

@ -6,8 +6,8 @@ use crate::eval::{Entry, EntryKind};
use crate::files::primitives::{Time, Weekday}; use crate::files::primitives::{Time, Weekday};
use crate::files::Files; use crate::files::Files;
use super::error::{Error, Result}; use super::error::Result;
use super::layout::line::{LineEntry, LineLayout, SpanSegment}; use super::layout::line::{LineEntry, LineLayout, SpanSegment, Times};
struct ShowLines { struct ShowLines {
num_width: usize, num_width: usize,
@ -68,7 +68,7 @@ impl ShowLines {
&mut self, &mut self,
number: Option<usize>, number: Option<usize>,
spans: &[Option<SpanSegment>], spans: &[Option<SpanSegment>],
time: Option<Time>, time: Times,
text: &str, text: &str,
) { ) {
let num = match number { let num = match number {
@ -77,8 +77,9 @@ impl ShowLines {
}; };
let time = match time { let time = match time {
Some(t) => format!("{} ", t), Times::Untimed => "".to_string(),
None => "".to_string(), Times::At(t) => format!("{} ", t),
Times::FromTo(t1, t2) => format!("{}--{} ", t1, t2),
}; };
self.push(&format!( self.push(&format!(