ok we even got start mark

main
Bel LaPointe 2023-11-29 06:18:30 -07:00
parent a96c5dc1f8
commit d580122f76
1 changed files with 7 additions and 2 deletions

View File

@ -79,20 +79,25 @@ fn log(f: &String, since: &Option<String>) -> Result<(), String> {
curr.d = 0; curr.d = 0;
} }
let d = match curr.xs.len() { let d = match curr.xs.len() {
0 if x.x.len() == 0 => 0,
0 => 1, 0 => 1,
_ => ((tsheet.xs[i].t - tsheet.xs[i-1].t + 60*30) / (60*60)) as u8, _ => ((tsheet.xs[i].t - tsheet.xs[i-1].t + 60*30) / (60*60)) as u8,
}; };
curr.t = x.timestamp(); curr.t = x.timestamp();
curr.xs.push(LogX{d: d, x: x.x.clone()}); curr.xs.push(LogX{d: d, x: x.x.clone()});
curr.d += d;
} }
if curr.xs.len() > 0 { if curr.xs.len() > 0 {
result.push(curr.clone()); result.push(curr.clone());
} }
for i in result.iter_mut() {
i.d = i.xs.iter().map(|x| x.d).sum();
}
for log in result { for log in result {
for x in log.xs { for x in log.xs {
println!("{} ({}) {} ({})", log.t, log.d, x.x, x.d); if x.x.len() > 0 {
println!("{} ({}) {} ({})", log.t, log.d, x.x, x.d);
}
} }
} }
Ok(()) Ok(())