fpf-cli 1.6.33 → 1.6.35

package/README.md

@@ -98,6 +98,7 @@ Installed packages are marked with `*` in the result list.
 - `FPF_DYNAMIC_RELOAD`: `always` (default), `single`, or `never`
 - Live reload uses `change:reload` by default for reliability (`ctrl-r` uses the same reload command).
 - Set `FPF_DYNAMIC_RELOAD_TRANSPORT=ipc` to opt into `--listen` + IPC query notifications on supported `fzf` builds.
+- Set `FPF_LOADING_INDICATOR=0` to disable the pre-search loading spinner.
 - `FPF_RELOAD_MIN_CHARS`: minimum query length before live reload (default `2`)
 - `FPF_RELOAD_DEBOUNCE`: reload debounce seconds (default `0.12`)
 - `FPF_DISABLE_INSTALLED_CACHE=1` disables installed-package marker cache

package/fpf

@@ -3,13 +3,14 @@
 set -euo pipefail
 
 SCRIPT_NAME="fpf"
-SCRIPT_VERSION="1.6.33"
+SCRIPT_VERSION="1.6.35"
 TMP_ROOT="${TMPDIR:-/tmp}/fpf"
 SESSION_TMP_ROOT=""
 HELP_FILE=""
 KBINDS_FILE=""
 CACHE_FORMAT_VERSION="1"
 CACHE_ROOT=""
+LOADING_INDICATOR_PID=""
 
 ACTION="search"
 MANAGER_OVERRIDE=""
@@ -27,6 +28,72 @@ log() {
     printf "%s\n" "$*" >&2
 }
 
