Color output

CHANGELOG.md

@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `REMIND` statement
 - `MOVE` entries to a different time
 
+### Changed
+- Output is now colored
+
 ## 0.1.0 - 2021-12-20
 
 ### Added

Cargo.lock

@@ -101,6 +101,17 @@ dependencies = [
  "vec_map",
 ]
 
+[[package]]
+name = "colored"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
+dependencies = [
+ "atty",
+ "lazy_static",
+ "winapi",
+]
+
 [[package]]
 name = "computus"
 version = "1.0.0"
@@ -425,6 +436,7 @@ name = "today"
 version = "0.1.0"
 dependencies = [
  "chrono",
+ "colored",
  "computus",
  "directories",
  "pest",

Cargo.toml

@@ -5,6 +5,7 @@ edition = "2021"
 
 [dependencies]
 chrono = "0.4.19"
+colored="2.0.0"
 computus = "1.0.0"
 directories = "4.0.1"
 pest = "2.1.3"

src/cli/layout/line.rs

@@ -14,11 +14,39 @@ use crate::files::Files;
 use super::super::error::{Error, Result};
 use super::day::{DayEntry, DayLayout};
 
+#[derive(Debug, Clone, Copy)]
+pub enum SpanStyle {
+    Solid,
+    Dashed,
+    Dotted,
+}
+
+impl SpanStyle {
+    fn from_indentation(index: usize) -> Self {
+        match index % 3 {
+            0 => Self::Solid,
+            1 => Self::Dashed,
+            2 => Self::Dotted,
+            _ => unreachable!(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Copy)]
 pub enum SpanSegment {
-    Start,
+    Start(SpanStyle),
-    Middle,
+    Middle(SpanStyle),
-    End,
+    End(SpanStyle),
+}
+
+impl SpanSegment {
+    fn style(&self) -> SpanStyle {
+        match self {
+            SpanSegment::Start(s) => *s,
+            SpanSegment::Middle(s) => *s,
+            SpanSegment::End(s) => *s,
+        }
+    }
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -28,10 +56,19 @@ pub enum Times {
     FromTo(Time, Time),
 }
 
+#[derive(Debug, Clone, Copy)]
+pub enum LineKind {
+    Task,
+    Done,
+    Note,
+    Birthday,
+}
+
 pub enum LineEntry {
     Day {
         spans: Vec<Option<SpanSegment>>,
         date: NaiveDate,
+        today: bool,
     },
     Now {
         spans: Vec<Option<SpanSegment>>,
@@ -41,7 +78,9 @@ pub enum LineEntry {
         number: Option<usize>,
         spans: Vec<Option<SpanSegment>>,
         time: Times,
+        kind: LineKind,
         text: String,
+        extra: Option<String>,
     },
 }
 
@@ -80,7 +119,11 @@ impl LineLayout {
 
         for day in layout.range.days() {
             let spans = self.spans_for_line();
-            self.line(LineEntry::Day { spans, date: day });
+            self.line(LineEntry::Day {
+                spans,
+                date: day,
+                today: day == layout.today,
+            });
 
             let layout_entries = layout.days.get(&day).expect("got nonexisting day");
             for layout_entry in layout_entries {
@@ -114,8 +157,10 @@ impl LineLayout {
         match l_entry {
             DayEntry::End(i) => {
                 self.stop_span(*i);
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
-                self.line_entry(Some(*i), Times::Untimed, text);
+                let kind = Self::entry_kind(entry);
+                let text = Self::entry_title(files, entry);
+                self.line_entry(Some(*i), Times::Untimed, kind, text, None);
             }
             DayEntry::Now(t) => self.line(LineEntry::Now {
                 spans: self.spans_for_line(),
@@ -123,89 +168,114 @@ impl LineLayout {
             }),
             DayEntry::TimedEnd(i, t) => {
                 self.stop_span(*i);
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
-                self.line_entry(Some(*i), Times::At(*t), text);
+                let kind = Self::entry_kind(entry);
+                let text = Self::entry_title(files, entry);
+                self.line_entry(Some(*i), Times::At(*t), kind, text, None);
             }
             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);
+                let entry = &entries[*i];
-                self.line_entry(Some(*i), time, text);
+                let kind = Self::entry_kind(entry);
+                let text = Self::entry_title(files, entry);
+                self.line_entry(Some(*i), time, kind, text, None);
             }
             DayEntry::TimedStart(i, t) => {
                 self.start_span(*i);
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
-                self.line_entry(Some(*i), Times::At(*t), text);
+                let kind = Self::entry_kind(entry);
+                let text = Self::entry_title(files, entry);
+                self.line_entry(Some(*i), Times::At(*t), kind, text, None);
             }
             DayEntry::ReminderSince(i, d) => {
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
-                let text = if *d == 1 {
+                let kind = Self::entry_kind(entry);
-                    format!("{} (yesterday)", text)
+                let text = Self::entry_title(files, entry);
+                let extra = if *d == 1 {
+                    "yesterday".to_string()
                 } else {
-                    format!("{} ({} days ago)", text, d)
+                    format!("{} days ago", d)
                 };
-                self.line_entry(Some(*i), Times::Untimed, text);
+                self.line_entry(Some(*i), Times::Untimed, kind, text, Some(extra));
             }
             DayEntry::At(i) => {
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
-                self.line_entry(Some(*i), Times::Untimed, text);
+                let kind = Self::entry_kind(entry);
+                let text = Self::entry_title(files, entry);
+                self.line_entry(Some(*i), Times::Untimed, kind, text, None);
             }
             DayEntry::ReminderWhile(i, d) => {
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
+                let kind = Self::entry_kind(entry);
+                let text = Self::entry_title(files, entry);
                 let plural = if *d == 1 { "" } else { "s" };
-                let text = format!("{} ({} day{} left)", text, d, plural);
+                let extra = format!("{} day{} left", d, plural);
-                self.line_entry(Some(*i), Times::Untimed, text);
+                self.line_entry(Some(*i), Times::Untimed, kind, text, Some(extra));
             }
             DayEntry::Undated(i) => {
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
-                self.line_entry(Some(*i), Times::Untimed, text);
+                let kind = Self::entry_kind(entry);
+                let text = Self::entry_title(files, entry);
+                self.line_entry(Some(*i), Times::Untimed, kind, text, None);
             }
             DayEntry::Start(i) => {
                 self.start_span(*i);
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
-                self.line_entry(Some(*i), Times::Untimed, text);
+                let kind = Self::entry_kind(entry);
+                let text = Self::entry_title(files, entry);
+                self.line_entry(Some(*i), Times::Untimed, kind, text, None);
             }
             DayEntry::ReminderUntil(i, d) => {
-                let text = Self::format_entry(files, entries, *i);
+                let entry = &entries[*i];
-                let text = if *d == 1 {
+                let kind = Self::entry_kind(entry);
-                    format!("{} (tomorrow)", text)
+                let text = Self::entry_title(files, entry);
+                let extra = if *d == 1 {
+                    "tomorrow".to_string()
                 } else {
-                    format!("{} (in {} days)", text, d)
+                    format!("in {} days", d)
                 };
-                self.line_entry(Some(*i), Times::Untimed, text);
+                self.line_entry(Some(*i), Times::Untimed, kind, text, Some(extra));
             }
         }
     }
 
-    fn format_entry(files: &Files, entries: &[Entry], index: usize) -> String {
+    fn entry_kind(entry: &Entry) -> LineKind {
-        let entry = entries[index];
+        match entry.kind {
+            EntryKind::Task => LineKind::Task,
+            EntryKind::TaskDone(_) => LineKind::Done,
+            EntryKind::Note => LineKind::Note,
+            EntryKind::Birthday(_) => LineKind::Birthday,
+        }
+    }
+
+    fn entry_title(files: &Files, entry: &Entry) -> String {
         let command = files.command(entry.source);
         match entry.kind {
-            EntryKind::Task => format!("T {}", command.title()),
+            EntryKind::Birthday(Some(age)) => format!("{} ({})", command.title(), age),
-            EntryKind::TaskDone(_) => format!("D {}", command.title()),
+            _ => command.title().to_string(),
-            EntryKind::Note => format!("N {}", command.title()),
-            EntryKind::Birthday(Some(age)) => format!("B {} ({})", command.title(), age),
-            EntryKind::Birthday(None) => format!("B {}", command.title()),
         }
     }
 
     fn start_span(&mut self, index: usize) {
-        for span in self.spans.iter_mut() {
+        for (i, span) in self.spans.iter_mut().enumerate() {
             if span.is_none() {
-                *span = Some((index, SpanSegment::Start));
+                let style = SpanStyle::from_indentation(i);
+                *span = Some((index, SpanSegment::Start(style)));
                 return;
             }
         }
 
         // Not enough space, we need another column
-        self.spans.push(Some((index, SpanSegment::Start)));
+        let style = SpanStyle::from_indentation(self.spans.len());
+        self.spans.push(Some((index, SpanSegment::Start(style))));
     }
 
     fn stop_span(&mut self, index: usize) {
         for span in self.spans.iter_mut() {
             match span {
-                Some((i, s)) if *i == index => *s = SpanSegment::End,
+                Some((i, s)) if *i == index => *s = SpanSegment::End(s.style()),
                 _ => {}
             }
         }
@@ -214,8 +284,8 @@ impl LineLayout {
     fn step_spans(&mut self) {
         for span in self.spans.iter_mut() {
             match span {
-                Some((_, s @ SpanSegment::Start)) => *s = SpanSegment::Middle,
+                Some((_, s @ SpanSegment::Start(_))) => *s = SpanSegment::Middle(s.style()),
-                Some((_, SpanSegment::End)) => *span = None,
+                Some((_, SpanSegment::End(_))) => *span = None,
                 _ => {}
             }
         }
@@ -233,7 +303,14 @@ impl LineLayout {
         self.step_spans();
     }
 
-    fn line_entry(&mut self, index: Option<usize>, time: Times, text: String) {
+    fn line_entry(
+        &mut self,
+        index: Option<usize>,
+        time: Times,
+        kind: LineKind,
+        text: String,
+        extra: Option<String>,
+    ) {
         let number = match index {
             Some(index) => Some(match self.numbers.get(&index) {
                 Some(number) => *number,
@@ -250,7 +327,9 @@ impl LineLayout {
             number,
             spans: self.spans_for_line(),
             time,
+            kind,
             text,
+            extra,
         });
     }
 }

src/cli/print.rs

@@ -1,10 +1,11 @@
 use std::cmp;
 
 use chrono::{Datelike, NaiveDate};
+use colored::{Color, ColoredString, Colorize};
 
 use crate::files::primitives::{Time, Weekday};
 
-use super::layout::line::{LineEntry, LineLayout, SpanSegment, Times};
+use super::layout::line::{LineEntry, LineKind, LineLayout, SpanSegment, SpanStyle, Times};
 
 struct ShowLines {
     num_width: usize,
@@ -23,41 +24,59 @@ impl ShowLines {
 
     fn display_line(&mut self, line: &LineEntry) {
         match line {
-            LineEntry::Day { spans, date } => self.display_line_date(spans, *date),
+            LineEntry::Day { spans, date, today } => self.display_line_date(spans, *date, *today),
             LineEntry::Now { spans, time } => self.display_line_now(spans, *time),
             LineEntry::Entry {
                 number,
                 spans,
                 time,
+                kind,
                 text,
-            } => self.display_line_entry(*number, spans, *time, text),
+                extra,
+            } => self.display_line_entry(*number, spans, *time, *kind, text, extra),
         }
     }
 
-    fn display_line_date(&mut self, spans: &[Option<SpanSegment>], date: NaiveDate) {
+    fn display_line_date(&mut self, spans: &[Option<SpanSegment>], date: NaiveDate, today: bool) {
         let weekday: Weekday = date.weekday().into();
         let weekday = weekday.full_name();
-        self.push(&format!(
+
-            "{:=>nw$}={:=<sw$}===  {:9}  {}  ==={:=<sw$}={:=>nw$}\n",
+        let color = if today {
-            "",
+            Color::BrightCyan
-            Self::display_spans(spans, '='),
+        } else {
+            Color::Cyan
+        };
+
+        // '=' symbols before the spans start
+        let p1 = format!("{:=<w$}=", "", w = self.num_width);
+
+        // Spans and filler '=' symbols
+        let p2 = self.display_spans(spans, "=".color(color).bold());
+
+        // The rest of the line
+        let p3 = format!(
+            "===  {:9}  {}  ===={:=<w$}",
             weekday,
             date,
             "",
-            "",
+            w = self.num_width + self.span_width
-            nw = self.num_width,
+        );
-            sw = self.span_width
+
+        self.push(&format!(
+            "{}{}{}\n",
+            p1.color(color).bold(),
+            p2,
+            p3.color(color).bold()
         ));
     }
 
     fn display_line_now(&mut self, spans: &[Option<SpanSegment>], time: Time) {
         self.push(&format!(
-            "{:<nw$} {:sw$} {}\n",
+            "{:<nw$} {} {}\n",
-            "now",
+            "now".bright_cyan().bold(),
-            Self::display_spans(spans, ' '),
+            self.display_spans(spans, " ".into()),
-            time,
+            Self::display_time(Times::At(time)),
             nw = self.num_width,
-            sw = self.span_width
         ));
     }
 
@@ -66,43 +85,70 @@ impl ShowLines {
         number: Option<usize>,
         spans: &[Option<SpanSegment>],
         time: Times,
+        kind: LineKind,
         text: &str,
+        extra: &Option<String>,
     ) {
         let num = match number {
             Some(n) => format!("{}", n),
             None => "".to_string(),
         };
 
-        let time = match time {
-            Times::Untimed => "".to_string(),
-            Times::At(t) => format!("{} ", t),
-            Times::FromTo(t1, t2) => format!("{}--{} ", t1, t2),
-        };
-
         self.push(&format!(
-            "{:>nw$} {:sw$} {}{}\n",
+            "{:>nw$} {} {} {}{}{}\n",
-            num,
+            num.bright_black(),
-            Self::display_spans(spans, ' '),
+            self.display_spans(spans, " ".into()),
-            time,
+            Self::display_kind(kind),
+            Self::display_time(time),
             text,
+            Self::display_extra(extra),
             nw = self.num_width,
-            sw = self.span_width
         ))
     }
 
-    fn display_spans(spans: &[Option<SpanSegment>], empty: char) -> String {
+    fn display_spans(&self, spans: &[Option<SpanSegment>], empty: ColoredString) -> String {
         let mut result = String::new();
-        for segment in spans {
+        for i in 0..self.span_width {
-            result.push(match segment {
+            if let Some(Some(segment)) = spans.get(i) {
-                Some(SpanSegment::Start) => '┌',
+                let colored_str = match segment {
-                Some(SpanSegment::Middle) => '│',
+                    SpanSegment::Start(_) => "┌".bright_black(),
-                Some(SpanSegment::End) => '└',
+                    SpanSegment::Middle(SpanStyle::Solid) => "│".bright_black(),
-                None => empty,
+                    SpanSegment::Middle(SpanStyle::Dashed) => "╎".bright_black(),
-            });
+                    SpanSegment::Middle(SpanStyle::Dotted) => "┊".bright_black(),
+                    SpanSegment::End(_) => "└".bright_black(),
+                };
+                result.push_str(&format!("{}", colored_str));
+            } else {
+                result.push_str(&format!("{}", empty));
+            }
         }
         result
     }
 
+    fn display_time(time: Times) -> ColoredString {
+        match time {
+            Times::Untimed => "".into(),
+            Times::At(t) => format!("{} ", t).bright_black(),
+            Times::FromTo(t1, t2) => format!("{}--{} ", t1, t2).bright_black(),
+        }
+    }
+
+    fn display_kind(kind: LineKind) -> ColoredString {
+        match kind {
+            LineKind::Task => "T".magenta().bold(),
+            LineKind::Done => "D".green().bold(),
+            LineKind::Note => "N".blue().bold(),
+            LineKind::Birthday => "B".yellow().bold(),
+        }
+    }
+
+    fn display_extra(extra: &Option<String>) -> ColoredString {
+        match extra {
+            None => "".into(),
+            Some(extra) => format!(" ({})", extra).bright_black(),
+        }
+    }
+
     fn push(&mut self, line: &str) {
         self.result.push_str(line);
     }