fix time output in timesheets from taskwarrior

@@ -19,4 +19,9 @@ function extracttime() {
     fi
     fi
 }
 }
 
 
+function formattime() {
+    days=${1%%:*}
+    printf "%03dd %s" ${days:-0} ${1#*:}
+}
+
 # vim: set et ts=4 sw=4:
 # vim: set et ts=4 sw=4:

 #!/bin/zsh
 #!/bin/zsh
 
 
-function tasktimes() {
+function duration() {
     [[ $# -eq 0 ]] && return 1
     [[ $# -eq 0 ]] && return 1
+    task $1 info|\
+        sed 's/\([^ ]*\) \([^ ]*\).*duration: \(\([0-9]*\)d \)\?\([^)]*\).*/\1_\2|\4:\5/;te;d;:e'
+}
 
 
-    local KEY=${2:-\\1}
-    local T
-    local D='([0-9]{4}-[0-9]{2}-[0-9]{2})'
-    local N='([0-9]+)'
-    local EXPR='s/'$D'.*PT('$N'H)?('$N'M)?('$N').*/'${KEY}':\3:\5:\7/;te;d;:e'
-
-    task $1 info | sed -r ${EXPR} | awk -F: '
-    {
-        s = (d[$1][2] + $4) % 60
-        _m = int((d[$1][2] + $4) / 60)
-        m = (d[$1][1] + $3 + _m) % 60
-        _h = int((d[$1][1] + $3 + _m) / 60)
-        d[$1][0] += $2 + _h
-        d[$1][1] = m
-        d[$1][2] = s
-    }
-    END {
-        for(i in d)
-            printf("%s:%d:%d:%d\n", i, d[i][0], d[i][1], d[i][2])
-    }' | sort -t: -k1
+function tasktimes() {
+    [[ $# -eq 0 ]] && return 1
+    duration $1
 }
 }
 
 
 function tasktimestotal() {
 function tasktimestotal() {
-    tasktimes $1 TOTAL
+    set -- $(duration $1)
+
+    # == Total calculation ==
+    DAYS=0
+    TI=0
+    for dur; do
+        # first skip key
+        key=${dur%%|*}
+        dur=${dur#*|}
+
+        days=${dur%%:*}
+        DAYS=$((DAYS+${days:-0}))
+
+        ti=$(printf "1970-01-01 %s" ${dur#*:}|xargs -d '\n' date +%s -u -d)
+        TI=$((TI+$ti))
+
+        if [[ $TI -ge 86400 ]]; then
+            # bigger than a day?
+            DAYS=$((DAYS+1))
+            TI=$((TI-86400))
+        fi
+    done
+    TI="$(date -u -d@${TI} +%X)"
+    echo "${DAYS}:${TI}"
+    # == End Total Calculation ==
 }
 }
 
 
 function taskdescription() {
 function taskdescription() {

@@ -7,11 +7,14 @@ source $0:A:h/ttyhelper.sh
 
 
 function printtimes() {
 function printtimes() {
     local T
     local T
-    for T in $@
+    for T
     do
     do
-        extracttime $T
-        printf "%37s%-4s%10s: %s\n" "spent - " "$(date -d "$TIMEKEY" +%a)" \
-            $TIMEKEY $TIME
+        key=${T%%|*}
+        dur=${T#*|}
+        date="$(date -u -d "${key//_/ }" +%c)"
+        ti=$(printf "1970-01-01 %s" ${dur#*:}|xargs -d '\n' date +%X -u -d)
+        TIME="$(formattime ${dur})"
+        printf "%50s: %14s\n" "${date}" $ti
     done
     done
 }
 }
 
 
@@ -23,14 +26,14 @@ function showall() {
     printf "%s %s %s %s %s\n" \
     printf "%s %s %s %s %s\n" \
         "$(underline -16 project)" \
         "$(underline -16 project)" \
         "$(underline -35 description)" \
         "$(underline -35 description)" \
-        "$(underline -8 spent)" \
+        "$(underline -13 spent)" \
         "$(underline -10 completed)" \
         "$(underline -10 completed)" \
         "$(underline -10 entered)"
         "$(underline -10 entered)"
 
 
     for UUID in $@
     for UUID in $@
     do
     do
-        extracttime $(tasktimes $UUID TOTAL)
-        printf "%-16s %-35s %-10s %-10s %-8s\n" \
+        TIME="$(formattime $(tasktimestotal $UUID))"
+        printf "%-16s %-35s %13s %-10s %-10s\n" \
             "$(truncate "$(taskproject $UUID)" 16)" \
             "$(truncate "$(taskproject $UUID)" 16)" \
             "$(truncate "$(taskdescription $UUID)" 35)" \
             "$(truncate "$(taskdescription $UUID)" 35)" \
             "$(bold "" "$TIME")" \
             "$(bold "" "$TIME")" \
@@ -66,14 +69,17 @@ function timesheet() {
         "$(bold "" "Blocking tasks")" \
         "$(bold "" "Blocking tasks")" \
         "${BLOCKING}"
         "${BLOCKING}"
 
 
+    halfyear="entry.after:$(date -d '6 month ago' +%F)"
+    twoyears="entry.after:$(date -d '2 years ago' +%F)"
+
     printf "%s%s\n\n%s%s\n%s\n\n%s\n\n%s\n" \
     printf "%s%s\n\n%s%s\n%s\n\n%s\n\n%s\n" \
         "$(bold "" "Summary")" \
         "$(bold "" "Summary")" \
         "$(task rc._forcecolor=on $@ summary 2>/dev/null)" \
         "$(task rc._forcecolor=on $@ summary 2>/dev/null)" \
         "$(bold "" "History")" \
         "$(bold "" "History")" \
-        "$(task rc._forcecolor=on $@ history 2>/dev/null)" \
-        "$(task rc._forcecolor=on $@ ghistory 2>/dev/null)" \
-        "$(task rc._forcecolor=on $@ burndown.daily 2>/dev/null)" \
-        "$(task rc._forcecolor=on $@ burndown 2>/dev/null)"
+        "$(task rc._forcecolor=on $@ ${halfyear} history 2>/dev/null)" \
+        "$(task rc._forcecolor=on $@ ${halfyear} ghistory 2>/dev/null)" \
+        "$(task rc._forcecolor=on $@ ${halfyear} burndown.daily 2>/dev/null)" \
+        "$(task rc._forcecolor=on $@ ${twoyears} burndown 2>/dev/null)"
 }
 }
 
 
 function usage() {
 function usage() {