1
0
mirror of https://github.com/tw93/Mole.git synced 2026-02-09 14:19:18 +00:00

🐛 Normalize output tags

This commit is contained in:
Tw93
2025-10-05 22:16:25 +08:00
parent 79b1f53c7a
commit 3ff933f5d5
8 changed files with 154 additions and 125 deletions

View File

@@ -720,7 +720,7 @@ display_cleanup_suggestions() {
echo ""
echo " ${YELLOW}Tip:${NC} Run 'mole clean' to perform cleanup operations"
else
echo " ${GREEN}${NC} No obvious cleanup opportunities found"
echo " ${BLUE}${NC} No obvious cleanup opportunities found"
fi
echo ""
}
@@ -1272,11 +1272,11 @@ scan_directory_contents_fast() {
xargs -0 -n 1 -P "$num_jobs" sh -c '
dir="$1"
size=""
# Ultra-fast strategy: Try du with 1 second timeout only
du -sk "$dir" 2>/dev/null > /tmp/mole_du_$$ &
du_pid=$!
# Wait only 1 second (aggressive!)
if ! sleep 1 || kill -0 $du_pid 2>/dev/null; then
# Still running after 1s = large dir, kill it
@@ -1289,7 +1289,7 @@ scan_directory_contents_fast() {
size=$(cat /tmp/mole_du_$$ 2>/dev/null | cut -f1)
rm -f /tmp/mole_du_$$ 2>/dev/null
fi
# If timeout or empty, use instant estimation
if [[ -z "$size" ]] || [[ "$size" -eq 0 ]]; then
# Ultra-fast: count only immediate files (no recursion)
@@ -1297,7 +1297,7 @@ scan_directory_contents_fast() {
size=$(find "$dir" -type f -maxdepth 1 -print0 2>/dev/null | \
xargs -0 stat -f%z 2>/dev/null | \
awk "BEGIN{sum=0} {sum+=\$1} END{print int(sum/1024)}")
# If still 0, mark as unknown but ensure it shows up
[[ -z "$size" ]] || [[ "$size" -eq 0 ]] && size=1
fi
@@ -1318,7 +1318,7 @@ scan_directory_contents_fast() {
((i++))
sleep 0.1 # Faster animation (100ms per frame)
((tick++))
# Update elapsed seconds every 10 ticks (1 second)
if [[ $((tick % 10)) -eq 0 ]]; then
((elapsed++))
@@ -1343,7 +1343,7 @@ scan_directory_contents_fast() {
# Wait for completion (non-blocking if already killed)
wait "$file_pid" 2>/dev/null || true
wait "$dir_pid" 2>/dev/null || true
# Small delay only if scan was very fast (let user see the spinner briefly)
if [[ "$show_progress" == "true" ]] && [[ ${elapsed:-0} -lt 1 ]]; then
sleep 0.2
@@ -1592,8 +1592,6 @@ interactive_drill_down() {
# Ensure cursor is always hidden during navigation
printf "\033[?25l" >&2
# Drain any burst input (e.g. trackpad scroll converted to many arrow keys)
type drain_pending_input >/dev/null 2>&1 && drain_pending_input
# Only scan if needed (directory changed or refresh requested)
if [[ "$need_scan" == "true" ]]; then
# Generate cache key (use md5 hash of path)
@@ -1632,7 +1630,7 @@ interactive_drill_down() {
has_calculating=false
need_scan=false
wait_for_calc=false
# Reset scroll when entering new directory
scroll_offset=0
@@ -1701,7 +1699,7 @@ interactive_drill_down() {
local page_start=$scroll_offset
local page_end=$((scroll_offset + max_show))
[[ $page_end -gt $total_items ]] && page_end=$total_items
local display_idx=0
local idx=0
for item_info in "${items[@]}"; do
@@ -1710,7 +1708,7 @@ interactive_drill_down() {
((idx++))
continue
fi
# Stop if we've shown enough items for this page
if [[ $idx -ge $page_end ]]; then
break
@@ -1782,10 +1780,7 @@ interactive_drill_down() {
# Output everything at once (single write = no flicker)
printf "%b" "$output" >&2
# Drain any pending input to prevent escape sequence leakage
drain_pending_input 2>/dev/null || true
# Read key (suppress any escape sequences that might leak)
# Read key directly without draining (to preserve all user input)
local key
key=$(read_key 2>/dev/null || echo "OTHER")
@@ -1832,41 +1827,75 @@ interactive_drill_down() {
need_scan=true
else
# It's a file - open it for viewing
# Exit alternate screen temporarily
printf "\033[?25h" # Show cursor
tput rmcup 2>/dev/null || true
# Try to open with system default viewer
local file_ext="${selected_path##*.}"
local filename=$(basename "$selected_path")
local open_success=false
# For text-like files, use less
# For text-like files, use less or fallback to open
case "$file_ext" in
txt|log|md|json|xml|yaml|yml|conf|cfg|ini|sh|bash|zsh|py|js|ts|go|rs|c|cpp|h|java|rb|php|html|css|sql)
# Clear screen and show loading message
printf "\033[H\033[J"
echo ""
echo " ${BLUE}📄 Opening: $filename${NC}"
echo ""
# Try less first (best for text viewing)
if command -v less &>/dev/null; then
# Exit alternate screen only for less
printf "\033[?25h" # Show cursor
tput rmcup 2>/dev/null || true
less -F "$selected_path" 2>/dev/null && open_success=true
# Return to alternate screen
tput smcup 2>/dev/null || true
printf "\033[?25l" # Hide cursor
else
# Fallback to system open if less is not available
echo " ${GRAY}Launching default application...${NC}"
if command -v open &>/dev/null; then
open "$selected_path" 2>/dev/null && open_success=true
if [[ "$open_success" == "true" ]]; then
echo ""
echo " ${BLUE}${NC} File opened in external app"
sleep 0.8
fi
fi
fi
;;
*)
# For other files, try system open
# For other files, use system open (keep in alternate screen)
# Show message without flashing
printf "\033[H\033[J"
echo ""
echo " ${BLUE}📦 Opening: $filename${NC}"
echo ""
echo " ${GRAY}Launching default application...${NC}"
if command -v open &>/dev/null; then
open "$selected_path" 2>/dev/null && open_success=true
sleep 0.5 # Give time for app to launch
# Show brief success message
if [[ "$open_success" == "true" ]]; then
echo ""
echo " ${BLUE}${NC} File opened in external app"
sleep 0.8
fi
fi
;;
esac
# If nothing worked, show a message
# If nothing worked, show error message
if [[ "$open_success" != "true" ]]; then
printf "\033[H\033[J"
echo ""
echo " ${YELLOW}File: $selected_path${NC}"
echo " ${YELLOW}⚠️ Could not open file${NC}"
echo ""
echo " ${GRAY}File: $selected_path${NC}"
echo " ${GRAY}Press any key to return...${NC}"
read -n 1 -s 2>/dev/null
fi
# Return to alternate screen
tput smcup 2>/dev/null || true
printf "\033[?25l" # Hide cursor
fi
fi
;;
@@ -1973,7 +2002,7 @@ interactive_drill_down() {
fi
if [[ "$delete_success" == "true" ]]; then
echo " ${GREEN}✓ Deleted successfully${NC}"
echo " ${BLUE}✓ Deleted successfully${NC}"
echo " ${GRAY}Freed: $human_size${NC}"
sleep 0.8

View File

@@ -63,21 +63,21 @@ start_spinner() {
local message="$1"
if [[ ! -t 1 ]]; then
echo -n " ${BLUE}🔍${NC} $message"
echo -n " ${BLUE}${NC} $message"
return
fi
echo -n " ${BLUE}🔍${NC} $message"
echo -n " ${BLUE}${NC} $message"
(
local delay=0.5
while true; do
printf "\r ${BLUE}🔍${NC} $message. "
printf "\r ${BLUE}${NC} $message. "
sleep $delay
printf "\r ${BLUE}🔍${NC} $message.. "
printf "\r ${BLUE}${NC} $message.. "
sleep $delay
printf "\r ${BLUE}🔍${NC} $message..."
printf "\r ${BLUE}${NC} $message..."
sleep $delay
printf "\r ${BLUE}🔍${NC} $message "
printf "\r ${BLUE}${NC} $message "
sleep $delay
done
) &
@@ -96,9 +96,9 @@ stop_spinner() {
kill "$SPINNER_PID" 2>/dev/null
wait "$SPINNER_PID" 2>/dev/null
SPINNER_PID=""
printf "\r ${GREEN}${NC} %s\n" "$result_message"
printf "\r ${BLUE}${NC} %s\n" "$result_message"
else
echo " ${GREEN}${NC} $result_message"
echo " ${BLUE}${NC} $result_message"
fi
}
@@ -111,7 +111,7 @@ start_section() {
end_section() {
if [[ $TRACK_SECTION -eq 1 && $SECTION_ACTIVITY -eq 0 ]]; then
echo -e " ${BLUE}${NC} Nothing to tidy"
echo -e " ${BLUE}${NC} Nothing to tidy"
fi
TRACK_SECTION=0
}
@@ -156,7 +156,7 @@ safe_clean() {
# Show progress indicator for potentially slow operations
if [[ ${#existing_paths[@]} -gt 3 ]]; then
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Checking $description...\r"
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Checking $description...\r"
local temp_dir=$(mktemp -d)
# Parallel processing (bash 3.2 compatible)
@@ -197,7 +197,7 @@ safe_clean() {
rm -rf "$temp_dir"
else
# Show progress for small batches too (simpler jobs)
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Checking $description...\r"
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Checking $description...\r"
for path in "${existing_paths[@]}"; do
local size_bytes=$(du -sk "$path" 2>/dev/null | awk '{print $1}' || echo "0")
@@ -235,7 +235,7 @@ safe_clean() {
if [[ "$DRY_RUN" == "true" ]]; then
echo -e " ${YELLOW}${NC} $label ${YELLOW}($size_human, dry)${NC}"
else
echo -e " ${GREEN}${NC} $label ${GREEN}($size_human)${NC}"
echo -e " ${BLUE}${NC} $label ${GREEN}($size_human)${NC}"
fi
((files_cleaned+=total_count))
((total_size_cleaned+=total_size_bytes))
@@ -442,10 +442,10 @@ perform_cleanup() {
start_section "Developer tools"
# Node.js ecosystem
if command -v npm >/dev/null 2>&1; then
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning npm cache...\r"
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning npm cache...\r"
npm cache clean --force >/dev/null 2>&1 || true
[[ -t 1 ]] && echo -ne "\r\033[K"
echo -e " ${GREEN}${NC} npm cache cleaned"
echo -e " ${BLUE}${NC} npm cache cleaned"
note_activity
fi
@@ -455,10 +455,10 @@ perform_cleanup() {
# Python ecosystem
if command -v pip3 >/dev/null 2>&1; then
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning pip cache...\r"
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning pip cache...\r"
pip3 cache purge >/dev/null 2>&1 || true
[[ -t 1 ]] && echo -ne "\r\033[K"
echo -e " ${GREEN}${NC} pip cache cleaned"
echo -e " ${BLUE}${NC} pip cache cleaned"
note_activity
fi
@@ -468,11 +468,11 @@ perform_cleanup() {
# Go ecosystem
if command -v go >/dev/null 2>&1; then
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning Go cache...\r"
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning Go cache...\r"
go clean -modcache >/dev/null 2>&1 || true
go clean -cache >/dev/null 2>&1 || true
[[ -t 1 ]] && echo -ne "\r\033[K"
echo -e " ${GREEN}${NC} Go cache cleaned"
echo -e " ${BLUE}${NC} Go cache cleaned"
note_activity
fi
@@ -484,20 +484,20 @@ perform_cleanup() {
# Docker (only clean build cache, preserve images and volumes)
if command -v docker >/dev/null 2>&1; then
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning Docker build cache...\r"
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning Docker build cache...\r"
docker builder prune -af >/dev/null 2>&1 || true
[[ -t 1 ]] && echo -ne "\r\033[K"
echo -e " ${GREEN}${NC} Docker build cache cleaned"
echo -e " ${BLUE}${NC} Docker build cache cleaned"
note_activity
fi
# Container tools
safe_clean ~/.kube/cache/* "Kubernetes cache"
if command -v podman >/dev/null 2>&1; then
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning Podman build cache...\r"
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning Podman build cache...\r"
podman system prune -f >/dev/null 2>&1 || true
[[ -t 1 ]] && echo -ne "\r\033[K"
echo -e " ${GREEN}${NC} Podman build cache cleaned"
echo -e " ${BLUE}${NC} Podman build cache cleaned"
note_activity
fi
safe_clean ~/.local/share/containers/storage/tmp/* "Container storage temp"
@@ -512,10 +512,10 @@ perform_cleanup() {
safe_clean /opt/homebrew/var/homebrew/locks/* "Homebrew lock files (M series)"
safe_clean /usr/local/var/homebrew/locks/* "Homebrew lock files (Intel)"
if command -v brew >/dev/null 2>&1; then
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning Homebrew...\r"
[[ -t 1 ]] && echo -ne " ${BLUE}${NC} Cleaning Homebrew...\r"
brew cleanup >/dev/null 2>&1 || true
[[ -t 1 ]] && echo -ne "\r\033[K"
echo -e " ${GREEN}${NC} Homebrew cache cleaned"
echo -e " ${BLUE}${NC} Homebrew cache cleaned"
note_activity
fi
@@ -774,7 +774,7 @@ perform_cleanup() {
start_section "Orphaned app caches"
# Build a list of installed application bundle identifiers
echo -n " ${BLUE}🔍${NC} Scanning installed applications..."
echo -n " ${BLUE}${NC} Scanning installed applications..."
local installed_bundles=$(mktemp)
# Scan both system and user application directories
@@ -785,12 +785,12 @@ perform_cleanup() {
fi
done
local app_count=$(wc -l < "$installed_bundles" | tr -d ' ')
echo " ${GREEN}${NC} Found $app_count apps"
echo " ${BLUE}${NC} Found $app_count apps"
local cache_count=0
# Check for orphaned caches (safe to remove - caches are regenerable)
echo -n " ${BLUE}🔍${NC} Scanning orphaned cache directories..."
echo -n " ${BLUE}${NC} Scanning orphaned cache directories..."
if ls ~/Library/Caches/com.* >/dev/null 2>&1; then
for cache_dir in ~/Library/Caches/com.*; do
[[ -d "$cache_dir" ]] || continue
@@ -805,7 +805,7 @@ perform_cleanup() {
fi
done
fi
echo " ${GREEN}${NC} Complete ($cache_count removed)"
echo " ${BLUE}${NC} Complete ($cache_count removed)"
# Clean up temp file
rm -f "$installed_bundles"

View File

@@ -144,11 +144,11 @@ scan_applications() {
# Smart display name selection - prefer descriptive names over generic ones
local candidates=()
# Get all potential names
local bundle_display_name=$(plutil -extract CFBundleDisplayName raw "$app_path/Contents/Info.plist" 2>/dev/null)
local bundle_name=$(plutil -extract CFBundleName raw "$app_path/Contents/Info.plist" 2>/dev/null)
# Check if executable name is generic/technical (should be avoided)
local is_generic_executable=false
if [[ -n "$bundle_executable" ]]; then
@@ -158,35 +158,35 @@ scan_applications() {
;;
esac
fi
# Priority order for name selection:
# 1. App folder name (if ASCII and descriptive) - often the most complete name
if [[ "$app_name" =~ ^[A-Za-z0-9\ ._-]+$ && ${#app_name} -gt 3 ]]; then
candidates+=("$app_name")
fi
# 2. CFBundleDisplayName (if meaningful and ASCII)
if [[ -n "$bundle_display_name" && "$bundle_display_name" =~ ^[A-Za-z0-9\ ._-]+$ ]]; then
candidates+=("$bundle_display_name")
fi
# 3. CFBundleName (if meaningful and ASCII)
# 3. CFBundleName (if meaningful and ASCII)
if [[ -n "$bundle_name" && "$bundle_name" =~ ^[A-Za-z0-9\ ._-]+$ && "$bundle_name" != "$bundle_display_name" ]]; then
candidates+=("$bundle_name")
fi
# 4. CFBundleExecutable (only if not generic and ASCII)
if [[ -n "$bundle_executable" && "$bundle_executable" =~ ^[A-Za-z0-9._-]+$ && "$is_generic_executable" == false ]]; then
candidates+=("$bundle_executable")
fi
# 5. Fallback to non-ASCII names if no ASCII found
if [[ ${#candidates[@]} -eq 0 ]]; then
[[ -n "$bundle_display_name" ]] && candidates+=("$bundle_display_name")
[[ -n "$bundle_name" && "$bundle_name" != "$bundle_display_name" ]] && candidates+=("$bundle_name")
candidates+=("$app_name")
fi
# Select the first (best) candidate
display_name="${candidates[0]:-$app_name}"
@@ -404,11 +404,11 @@ uninstall_applications() {
# Show what will be removed
echo -e " ${YELLOW}Files to be removed:${NC}"
echo -e " ${GREEN}${NC} Application: $(echo "$app_path" | sed "s|$HOME|~|")"
echo -e " ${BLUE}${NC} Application: $(echo "$app_path" | sed "s|$HOME|~|")"
# Show user-level files
while IFS= read -r file; do
[[ -n "$file" && -e "$file" ]] && echo -e " ${GREEN}${NC} $(echo "$file" | sed "s|$HOME|~|")"
[[ -n "$file" && -e "$file" ]] && echo -e " ${BLUE}${NC} $(echo "$file" | sed "s|$HOME|~|")"
done <<< "$related_files"
# Show system-level files
@@ -435,7 +435,7 @@ uninstall_applications() {
if [[ $REPLY =~ ^[Yy]$ ]]; then
# Remove the application
if rm -rf "$app_path" 2>/dev/null; then
echo -e " ${GREEN}${NC} Removed application"
echo -e " ${BLUE}${NC} Removed application"
else
log_error "Failed to remove $app_path"
continue
@@ -445,7 +445,7 @@ uninstall_applications() {
while IFS= read -r file; do
if [[ -n "$file" && -e "$file" ]]; then
if rm -rf "$file" 2>/dev/null; then
echo -e " ${GREEN}${NC} Removed $(echo "$file" | sed "s|$HOME|~|" | xargs basename)"
echo -e " ${BLUE}${NC} Removed $(echo "$file" | sed "s|$HOME|~|" | xargs basename)"
fi
fi
done <<< "$related_files"
@@ -456,7 +456,7 @@ uninstall_applications() {
while IFS= read -r file; do
if [[ -n "$file" && -e "$file" ]]; then
if sudo rm -rf "$file" 2>/dev/null; then
echo -e " ${GREEN}${NC} Removed [System] $(basename "$file")"
echo -e " ${BLUE}${NC} Removed [System] $(basename "$file")"
else
log_warning "Failed to remove system file: $file"
fi
@@ -508,7 +508,7 @@ trap cleanup EXIT INT TERM
main() {
# Hide cursor during operation
hide_cursor
# Scan applications
local apps_file=$(scan_applications)