Enhance duration formatting in computeDuration function for better re…

…adability
fchastanet · Dec 23, 2024 · 17f4e6c · 17f4e6c
1 parent 96a78bc
commit 17f4e6c
Show file tree

Hide file tree

Showing 12 changed files with 144 additions and 12 deletions.
diff --git a/bin/awkLint b/bin/awkLint
@@ -420,6 +420,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -428,7 +429,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/buildPushDockerImage b/bin/buildPushDockerImage
@@ -408,6 +408,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -416,7 +417,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/definitionLint b/bin/definitionLint
@@ -346,6 +346,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -354,7 +355,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/doc b/bin/doc
@@ -724,6 +724,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -732,7 +733,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/dockerLint b/bin/dockerLint
@@ -527,6 +527,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -535,7 +536,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/findShebangFiles b/bin/findShebangFiles
@@ -391,6 +391,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -399,7 +400,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/frameworkLint b/bin/frameworkLint
@@ -482,6 +482,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -490,7 +491,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/installRequirements b/bin/installRequirements
@@ -645,6 +645,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -653,7 +654,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/megalinter b/bin/megalinter
@@ -431,6 +431,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -439,7 +440,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/plantuml b/bin/plantuml
@@ -362,6 +362,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -370,7 +371,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/bin/shellcheckLint b/bin/shellcheckLint
@@ -391,6 +391,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -399,7 +400,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

diff --git a/src/Log/computeDuration.sh b/src/Log/computeDuration.sh
@@ -18,6 +18,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -26,7 +27,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034