From 25cb3dfe743c08cef738e85077efdd7f92e69467 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Mon, 13 Dec 2021 19:35:16 +0000
Subject: [PATCH] Combine entry start and end if nothing is in-between

---
 src/cli/layout/day.rs  | 30 +++++++++++++++++++++++------
 src/cli/layout/line.rs | 43 +++++++++++++++++++++++++++++-------------
 src/cli/show.rs        | 11 ++++++-----
 3 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/src/cli/layout/day.rs b/src/cli/layout/day.rs
index 9bd3363..1b2cf5e 100644
--- a/src/cli/layout/day.rs
+++ b/src/cli/layout/day.rs
@@ -17,7 +17,7 @@ pub enum DayEntry {
     End(usize),
     Now(Time),
     TimedEnd(usize, Time),
-    TimedAt(usize, Time),
+    TimedAt(usize, Time, Option<Time>),
     TimedStart(usize, Time),
     ReminderSince(usize, i64),
     At(usize),
@@ -66,7 +66,7 @@ impl DayLayout {
             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) {
@@ -133,7 +133,7 @@ impl DayLayout {
         let (start, end) = dates.start_end();
         if let Some((date, time)) = dates.point_in_time() {
             let entry = match time {
-                Some(time) => DayEntry::TimedAt(index, time),
+                Some(time) => DayEntry::TimedAt(index, time, None),
                 None => DayEntry::At(index),
             };
             self.insert(date, entry);
@@ -211,7 +211,7 @@ impl DayLayout {
         day.sort_by_key(|e| match e {
             DayEntry::Now(_) => 1,
             DayEntry::TimedEnd(_, _) => 2,
-            DayEntry::TimedAt(_, _) => 3,
+            DayEntry::TimedAt(_, _, _) => 3,
             DayEntry::TimedStart(_, _) => 4,
             _ => 0,
         });
@@ -220,7 +220,7 @@ impl DayLayout {
         day.sort_by_key(|e| match e {
             DayEntry::Now(t) => Some(*t),
             DayEntry::TimedEnd(_, t) => Some(*t),
-            DayEntry::TimedAt(_, t) => Some(*t),
+            DayEntry::TimedAt(_, t, _) => Some(*t),
             DayEntry::TimedStart(_, t) => Some(*t),
             _ => None,
         });
@@ -230,7 +230,7 @@ impl DayLayout {
             DayEntry::End(_) => 0,
             DayEntry::Now(_) => 1,
             DayEntry::TimedEnd(_, _) => 1,
-            DayEntry::TimedAt(_, _) => 1,
+            DayEntry::TimedAt(_, _, _) => 1,
             DayEntry::TimedStart(_, _) => 1,
             DayEntry::ReminderSince(_, _) => 2,
             DayEntry::At(_) => 3,
@@ -240,4 +240,22 @@ impl DayLayout {
             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;
+            }
+        }
+    }
 }
diff --git a/src/cli/layout/line.rs b/src/cli/layout/line.rs
index 6587f67..62442df 100644
--- a/src/cli/layout/line.rs
+++ b/src/cli/layout/line.rs
@@ -21,6 +21,13 @@ pub enum SpanSegment {
     End,
 }
 
+#[derive(Debug, Clone, Copy)]
+pub enum Times {
+    Untimed,
+    At(Time),
+    FromTo(Time, Time),
+}
+
 pub enum LineEntry {
     Day {
         spans: Vec<Option<SpanSegment>>,
@@ -33,7 +40,7 @@ pub enum LineEntry {
     Entry {
         number: Option<usize>,
         spans: Vec<Option<SpanSegment>>,
-        time: Option<Time>,
+        time: Times,
         text: String,
     },
 }
@@ -115,7 +122,8 @@ impl LineLayout {
         match l_entry {
             DayEntry::End(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 {
                 spans: self.spans_for_line(),
@@ -123,14 +131,20 @@ impl LineLayout {
             }),
             DayEntry::TimedEnd(i, t) => {
                 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) => {
-                self.line_entry(Some(*i), Some(*t), Self::format_entry(files, entries, *i));
+            DayEntry::TimedAt(i, t, t2) => {
+                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) => {
                 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) => {
                 let text = Self::format_entry(files, entries, *i);
@@ -139,23 +153,26 @@ impl LineLayout {
                 } else {
                     format!("{} ({} days ago)", text, d)
                 };
-                self.line_entry(Some(*i), None, text);
+                self.line_entry(Some(*i), Times::Untimed, text);
             }
             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) => {
                 let text = Self::format_entry(files, entries, *i);
                 let plural = if *d == 1 { "" } else { "s" };
                 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) => {
-                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) => {
                 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) => {
                 let text = Self::format_entry(files, entries, *i);
@@ -164,7 +181,7 @@ impl LineLayout {
                 } else {
                     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();
     }
 
-    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 {
             Some(index) => Some(match self.numbers.get(&index) {
                 Some(number) => *number,
diff --git a/src/cli/show.rs b/src/cli/show.rs
index 44da6c6..0dab952 100644
--- a/src/cli/show.rs
+++ b/src/cli/show.rs
@@ -6,8 +6,8 @@ use crate::eval::{Entry, EntryKind};
 use crate::files::primitives::{Time, Weekday};
 use crate::files::Files;
 
-use super::error::{Error, Result};
-use super::layout::line::{LineEntry, LineLayout, SpanSegment};
+use super::error::Result;
+use super::layout::line::{LineEntry, LineLayout, SpanSegment, Times};
 
 struct ShowLines {
     num_width: usize,
@@ -68,7 +68,7 @@ impl ShowLines {
         &mut self,
         number: Option<usize>,
         spans: &[Option<SpanSegment>],
-        time: Option<Time>,
+        time: Times,
         text: &str,
     ) {
         let num = match number {
@@ -77,8 +77,9 @@ impl ShowLines {
         };
 
         let time = match time {
-            Some(t) => format!("{} ", t),
-            None => "".to_string(),
+            Times::Untimed => "".to_string(),
+            Times::At(t) => format!("{} ", t),
+            Times::FromTo(t1, t2) => format!("{}--{} ", t1, t2),
         };
 
         self.push(&format!(