1
0
mirror of https://github.com/tw93/Mole.git synced 2026-02-04 22:04:43 +00:00

Add 'F' key to refresh paginated menus, clarify UI text for search and selection, and improve robustness of BOM file processing

This commit is contained in:
Tw93
2025-12-12 14:33:07 +08:00
parent 42634fbf3d
commit fa75da07ca
5 changed files with 53 additions and 29 deletions

View File

@@ -708,32 +708,34 @@ find_app_receipt_files() {
done < <(find /private/var/db/receipts -name "${bundle_id}*.bom" -print0 2> /dev/null)
fi
for bom_file in "${bom_files[@]}"; do
[[ ! -f "$bom_file" ]] && continue
# Process bom files if any found
if [[ ${#bom_files[@]} -gt 0 ]]; then
for bom_file in "${bom_files[@]}"; do
[[ ! -f "$bom_file" ]] && continue
# Parse bom file
# lsbom -f: file paths only
# -s: suppress output (convert to text)
local bom_content
bom_content=$(lsbom -f -s "$bom_file" 2> /dev/null)
# Parse bom file
# lsbom -f: file paths only
# -s: suppress output (convert to text)
local bom_content
bom_content=$(lsbom -f -s "$bom_file" 2> /dev/null)
while IFS= read -r file_path; do
# Standardize path (remove leading dot)
local clean_path="${file_path#.}"
while IFS= read -r file_path; do
# Standardize path (remove leading dot)
local clean_path="${file_path#.}"
# Ensure it starts with /
if [[ "$clean_path" != /* ]]; then
clean_path="/$clean_path"
fi
# Ensure it starts with /
if [[ "$clean_path" != /* ]]; then
clean_path="/$clean_path"
fi
# ------------------------------------------------------------------------
# SAFETY FILTER: Only allow specific removal paths
# ------------------------------------------------------------------------
local is_safe=false
# ------------------------------------------------------------------------
# SAFETY FILTER: Only allow specific removal paths
# ------------------------------------------------------------------------
local is_safe=false
# Whitelisted prefixes
case "$clean_path" in
/Applications/*) is_safe=true ;;
# Whitelisted prefixes
case "$clean_path" in
/Applications/*) is_safe=true ;;
/Users/*) is_safe=true ;;
/usr/local/*) is_safe=true ;;
/opt/*) is_safe=true ;;
@@ -782,7 +784,7 @@ find_app_receipt_files() {
done <<< "$bom_content"
done
fi
if [[ ${#receipt_files[@]} -gt 0 ]]; then
printf '%s\n' "${receipt_files[@]}"
fi

View File

@@ -85,6 +85,11 @@ select_apps_for_uninstall() {
unset MOLE_MENU_META_EPOCHS MOLE_MENU_META_SIZEKB
# leave MOLE_MENU_SORT_DEFAULT untouched if user set it globally
# Refresh signal handling
if [[ $exit_code -eq 10 ]]; then
return 10
fi
if [[ $exit_code -ne 0 ]]; then
echo "Cancelled"
return 1

View File

@@ -474,11 +474,11 @@ paginated_multi_select() {
fi
# Footer: single line with controls
local sep=" ${GRAY}|${NC} "
local sep=" ${GRAY}|${NC} "
if [[ "$filter_mode" == "true" ]]; then
# Filter mode: simple controls without sort
local -a _segs_filter=(
"${GRAY}Filter: ${filter_status}${NC}"
"${GRAY}Search: ${filter_status}${NC}"
"${GRAY}Delete${NC}"
"${GRAY}Enter Confirm${NC}"
"${GRAY}ESC Cancel${NC}"
@@ -490,7 +490,7 @@ paginated_multi_select() {
[[ "$sort_reverse" == "true" ]] && reverse_arrow="↓"
# Determine filter text based on whether filter is active
local filter_text="/ Filter"
local filter_text="/ Search"
[[ -n "$applied_query" ]] && filter_text="/ Clear"
if [[ "$has_metadata" == "true" ]]; then
@@ -508,8 +508,9 @@ paginated_multi_select() {
# Normal: show full controls
local -a _segs_all=(
"${GRAY}${ICON_NAV_UP}${ICON_NAV_DOWN}${NC}"
"${GRAY}Space${NC}"
"${GRAY}Space Select${NC}"
"${GRAY}Enter${NC}"
"${GRAY}F Refresh${NC}"
"${GRAY}${filter_text}${NC}"
"${GRAY}S ${sort_status}${NC}"
"${GRAY}R ${reverse_arrow}${NC}"
@@ -521,7 +522,7 @@ paginated_multi_select() {
# Without metadata: basic controls
local -a _segs_simple=(
"${GRAY}${ICON_NAV_UP}${ICON_NAV_DOWN}${NC}"
"${GRAY}Space${NC}"
"${GRAY}Space Select${NC}"
"${GRAY}Enter${NC}"
"${GRAY}${filter_text}${NC}"
"${GRAY}Q Exit${NC}"
@@ -643,6 +644,10 @@ paginated_multi_select() {
"CHAR:f" | "CHAR:F")
if [[ "$filter_mode" == "true" ]]; then
filter_query+="${key#CHAR:}"
else
# Trigger Refresh signal
cleanup
return 10
fi
;;
"CHAR:r")