command duration fix

lib/command_duration.bash

@@ -3,64 +3,79 @@
 # 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)}"
+function _command_duration_current_time() {
+	local current_time
+	if [[ -n "${EPOCHREALTIME:-}" ]]; then
+		current_time="${EPOCHREALTIME//[!0-9]/.}"
+	else
+		current_time="$SECONDS"
+	fi
+
+	echo "$current_time"
+}
+
+: "${COMMAND_DURATION_START_SECONDS:=$(_command_duration_current_time)}"
 : "${COMMAND_DURATION_ICON:=🕘}"
 : "${COMMAND_DURATION_MIN_SECONDS:=1}"
 
 function _command_duration_pre_exec() {
-	COMMAND_DURATION_START_SECONDS="$(_shell_duration_en)"
+	COMMAND_DURATION_START_SECONDS="$(_command_duration_current_time)"
 }
 
 function _command_duration_pre_cmd() {
 	COMMAND_DURATION_START_SECONDS=""
 }
 
 function _dynamic_clock_icon {
-	local clock_hand
+	local clock_hand duration="$1"
+
+	# Clock only work for time >= 1s
+	if ((duration < 1)); then
+		duration=1
+	fi
+
 	# clock hand value is between 90 and 9b in hexadecimal.
 	# so between 144 and 155 in base 10.
-	printf -v clock_hand '%x' $((((${1:-${SECONDS}} - 1) % 12) + 144))
+	printf -v clock_hand '%x' $((((${duration:-${SECONDS}} - 1) % 12) + 144))
 	printf -v 'COMMAND_DURATION_ICON' '%b' "\xf0\x9f\x95\x$clock_hand"
 }
 
 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}"
+	current_time="$(_command_duration_current_time)"
+
+	local -i command_duration=0
+	local -i minutes=0 seconds=0 deciseconds=0
+
+	local -i command_start_seconds=${COMMAND_DURATION_START_SECONDS%.*}
+	local -i current_time_seconds=${current_time%.*}
+
+	# Calculate seconds difference
+	command_duration=$((current_time_seconds - command_start_seconds))
 
-	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 -i command_start_deciseconds=$((10#${COMMAND_DURATION_START_SECONDS##*.}))
+		local -i current_time_deciseconds="$((10#${current_time##*.}))"
+
+		# Take first digit for deciseconds
+		command_start_deciseconds="${command_start_deciseconds:0:1}"
+		current_time_deciseconds="${current_time_deciseconds:0:1}"
 
 		if ((current_time_deciseconds >= command_start_deciseconds)); then
-			deciseconds="$((current_time_deciseconds - command_start_deciseconds))"
+			deciseconds=$((current_time_deciseconds - command_start_deciseconds))
 		else
 			((command_duration -= 1))
-			deciseconds="$((10 - (command_start_deciseconds - current_time_deciseconds)))"
+			deciseconds=$((10 + current_time_deciseconds - command_start_deciseconds))
 		fi
-	else
+	fi
+
+	if ((command_duration < 0)); then
 		command_duration=0
+		deciseconds=0
 	fi
 
 	if ((command_duration >= COMMAND_DURATION_MIN_SECONDS)); then

plugins/available/cmd-returned-notify.plugin.bash

@@ -6,7 +6,11 @@ url "https://github.com/Bash-it/bash-it"
 function precmd_return_notification() {
 	local command_start="${COMMAND_DURATION_START_SECONDS:=0}"
 	local current_time
-	current_time="$(_shell_duration_en)"
+	if [[ -n "${EPOCHREALTIME:-}" ]]; then
+		current_time="${EPOCHREALTIME//,/.}"
+	else
+		current_time="$SECONDS"
+	fi
 	local -i command_duration="$((${current_time%.*} - ${command_start%.*}))"
 	if [[ "${command_duration}" -gt "${NOTIFY_IF_COMMAND_RETURNS_AFTER:-5}" ]]; then
 		printf '\a'

test/lib/preexec.bats

@@ -60,7 +60,11 @@ function local_setup {
 	assert_success
 
 	__bp_install
-	assert_equal "${PROMPT_COMMAND}" $'__bp_precmd_invoke_cmd\n__bp_interactive_mode'
+	if ((BASH_VERSINFO[0] > 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 1))); then
+		assert_equal "${PROMPT_COMMAND[*]}" $'__bp_precmd_invoke_cmd __bp_interactive_mode'
+	else
+		assert_equal "${PROMPT_COMMAND}" $'__bp_precmd_invoke_cmd\n__bp_interactive_mode'
+	fi
 }
 
 @test "vendor preexec: __bp_install() with existing" {
@@ -75,7 +79,11 @@ function local_setup {
 	assert_success
 
 	__bp_install
-	assert_equal "${PROMPT_COMMAND}" $'__bp_precmd_invoke_cmd\n'"$test_prompt_string"$'\n__bp_interactive_mode'
+	if ((BASH_VERSINFO[0] > 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 1))); then
+		assert_equal "${PROMPT_COMMAND[*]}" $'__bp_precmd_invoke_cmd\n'"$test_prompt_string"$'\n: __bp_interactive_mode'
+	else
+		assert_equal "${PROMPT_COMMAND}" $'__bp_precmd_invoke_cmd\n'"$test_prompt_string"$'\n:\n__bp_interactive_mode'
+	fi
 }
 
 @test "lib preexec: __bp_require_not_readonly()" {

test/plugins/cmd-returned-notify.plugin.bats

@@ -10,7 +10,7 @@ function local_setup_file() {
 
 @test "plugins cmd-returned-notify: notify after elapsed time" {
 	NOTIFY_IF_COMMAND_RETURNS_AFTER=0
-	COMMAND_DURATION_START_SECONDS="$(_shell_duration_en)"
+	COMMAND_DURATION_START_SECONDS="$(_command_duration_current_time)"
 	export COMMAND_DURATION_START_SECONDS NOTIFY_IF_COMMAND_RETURNS_AFTER
 	sleep 1
 	run precmd_return_notification
@@ -20,7 +20,7 @@ function local_setup_file() {
 
 @test "plugins cmd-returned-notify: do not notify before elapsed time" {
 	NOTIFY_IF_COMMAND_RETURNS_AFTER=10
-	COMMAND_DURATION_START_SECONDS="$(_shell_duration_en)"
+	COMMAND_DURATION_START_SECONDS="$(_command_duration_current_time)"
 	export COMMAND_DURATION_START_SECONDS NOTIFY_IF_COMMAND_RETURNS_AFTER
 	sleep 1
 	run precmd_return_notification
@@ -37,7 +37,7 @@ function local_setup_file() {
 @test "lib command_duration: preexec set COMMAND_DURATION_START_SECONDS" {
 	COMMAND_DURATION_START_SECONDS=
 	assert_equal "${COMMAND_DURATION_START_SECONDS}" ""
-	NOW="$(_shell_duration_en)"
+	NOW="$(_command_duration_current_time)"
 	_command_duration_pre_exec
 	# We need to make sure to account for nanoseconds...
 	assert_equal "${COMMAND_DURATION_START_SECONDS%.*}" "${NOW%.*}"