per task gets 1.1 hours, per day gets rounded 1 hours

src/main.rs

@@ -28,9 +28,7 @@ fn main() {
    let flags = Flags::parse();
 
    add(&flags.f, &flags.add, &flags.tag).unwrap();
-   log(&flags.f, &flags.since).unwrap();
-
-   println!("{:?}", flags);
+   log(&flags.f, &flags.log, &flags.since).unwrap();
 }
 
 fn add(f: &String, x: &Option<String>, tag: &Option<String>) -> Result<(), String> {
@@ -51,23 +49,26 @@ fn add(f: &String, x: &Option<String>, tag: &Option<String>) -> Result<(), Strin
 #[derive(Debug, Serialize, Clone)]
 struct Log {
    t: String,
-   d: u8,
+   d: f32,
    xs: Vec<LogX>,
 }
 #[derive(Debug, Serialize, Clone)]
 struct LogX {
-   d: u8,
+   d: f32,
    x: String,
 }
 
-fn log(f: &String, since: &Option<String>) -> Result<(), String> {
+fn log(f: &String, enabled: &bool, since: &Option<String>) -> Result<(), String> {
+   if !enabled {
+      return Ok(());
+   }
    let since = parse_time(since)?;
    let tsheet = load(&f)?;
    let tsheet = tsheet.since(since);
    let tsheet = tsheet.sorted();
 
    let mut result = vec![];
-   let mut curr = Log{t: "".to_string(), d: 0, xs: vec![]};
+   let mut curr = Log{t: "".to_string(), d: 0.0, xs: vec![]};
    for i in 0..tsheet.xs.len() {
       let x = &tsheet.xs[i];
       if curr.t != x.timestamp() {
@@ -76,12 +77,12 @@ fn log(f: &String, since: &Option<String>) -> Result<(), String> {
          }
          curr.xs.truncate(0);
          curr.t = x.timestamp();
-         curr.d = 0;
+         curr.d = 0.0;
       }
       let d = match curr.xs.len() {
-         0 if x.x.len() == 0 => 0,
-         0 => 1,
-         _ => ((tsheet.xs[i].t - tsheet.xs[i-1].t + 60*30) / (60*60)) as u8,
+         0 if x.x.len() == 0 => 0.0,
+         0 => 1.0,
+         _ => ((tsheet.xs[i].t - tsheet.xs[i-1].t) as f32 / (60.0*60.0)) as f32,
       };
       curr.t = x.timestamp();
       curr.xs.push(LogX{d: d, x: x.x.clone()});
@@ -96,7 +97,7 @@ fn log(f: &String, since: &Option<String>) -> Result<(), String> {
    for log in result {
       for x in log.xs {
          if x.x.len() > 0 {
-            println!("{} ({}) {} ({})", log.t, log.d, x.x, x.d);
+            println!("{} ({}) {} ({:.1})", log.t, (0.5 + log.d) as i64, x.x, x.d + 0.05);
          }
       }
    }