+loading_indicator_enabled() {
+    local indicator_setting=""
+
+    indicator_setting="$(trim_whitespace "${FPF_LOADING_INDICATOR:-1}")"
+    indicator_setting="$(printf "%s" "${indicator_setting}" | tr '[:upper:]' '[:lower:]')"
+
+    case "${indicator_setting}" in
+        0|false|no|off)
+            return 1
+            ;;
+    esac
+
+    [[ -t 2 ]]
+}
+
+start_loading_indicator() {
+    local message="${1:-Loading}"
+
+    if [[ -n "${LOADING_INDICATOR_PID}" ]]; then
+        stop_loading_indicator
+    fi
+
+    loading_indicator_enabled || return 0
+
+    (
+        trap 'exit 0' TERM INT
+        local frames='|/-\'
+        local frame_index=0
+        while true; do
+            printf "\r\033[2K%s [%s]" "${message}" "${frames:frame_index:1}" >&2
+            frame_index=$(((frame_index + 1) % 4))
+            sleep 0.1
+        done
+    ) &
+    LOADING_INDICATOR_PID="$!"
+}
+
+stop_loading_indicator() {
+    if [[ -z "${LOADING_INDICATOR_PID}" ]]; then
+        return 0
+    fi
+
+    kill "${LOADING_INDICATOR_PID}" >/dev/null 2>&1 || true
+    wait "${LOADING_INDICATOR_PID}" >/dev/null 2>&1 || true
+    LOADING_INDICATOR_PID=""
+
+    if loading_indicator_enabled; then
+        printf "\r\033[2K" >&2
+    fi
+}
+
+run_with_loading_indicator() {
+    local message="$1"
+    shift
+
+    start_loading_indicator "${message}"
+    if "$@"; then
+        stop_loading_indicator
+        return 0
+    fi
+
+    local status="$?"
+    stop_loading_indicator
+    return "${status}"
+}
+
 die() {
     log "Error: $*"
     exit 1
@@ -861,6 +928,8 @@ run_preview_item_action() {
 }
 
 cleanup_session_tmp_root() {
+    stop_loading_indicator
+
     if [[ -n "${SESSION_TMP_ROOT}" && -d "${SESSION_TMP_ROOT}" ]]; then
         rm -rf "${SESSION_TMP_ROOT}"
     fi
@@ -1339,7 +1408,27 @@ ensure_fzf() {
 }
 
 normalize_manager() {
-    printf "%s" "$1" | tr '[:upper:]' '[:lower:]'
+    local manager="$1"
+
+    manager="$(trim_whitespace "${manager}")"
+    manager="$(printf "%s" "${manager}" | tr '[:upper:]' '[:lower:]')"
+
+    case "${manager}" in
+        homebrew)
+            manager="brew"
+            ;;
+        chocolatey|chocolate)
+            manager="choco"
+            ;;
+        "portage (emerge)"|portage-emerge|portage)
+            manager="emerge"
+            ;;
+        win-get)
+            manager="winget"
+            ;;
+    esac
+
+    printf "%s" "${manager}"
 }
 
 os_release_field() {
@@ -2735,6 +2824,56 @@ collect_search_display_rows() {
     rm -f "${merged_source_file}" "${merged_marked_file}"
 }
 
+collect_installed_display_rows() {
+    local output_file="$1"
+    shift
+    local managers=("$@")
+    local part_files=()
+    local gather_pids=()
+    local manager
+    local part_file
+    local gather_pid
+
+    : >"${output_file}"
+
+    for manager in "${managers[@]-}"; do
+        part_file="$(mktemp "${SESSION_TMP_ROOT}/part.XXXXXX")"
+        part_files+=("${part_file}")
+
+        (
+            local local_source_file
+            local_source_file="$(mktemp "${SESSION_TMP_ROOT}/source.XXXXXX")"
+            manager_installed_entries "${manager}" >"${local_source_file}" || true
+            if [[ -s "${local_source_file}" ]]; then
+                awk -F'\t' -v mgr="${manager}" '
+                    NF >= 1 {
+                        desc = $2
+                        if (desc == "") desc = "-"
+                        print mgr "\t" $1 "\t" desc
+                    }
+                ' "${local_source_file}" >"${part_file}"
+            fi
+            rm -f "${local_source_file}"
+        ) &
+        gather_pids+=("$!")
+    done
+
+    for gather_pid in "${gather_pids[@]-}"; do
+        wait "${gather_pid}" || true
+    done
+
+    for part_file in "${part_files[@]-}"; do
+        if [[ -s "${part_file}" ]]; then
+            cat "${part_file}" >>"${output_file}"
+        fi
+        rm -f "${part_file}"
+    done
+
+    if [[ -s "${output_file}" ]]; then
+        sort -u "${output_file}" -o "${output_file}"
+    fi
+}
+
 build_dynamic_reload_command() {
     local manager_override="$1"
     local fallback_file="$2"
@@ -3266,48 +3405,9 @@ main() {
     ensure_fzf "${managers[@]-}"
 
     if [[ "${ACTION}" == "search" ]]; then
-        collect_search_display_rows "${query}" "${display_file}" "${managers[@]-}"
+        run_with_loading_indicator "Loading packages from ${manager_display}" collect_search_display_rows "${query}" "${display_file}" "${managers[@]-}"
     else
-        local part_files=()
-        local gather_pids=()
-        local part_file
-        local gather_pid
-
-        for manager in "${managers[@]-}"; do
-        part_file="$(mktemp "${SESSION_TMP_ROOT}/part.XXXXXX")"
-        part_files+=("${part_file}")
-
-        (
-            local_source_file="$(mktemp "${SESSION_TMP_ROOT}/source.XXXXXX")"
-            manager_installed_entries "${manager}" >"${local_source_file}" || true
-            if [[ -s "${local_source_file}" ]]; then
-                awk -F'\t' -v mgr="${manager}" '
-                        NF >= 1 {
-                            desc = $2
-                            if (desc == "") desc = "-"
-                            print mgr "\t" $1 "\t" desc
-                        }
-                    ' "${local_source_file}" >"${part_file}"
-                fi
-                rm -f "${local_source_file}"
-            ) &
-            gather_pids+=("$!")
-        done
-
-        for gather_pid in "${gather_pids[@]-}"; do
-            wait "${gather_pid}" || true
-        done
-
-        for part_file in "${part_files[@]-}"; do
-            if [[ -s "${part_file}" ]]; then
-                cat "${part_file}" >>"${display_file}"
-            fi
-            rm -f "${part_file}"
-        done
-
-        if [[ -s "${display_file}" ]]; then
-            sort -u "${display_file}" -o "${display_file}"
-        fi
+        run_with_loading_indicator "Loading installed packages from ${manager_display}" collect_installed_display_rows "${display_file}" "${managers[@]-}"
     fi
 
     if [[ ! -s "${display_file}" ]]; then
@@ -3350,7 +3450,7 @@ main() {
         if dynamic_reload_enabled "${#managers[@]}"; then
             if [[ -n "${query}" ]]; then
                 reload_fallback_file="$(mktemp "${SESSION_TMP_ROOT}/reload-fallback.XXXXXX")"
-                collect_search_display_rows "" "${reload_fallback_file}" "${managers[@]-}"
+                run_with_loading_indicator "Preparing baseline search results" collect_search_display_rows "" "${reload_fallback_file}" "${managers[@]-}"
                 if [[ ! -s "${reload_fallback_file}" ]]; then
                     cp "${display_file}" "${reload_fallback_file}"
                 fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fpf-cli",
-  "version": "1.6.33",
+  "version": "1.6.35",
   "description": "Cross-platform fuzzy package finder powered by fzf",
   "bin": {
     "fpf": "fpf"