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

fix: P1/P2 issues in file ops, menu state, and logging

Browse Source 
- Fix safe_sudo_remove early exit on error (P1)
- Fix menu filter state leakage in paginated menu (P2)
- Fix cleanup of MOLE_MENU_FILTER_NAMES in app selector (P2)
- Correct log_operation signature for memory dumps (P2)
- Apply minor formatting fixes to dev cleanup module
This commit is contained in:
tw93
2026-02-07 11:21:37 +08:00
parent 6f8f16ce48
commit 361d0dda05
5 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/clean/dev.sh
View File

@@ -6,7 +6,7 @@ clean_tool_cache() {
local description="$1" local description="$1"
shift shift
if [[ "$DRY_RUN" != "true" ]]; then if [[ "$DRY_RUN" != "true" ]]; then
if "$@" >/dev/null 2>&1; then if "$@" > /dev/null 2>&1; then
echo -e " ${GREEN}${ICON_SUCCESS}${NC} $description" echo -e " ${GREEN}${ICON_SUCCESS}${NC} $description"
fi fi
else else
@@ -16,18 +16,18 @@ clean_tool_cache() {
} }
# npm/pnpm/yarn/bun caches. # npm/pnpm/yarn/bun caches.
clean_dev_npm() { clean_dev_npm() {
if command -v npm >/dev/null 2>&1; then if command -v npm > /dev/null 2>&1; then
clean_tool_cache "npm cache" npm cache clean --force clean_tool_cache "npm cache" npm cache clean --force
note_activity note_activity
fi fi
# Clean pnpm store cache # Clean pnpm store cache
local pnpm_default_store=~/Library/pnpm/store local pnpm_default_store=~/Library/pnpm/store
# Check if pnpm is actually usable (not just Corepack shim) # Check if pnpm is actually usable (not just Corepack shim)
if command -v pnpm >/dev/null 2>&1 && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm --version >/dev/null 2>&1; then if command -v pnpm > /dev/null 2>&1 && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm --version > /dev/null 2>&1; then
COREPACK_ENABLE_DOWNLOAD_PROMPT=0 clean_tool_cache "pnpm cache" pnpm store prune COREPACK_ENABLE_DOWNLOAD_PROMPT=0 clean_tool_cache "pnpm cache" pnpm store prune
local pnpm_store_path local pnpm_store_path
start_section_spinner "Checking store path..." start_section_spinner "Checking store path..."
pnpm_store_path=$(COREPACK_ENABLE_DOWNLOAD_PROMPT=0 run_with_timeout 2 pnpm store path 2>/dev/null) || pnpm_store_path="" pnpm_store_path=$(COREPACK_ENABLE_DOWNLOAD_PROMPT=0 run_with_timeout 2 pnpm store path 2> /dev/null) || pnpm_store_path=""
stop_section_spinner stop_section_spinner
if [[ -n "$pnpm_store_path" && "$pnpm_store_path" != "$pnpm_default_store" ]]; then if [[ -n "$pnpm_store_path" && "$pnpm_store_path" != "$pnpm_default_store" ]]; then
safe_clean "$pnpm_default_store"/* "Orphaned pnpm store" safe_clean "$pnpm_default_store"/* "Orphaned pnpm store"
@@ -44,7 +44,7 @@ clean_dev_npm() {
} }
# Python/pip ecosystem caches. # Python/pip ecosystem caches.
clean_dev_python() { clean_dev_python() {
if command -v pip3 >/dev/null 2>&1; then if command -v pip3 > /dev/null 2>&1; then
clean_tool_cache "pip cache" bash -c 'pip3 cache purge > /dev/null 2>&1 || true' clean_tool_cache "pip cache" bash -c 'pip3 cache purge > /dev/null 2>&1 || true'
note_activity note_activity
fi fi
@@ -64,7 +64,7 @@ clean_dev_python() {
} }
# Go build/module caches. # Go build/module caches.
clean_dev_go() { clean_dev_go() {
if command -v go >/dev/null 2>&1; then if command -v go > /dev/null 2>&1; then
clean_tool_cache "Go cache" bash -c 'go clean -modcache > /dev/null 2>&1 || true; go clean -cache > /dev/null 2>&1 || true' clean_tool_cache "Go cache" bash -c 'go clean -modcache > /dev/null 2>&1 || true; go clean -cache > /dev/null 2>&1 || true'
note_activity note_activity
fi fi
@@ -89,7 +89,7 @@ check_multiple_versions() {
fi fi
local count local count
count=$(find "$dir" -mindepth 1 -maxdepth 1 -type d 2>/dev/null | wc -l | tr -d ' ') count=$(find "$dir" -mindepth 1 -maxdepth 1 -type d 2> /dev/null | wc -l | tr -d ' ')
if [[ "$count" -gt 1 ]]; then if [[ "$count" -gt 1 ]]; then
note_activity note_activity
@@ -103,7 +103,7 @@ check_multiple_versions() {
# Check for multiple Rust toolchains. # Check for multiple Rust toolchains.
check_rust_toolchains() { check_rust_toolchains() {
command -v rustup >/dev/null 2>&1 || return 0 command -v rustup > /dev/null 2>&1 || return 0
check_multiple_versions \ check_multiple_versions \
"$HOME/.rustup/toolchains" \ "$HOME/.rustup/toolchains" \
@@ -112,11 +112,11 @@ check_rust_toolchains() {
} }
# Docker caches (guarded by daemon check). # Docker caches (guarded by daemon check).
clean_dev_docker() { clean_dev_docker() {
if command -v docker >/dev/null 2>&1; then if command -v docker > /dev/null 2>&1; then
if [[ "$DRY_RUN" != "true" ]]; then if [[ "$DRY_RUN" != "true" ]]; then
start_section_spinner "Checking Docker daemon..." start_section_spinner "Checking Docker daemon..."
local docker_running=false local docker_running=false
if run_with_timeout 3 docker info >/dev/null 2>&1; then if run_with_timeout 3 docker info > /dev/null 2>&1; then
docker_running=true docker_running=true
fi fi
stop_section_spinner stop_section_spinner
@@ -134,7 +134,7 @@ clean_dev_docker() {
} }
# Nix garbage collection. # Nix garbage collection.
clean_dev_nix() { clean_dev_nix() {
if command -v nix-collect-garbage >/dev/null 2>&1; then if command -v nix-collect-garbage > /dev/null 2>&1; then
if [[ "$DRY_RUN" != "true" ]]; then if [[ "$DRY_RUN" != "true" ]]; then
clean_tool_cache "Nix garbage collection" nix-collect-garbage --delete-older-than 30d clean_tool_cache "Nix garbage collection" nix-collect-garbage --delete-older-than 30d
else else
@@ -176,13 +176,13 @@ check_android_ndk() {
clean_dev_mobile() { clean_dev_mobile() {
check_android_ndk check_android_ndk
if command -v xcrun >/dev/null 2>&1; then if command -v xcrun > /dev/null 2>&1; then
debug_log "Checking for unavailable Xcode simulators" debug_log "Checking for unavailable Xcode simulators"
local unavailable_before=0 local unavailable_before=0
local unavailable_after=0 local unavailable_after=0
local removed_unavailable=0 local removed_unavailable=0
unavailable_before=$(xcrun simctl list devices unavailable 2>/dev/null | command awk '/\(unavailable/ { count++ } END { print count+0 }' || echo "0") unavailable_before=$(xcrun simctl list devices unavailable 2> /dev/null | command awk '/\(unavailable/ { count++ } END { print count+0 }' || echo "0")
[[ "$unavailable_before" =~ ^[0-9]+$ ]] || unavailable_before=0 [[ "$unavailable_before" =~ ^[0-9]+$ ]] || unavailable_before=0
if [[ "$DRY_RUN" == "true" ]]; then if [[ "$DRY_RUN" == "true" ]]; then
@@ -193,9 +193,9 @@ clean_dev_mobile() {
fi fi
else else
start_section_spinner "Checking unavailable simulators..." start_section_spinner "Checking unavailable simulators..."
if xcrun simctl delete unavailable >/dev/null 2>&1; then if xcrun simctl delete unavailable > /dev/null 2>&1; then
stop_section_spinner stop_section_spinner
unavailable_after=$(xcrun simctl list devices unavailable 2>/dev/null | command awk '/\(unavailable/ { count++ } END { print count+0 }' || echo "0") unavailable_after=$(xcrun simctl list devices unavailable 2> /dev/null | command awk '/\(unavailable/ { count++ } END { print count+0 }' || echo "0")
[[ "$unavailable_after" =~ ^[0-9]+$ ]] || unavailable_after=0 [[ "$unavailable_after" =~ ^[0-9]+$ ]] || unavailable_after=0
removed_unavailable=$((unavailable_before - unavailable_after)) removed_unavailable=$((unavailable_before - unavailable_after))
@@ -270,7 +270,7 @@ clean_dev_jetbrains_toolbox() {
local -a product_dirs=() local -a product_dirs=()
while IFS= read -r -d '' product_dir; do while IFS= read -r -d '' product_dir; do
product_dirs+=("$product_dir") product_dirs+=("$product_dir")
done < <(command find "$toolbox_root" -mindepth 1 -maxdepth 1 -type d -print0 2>/dev/null) done < <(command find "$toolbox_root" -mindepth 1 -maxdepth 1 -type d -print0 2> /dev/null)
if [[ ${#product_dirs[@]} -eq 0 ]]; then if [[ ${#product_dirs[@]} -eq 0 ]]; then
_restore_whitelist _restore_whitelist
@@ -283,7 +283,7 @@ clean_dev_jetbrains_toolbox() {
local current_link="" local current_link=""
local current_real="" local current_real=""
if [[ -L "$channel_dir/current" ]]; then if [[ -L "$channel_dir/current" ]]; then
current_link=$(readlink "$channel_dir/current" 2>/dev/null || true) current_link=$(readlink "$channel_dir/current" 2> /dev/null || true)
if [[ -n "$current_link" ]]; then if [[ -n "$current_link" ]]; then
if [[ "$current_link" == /* ]]; then if [[ "$current_link" == /* ]]; then
current_real="$current_link" current_real="$current_link"
@@ -307,7 +307,7 @@ clean_dev_jetbrains_toolbox() {
[[ ! "$name" =~ ^[0-9] ]] && continue [[ ! "$name" =~ ^[0-9] ]] && continue
version_dirs+=("$version_dir") version_dirs+=("$version_dir")
done < <(command find "$channel_dir" -mindepth 1 -maxdepth 1 -type d -print0 2>/dev/null) done < <(command find "$channel_dir" -mindepth 1 -maxdepth 1 -type d -print0 2> /dev/null)
[[ ${#version_dirs[@]} -eq 0 ]] && continue [[ ${#version_dirs[@]} -eq 0 ]] && continue
@@ -318,7 +318,7 @@ clean_dev_jetbrains_toolbox() {
done < <( done < <(
for version_dir in "${version_dirs[@]}"; do for version_dir in "${version_dirs[@]}"; do
local mtime local mtime
mtime=$(stat -f%m "$version_dir" 2>/dev/null || echo "0") mtime=$(stat -f%m "$version_dir" 2> /dev/null || echo "0")
printf '%s %s\n' "$mtime" "$version_dir" printf '%s %s\n' "$mtime" "$version_dir"
done | sort -rn done | sort -rn
) )
@@ -338,7 +338,7 @@ clean_dev_jetbrains_toolbox() {
note_activity note_activity
((idx++)) ((idx++))
done done
done < <(command find "$product_dir" -mindepth 1 -maxdepth 1 -type d -name "ch-*" -print0 2>/dev/null) done < <(command find "$product_dir" -mindepth 1 -maxdepth 1 -type d -name "ch-*" -print0 2> /dev/null)
done done
_restore_whitelist _restore_whitelist
@@ -493,7 +493,7 @@ clean_developer_tools() {
if [[ -d "$lock_dir" && -w "$lock_dir" ]]; then if [[ -d "$lock_dir" && -w "$lock_dir" ]]; then
safe_clean "$lock_dir"/* "Homebrew lock files" safe_clean "$lock_dir"/* "Homebrew lock files"
elif [[ -d "$lock_dir" ]]; then elif [[ -d "$lock_dir" ]]; then
if find "$lock_dir" -mindepth 1 -maxdepth 1 -print -quit 2>/dev/null | grep -q .; then if find "$lock_dir" -mindepth 1 -maxdepth 1 -print -quit 2> /dev/null | grep -q .; then
debug_log "Skipping read-only Homebrew locks in $lock_dir" debug_log "Skipping read-only Homebrew locks in $lock_dir"
fi fi
fi fi

2
lib/clean/system.sh
View File

@@ -179,7 +179,7 @@ clean_deep_system() {
if oplog_enabled && [[ "$total_size_kb" -gt 0 ]]; then if oplog_enabled && [[ "$total_size_kb" -gt 0 ]]; then
local size_human local size_human
size_human=$(bytes_to_human "$((total_size_kb * 1024))") size_human=$(bytes_to_human "$((total_size_kb * 1024))")
log_operation "[clean] REMOVED $mem_reports_dir ($file_count files, $size_human)" log_operation "clean" "REMOVED" "$mem_reports_dir" "$file_count files, $size_human"
fi fi
else else
log_info "[DRY-RUN] Would remove $file_count old memory exception reports ($total_size_kb KB)" log_info "[DRY-RUN] Would remove $file_count old memory exception reports ($total_size_kb KB)"

3
lib/core/file_ops.sh
View File

@@ -366,8 +366,7 @@ safe_sudo_remove() {
local output local output
local ret local ret
output=$(sudo rm -rf "$path" 2>&1) # safe_remove output=$(sudo rm -rf "$path" 2>&1) || ret=$? # safe_remove
ret=$?
if [[ $ret -eq 0 ]]; then if [[ $ret -eq 0 ]]; then
log_operation "${MOLE_CURRENT_COMMAND:-clean}" "REMOVED" "$path" "$size_human" log_operation "${MOLE_CURRENT_COMMAND:-clean}" "REMOVED" "$path" "$size_human"

2
lib/ui/app_selector.sh
View File

@@ -169,7 +169,7 @@ select_apps_for_uninstall() {
local exit_code=$? local exit_code=$?
# Clean env leakage for safety # Clean env leakage for safety
unset MOLE_MENU_META_EPOCHS MOLE_MENU_META_SIZEKB unset MOLE_MENU_META_EPOCHS MOLE_MENU_META_SIZEKB MOLE_MENU_FILTER_NAMES
# leave MOLE_MENU_SORT_DEFAULT untouched if user set it globally # leave MOLE_MENU_SORT_DEFAULT untouched if user set it globally
if [[ $exit_code -ne 0 ]]; then if [[ $exit_code -ne 0 ]]; then

2
lib/ui/menu_paginated.sh
View File

@@ -182,6 +182,7 @@ paginated_multi_select() {
# Cleanup function # Cleanup function
cleanup() { cleanup() {
trap - EXIT INT TERM trap - EXIT INT TERM
unset MOLE_READ_KEY_FORCE_CHAR
export MOLE_MENU_SORT_MODE="${sort_mode:-name}" export MOLE_MENU_SORT_MODE="${sort_mode:-name}"
export MOLE_MENU_SORT_REVERSE="${sort_reverse:-false}" export MOLE_MENU_SORT_REVERSE="${sort_reverse:-false}"
restore_terminal restore_terminal
@@ -862,6 +863,7 @@ paginated_multi_select() {
trap - EXIT INT TERM trap - EXIT INT TERM
MOLE_SELECTION_RESULT="$final_result" MOLE_SELECTION_RESULT="$final_result"
unset MOLE_READ_KEY_FORCE_CHAR
export MOLE_MENU_SORT_MODE="${sort_mode:-name}" export MOLE_MENU_SORT_MODE="${sort_mode:-name}"
export MOLE_MENU_SORT_REVERSE="${sort_reverse:-false}" export MOLE_MENU_SORT_REVERSE="${sort_reverse:-false}"
restore_terminal restore_terminal