mirrors/Mole
1
0
Fork 0
mirror of https://github.com/tw93/Mole.git synced 2026-02-16 08:21:18 +00:00
Code Activity

fix(ui): standardize spacing in terminal control functions and improve readability

Browse Source
This commit is contained in:
tw93
2026-02-07 10:31:15 +08:00
parent 02843dee74
commit a2afb786af
1 changed files with 304 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/ui/menu_paginated.sh
View File

@@ -5,13 +5,13 @@ set -euo pipefail
# Terminal control functions
enter_alt_screen() {
if command -v tput >/dev/null 2>&1 && [[ -t 1 ]]; then
tput smcup 2>/dev/null || true
if command -v tput > /dev/null 2>&1 && [[ -t 1 ]]; then
tput smcup 2> /dev/null || true
fi
}
leave_alt_screen() {
if command -v tput >/dev/null 2>&1 && [[ -t 1 ]]; then
tput rmcup 2>/dev/null || true
if command -v tput > /dev/null 2>&1 && [[ -t 1 ]]; then
tput rmcup 2> /dev/null || true
fi
}
@@ -22,13 +22,13 @@ _pm_get_terminal_height() {
# Try stty size first (most reliable, real-time)
# Use </dev/tty to ensure we read from terminal even if stdin is redirected
if [[ -t 0 ]] || [[ -t 2 ]]; then
height=$(stty size </dev/tty 2>/dev/null | awk '{print $1}')
height=$(stty size < /dev/tty 2> /dev/null | awk '{print $1}')
fi
# Fallback to tput
if [[ -z "$height" || $height -le 0 ]]; then
if command -v tput >/dev/null 2>&1; then
height=$(tput lines 2>/dev/null || echo "24")
if command -v tput > /dev/null 2>&1; then
height=$(tput lines 2> /dev/null || echo "24")
else
height=24
fi
@@ -110,7 +110,7 @@ paginated_multi_select() {
has_metadata="true"
fi
if [[ -n "${MOLE_MENU_FILTER_NAMES:-}" ]]; then
while IFS= read -r v; do filter_names+=("$v"); done <<<"$MOLE_MENU_FILTER_NAMES"
while IFS= read -r v; do filter_names+=("$v"); done <<< "$MOLE_MENU_FILTER_NAMES"
has_filter_names="true"
fi
@@ -149,7 +149,7 @@ paginated_multi_select() {
if [[ -n "${MOLE_PRESELECTED_INDICES:-}" ]]; then
local cleaned_preselect="${MOLE_PRESELECTED_INDICES//[[:space:]]/}"
local -a initial_indices=()
IFS=',' read -ra initial_indices <<<"$cleaned_preselect"
IFS=',' read -ra initial_indices <<< "$cleaned_preselect"
for idx in "${initial_indices[@]}"; do
if [[ "$idx" =~ ^[0-9]+$ && $idx -ge 0 && $idx -lt $total_items ]]; then
# Only count if not already selected (handles duplicates)
@@ -163,16 +163,16 @@ paginated_multi_select() {
# Preserve original TTY settings so we can restore them reliably
local original_stty=""
if [[ -t 0 ]] && command -v stty >/dev/null 2>&1; then
original_stty=$(stty -g 2>/dev/null || echo "")
if [[ -t 0 ]] && command -v stty > /dev/null 2>&1; then
original_stty=$(stty -g 2> /dev/null || echo "")
fi
restore_terminal() {
show_cursor
if [[ -n "${original_stty-}" ]]; then
stty "${original_stty}" 2>/dev/null || stty sane 2>/dev/null || stty echo icanon 2>/dev/null || true
stty "${original_stty}" 2> /dev/null || stty sane 2> /dev/null || stty echo icanon 2> /dev/null || true
else
stty sane 2>/dev/null || stty echo icanon 2>/dev/null || true
stty sane 2> /dev/null || stty echo icanon 2> /dev/null || true
fi
if [[ "${external_alt_screen:-false}" == false ]]; then
leave_alt_screen
@@ -198,7 +198,7 @@ paginated_multi_select() {
trap handle_interrupt INT TERM
# Setup terminal - preserve interrupt character
stty -echo -icanon intr ^C 2>/dev/null || true
stty -echo -icanon intr ^C 2> /dev/null || true
if [[ $external_alt_screen == false ]]; then
enter_alt_screen
# Clear screen once on entry to alt screen
@@ -219,7 +219,7 @@ paginated_multi_select() {
local -a segs=("$@")
local cols="${COLUMNS:-}"
[[ -z "$cols" ]] && cols=$(tput cols 2>/dev/null || echo 80)
[[ -z "$cols" ]] && cols=$(tput cols 2> /dev/null || echo 80)
[[ "$cols" =~ ^[0-9]+$ ]] || cols=80
_strip_ansi_len() {
@@ -286,7 +286,7 @@ paginated_multi_select() {
fi
local tmpfile
tmpfile=$(mktemp 2>/dev/null) || tmpfile=""
tmpfile=$(mktemp 2> /dev/null) || tmpfile=""
if [[ -n "$tmpfile" ]]; then
local k id
for id in "${orig_indices[@]}"; do
@@ -295,14 +295,14 @@ paginated_multi_select() {
size) k="${sizekb[id]:-0}" ;;
name | *) k="${items[id]}|${id}" ;;
esac
printf "%s\t%s\n" "$k" "$id" >>"$tmpfile"
printf "%s\t%s\n" "$k" "$id" >> "$tmpfile"
done
sorted_indices_cache=()
while IFS=$'\t' read -r _key _id; do
[[ -z "$_id" ]] && continue
sorted_indices_cache+=("$_id")
done < <(LC_ALL=C sort -t $'\t' $sort_key -- "$tmpfile" 2>/dev/null)
done < <(LC_ALL=C sort -t $'\t' $sort_key -- "$tmpfile" 2> /dev/null)
rm -f "$tmpfile"
else
@@ -518,7 +518,7 @@ paginated_multi_select() {
elif [[ "$has_metadata" == "true" ]]; then
# With metadata: show sort controls
local term_width="${COLUMNS:-}"
[[ -z "$term_width" ]] && term_width=$(tput cols 2>/dev/null || echo 80)
[[ -z "$term_width" ]] && term_width=$(tput cols 2> /dev/null || echo 80)
[[ "$term_width" =~ ^[0-9]+$ ]] || term_width=80
# Full controls