command duration fix

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ minimum_pre_commit_version: 1.18.1
 exclude: "docs/_build/|vendor/"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
         exclude: ".(md|rst)$"
@@ -15,14 +15,14 @@ repos:
       - id: mixed-line-ending
       - id: check-added-large-files
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 2.1.5
+    rev: 3.0.0
     hooks:
       - id: git-check  # Configure in .gitattributes
       - id: shellcheck
         files: "\\.(bash)$"
       - id: shfmt
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.1.7
+    rev: v1.5.6
     hooks:
       # - id: forbid-crlf
       - id: remove-crlf

lib/command_duration.bash

@@ -3,25 +3,17 @@
 # Functions for measuring and reporting how long a command takes to run.
 
 # Get shell duration in decimal format regardless of runtime locale.
-# Notice: This function runs as a sub-shell - notice '(' vs '{'.
-function _shell_duration_en() (
-	# DFARREL You would think LC_NUMERIC would do it, but not working in my local.
-	# Note: LC_ALL='en_US.UTF-8' has been used to enforce the decimal point to be
-	# a period, but the specific locale 'en_US.UTF-8' is not ensured to exist in
-	# the system.  One should instead use the locale 'C', which is ensured by the
-	# C and POSIX standards.
-	local LC_ALL=C
-	printf "%s" "${EPOCHREALTIME:-$SECONDS}"
-)
-
-: "${COMMAND_DURATION_START_SECONDS:=$(_shell_duration_en)}"
-: "${COMMAND_DURATION_ICON:=🕘}"
-: "${COMMAND_DURATION_MIN_SECONDS:=1}"
-
 function _command_duration_pre_exec() {
-	COMMAND_DURATION_START_SECONDS="$(_shell_duration_en)"
+	if [[ -n "${EPOCHREALTIME:-}" ]]; then
+		COMMAND_DURATION_START_SECONDS="${EPOCHREALTIME//,/.}"
+	else
+		COMMAND_DURATION_START_SECONDS="$SECONDS"
+	fi
 }
 
+: "${COMMAND_DURATION_ICON:=🕘}"
+: "${COMMAND_DURATION_MIN_SECONDS:=1}"
+
 function _command_duration_pre_cmd() {
 	COMMAND_DURATION_START_SECONDS=""
 }
@@ -38,29 +30,42 @@ function _command_duration() {
 	[[ -n "${BASH_IT_COMMAND_DURATION:-}" ]] || return
 	[[ -n "${COMMAND_DURATION_START_SECONDS:-}" ]] || return
 
-	local command_duration=0 command_start="${COMMAND_DURATION_START_SECONDS:-0}"
-	local -i minutes=0 seconds=0 deciseconds=0
-	local -i command_start_seconds="${command_start%.*}"
-	local -i command_start_deciseconds=$((10#${command_start##*.}))
-	command_start_deciseconds="${command_start_deciseconds:0:1}"
 	local current_time
-	current_time="$(_shell_duration_en)"
-	local -i current_time_seconds="${current_time%.*}"
-	local -i current_time_deciseconds="$((10#${current_time##*.}))"
-	current_time_deciseconds="${current_time_deciseconds:0:1}"
+	if [[ -n "${EPOCHREALTIME:-}" ]]; then
+		current_time="${EPOCHREALTIME//,/.}"
+	else
+		current_time="$SECONDS"
+	fi
+
+	local -i command_duration=0
+	local -i minutes=0 seconds=0 deciseconds=0
+
+	local -i start_s=${COMMAND_DURATION_START_SECONDS%.*}
+	local -i curr_s=${current_time%.*}
+
+	# Calculate seconds difference
+	command_duration=$((curr_s - start_s))
 
-	if [[ "${command_start_seconds:-0}" -gt 0 ]]; then
-		# seconds
-		command_duration="$((current_time_seconds - command_start_seconds))"
+	# Calculate deciseconds if both timestamps have fractional parts
+	if [[ "$COMMAND_DURATION_START_SECONDS" == *.* ]] && [[ "$current_time" == *.* ]]; then
+		local start_fs="${COMMAND_DURATION_START_SECONDS#*.}"
+		local curr_fs="${current_time#*.}"
 
-		if ((current_time_deciseconds >= command_start_deciseconds)); then
-			deciseconds="$((current_time_deciseconds - command_start_deciseconds))"
+		# Take first digit for deciseconds
+		local -i start_ds="${start_fs:0:1}"
+		local -i curr_ds="${curr_fs:0:1}"
+
+		if ((curr_ds >= start_ds)); then
+			deciseconds=$((curr_ds - start_ds))
 		else
 			((command_duration -= 1))
-			deciseconds="$((10 - (command_start_deciseconds - current_time_deciseconds)))"
+			deciseconds=$((10 + curr_ds - start_ds))
 		fi
-	else
+	fi
+
+	if ((command_duration < 0)); then
 		command_duration=0
+		deciseconds=0
 	fi
 
 	if ((command_duration >= COMMAND_DURATION_MIN_SECONDS)); then