Parse and format logs

This commit is contained in:
Joscha 2021-12-31 17:54:26 +01:00
parent 0e4ef7fef3
commit 017098da34
4 changed files with 47 additions and 3 deletions

View file

@ -6,7 +6,7 @@ use crate::files::commands::DoneKind;
use super::commands::{
BirthdaySpec, Command, DateSpec, Delta, DeltaStep, Done, DoneDate, Expr, File, FormulaSpec,
Note, Repeat, Spec, Statement, Task, Var, WeekdaySpec,
Log, Note, Repeat, Spec, Statement, Task, Var, WeekdaySpec,
};
use super::primitives::{Spanned, Time, Weekday};
@ -306,9 +306,19 @@ impl fmt::Display for Command {
}
}
impl fmt::Display for Log {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
writeln!(f, "LOG {}", self.date)?;
format_desc(f, &self.desc)?;
Ok(())
}
}
impl fmt::Display for File {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut empty = true;
// TODO Sort includes alphabetically
for include in &self.includes {
writeln!(f, "INCLUDE {}", include)?;
empty = false;
@ -322,6 +332,11 @@ impl fmt::Display for File {
empty = false;
}
// TODO Sort logs from old to new
for log in &self.logs {
writeln!(f, "{}", log)?;
}
for command in &self.commands {
if !empty {
writeln!(f)?;