TheWrightServer/ProxmoxVE
1
0
Fork 1
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2025-04-21 10:08:07 +00:00
Code Activity

Refactor Spinner/MSG Function (support now alpine and better performance / handling) (#3436)

Browse Source
This commit is contained in:
CanbiZ 2025-03-27 11:51:40 +01:00 committed by GitHub
parent 3274115041
commit 022472af34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
misc/build.func
View File

@ -29,15 +29,13 @@ color() {
# Formatting # Formatting
CL=$(echo "\033[m") CL=$(echo "\033[m")
UL=$(echo "\033[4m")
BOLD=$(echo "\033[1m") BOLD=$(echo "\033[1m")
BFR="\\r\\033[K"
HOLD=" " HOLD=" "
TAB=" " TAB=" "
# Icons # Icons
CM="${TAB}✔️${TAB}${CL}" CM="${TAB}✔️${TAB}"
CROSS="${TAB}✖️${TAB}${CL}" CROSS="${TAB}✖️${TAB}"
INFO="${TAB}💡${TAB}${CL}" INFO="${TAB}💡${TAB}${CL}"
OS="${TAB}🖥️${TAB}${CL}" OS="${TAB}🖥️${TAB}${CL}"
OSVERSION="${TAB}🌟${TAB}${CL}" OSVERSION="${TAB}🌟${TAB}${CL}"
@ -81,58 +79,75 @@ error_handler() {
} }
# This function displays an informational message with logging support. # This function displays an informational message with logging support.
declare -A MSG_INFO_SHOWN
SPINNER_ACTIVE=0
SPINNER_PID=""
SPINNER_MSG=""
trap 'stop_spinner' EXIT INT TERM HUP
start_spinner() { start_spinner() {
local msg="$1" local msg="$1"
local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏') local frames=(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏)
local spin_i=0 local spin_i=0
local interval=0.1 local interval=0.1
local term_width=$(tput cols)
SPINNER_MSG="$msg"
printf "\r\e[2K" >&2
{ {
while [ "${SPINNER_ACTIVE:-1}" -eq 1 ]; do while [[ "$SPINNER_ACTIVE" -eq 1 ]]; do
printf "\r\e[2K${frames[spin_i]} ${YW}%b${CL}" "$msg" >&2 printf "\r\e[2K%s %b" "${frames[spin_i]}" "${YW}${SPINNER_MSG}${CL}" >&2
spin_i=$(((spin_i + 1) % ${#frames[@]})) spin_i=$(((spin_i + 1) % ${#frames[@]}))
sleep "$interval" sleep "$interval"
done done
} & } &
SPINNER_PID=$! SPINNER_PID=$!
disown "$SPINNER_PID"
}
stop_spinner() {
if [[ ${SPINNER_PID+v} && -n "$SPINNER_PID" ]] && kill -0 "$SPINNER_PID" 2>/dev/null; then
kill "$SPINNER_PID" 2>/dev/null
sleep 0.1
kill -0 "$SPINNER_PID" 2>/dev/null && kill -9 "$SPINNER_PID" 2>/dev/null
wait "$SPINNER_PID" 2>/dev/null || true
fi
SPINNER_ACTIVE=0
unset SPINNER_PID
}
spinner_guard() {
if [[ "$SPINNER_ACTIVE" -eq 1 ]] && [[ -n "$SPINNER_PID" ]]; then
kill "$SPINNER_PID" 2>/dev/null
wait "$SPINNER_PID" 2>/dev/null || true
SPINNER_ACTIVE=0
unset SPINNER_PID
fi
} }
msg_info() { msg_info() {
local msg="$1" local msg="$1"
if [ "${SPINNER_ACTIVE:-0}" -eq 1 ]; then [[ -n "${MSG_INFO_SHOWN["$msg"]+x}" ]] && return
return MSG_INFO_SHOWN["$msg"]=1
fi
spinner_guard
SPINNER_ACTIVE=1 SPINNER_ACTIVE=1
start_spinner "$msg" start_spinner "$msg"
} }
msg_ok() { msg_ok() {
if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then
kill "$SPINNER_PID" >/dev/null 2>&1
wait "$SPINNER_PID" 2>/dev/null || true
fi
local msg="$1" local msg="$1"
printf "\r\e[2K${CM}${GN}%b${CL}\n" "$msg" >&2 stop_spinner
unset SPINNER_PID printf "\r\e[2K%s %b\n" "${CM}" "${GN}${msg}${CL}" >&2
SPINNER_ACTIVE=0 unset MSG_INFO_SHOWN["$msg"]
log_message "OK" "$msg"
} }
msg_error() { msg_error() {
if [ -n "${SPINNER_PID:-}" ] && ps -p "$SPINNER_PID" >/dev/null 2>&1; then stop_spinner
kill "$SPINNER_PID" >/dev/null 2>&1
wait "$SPINNER_PID" 2>/dev/null || true
fi
local msg="$1" local msg="$1"
printf "\r\e[2K${CROSS}${RD}%b${CL}\n" "$msg" >&2 printf "\r\e[2K%s %b\n" "${CROSS}" "${RD}${msg}${CL}" >&2
unset SPINNER_PID
SPINNER_ACTIVE=0
log_message "ERROR" "$msg" log_message "ERROR" "$msg"
} }