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

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::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!(