fpf-cli 1.6.34 → 1.6.36

package/README.md

@@ -98,6 +98,8 @@ 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.
+- Startup now shows a dynamic pre-search loader with per-manager progress + elapsed time.
+- Set `FPF_LOADING_INDICATOR=0` to disable the pre-search loading indicator.
 - `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,15 @@
 set -euo pipefail
 
 SCRIPT_NAME="fpf"
-SCRIPT_VERSION="1.6.34"
+SCRIPT_VERSION="1.6.36"
 TMP_ROOT="${TMPDIR:-/tmp}/fpf"
 SESSION_TMP_ROOT=""
 HELP_FILE=""
 KBINDS_FILE=""
 CACHE_FORMAT_VERSION="1"
 CACHE_ROOT=""
+LOADING_INDICATOR_PID=""
+LOADING_PROGRESS_DIR=""
 
 ACTION="search"
 MANAGER_OVERRIDE=""
@@ -27,6 +29,208 @@ 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 ]]
+}
+
+loading_progress_begin() {
+    local managers=("$@")
+    local manager=""
+    local progress_file=""
+
+    loading_progress_end
+    loading_indicator_enabled || return 0
+    [[ "${#managers[@]}" -gt 0 ]] || return 0
+
+    LOADING_PROGRESS_DIR="$(mktemp -d "${SESSION_TMP_ROOT}/loading-progress.XXXXXX")"
+    for manager in "${managers[@]-}"; do
+        progress_file="${LOADING_PROGRESS_DIR}/${manager}.status"
+        printf "pending\tqueued\n" >"${progress_file}"
+    done
+}
+
+loading_progress_end() {
+    if [[ -z "${LOADING_PROGRESS_DIR}" ]]; then
+        return 0
+    fi
+
+    if [[ -d "${LOADING_PROGRESS_DIR}" ]]; then
+        rm -rf "${LOADING_PROGRESS_DIR}" >/dev/null 2>&1 || true
+    fi
+
+    LOADING_PROGRESS_DIR=""
+}
+
+loading_progress_mark_state() {
+    local manager="$1"
+    local state="$2"
+    local detail="${3:-}"
+    local progress_file=""
+
+    if [[ -z "${LOADING_PROGRESS_DIR}" || ! -d "${LOADING_PROGRESS_DIR}" ]]; then
+        return 0
+    fi
+
+    progress_file="${LOADING_PROGRESS_DIR}/${manager}.status"
+    printf "%s\t%s\n" "${state}" "${detail}" >"${progress_file}" 2>/dev/null || true
+}
+
+loading_progress_mark_running() {
+    local manager="$1"
+    local detail="${2:-working}"
+    loading_progress_mark_state "${manager}" "running" "${detail}"
+}
+
+loading_progress_mark_done() {
+    local manager="$1"
+    local detail="${2:-done}"
+    loading_progress_mark_state "${manager}" "done" "${detail}"
+}
+
+loading_progress_snapshot() {
+    local status_file=""
+    local manager=""
+    local status=""
+    local detail=""
+    local total=0
+    local done=0
+    local running=0
+    local queued=0
+    local -a active_details=()
+    local active_display=""
+    local idx
+
+    if [[ -z "${LOADING_PROGRESS_DIR}" || ! -d "${LOADING_PROGRESS_DIR}" ]]; then
+        return 0
+    fi
+
+    for status_file in "${LOADING_PROGRESS_DIR}"/*.status; do
+        [[ -f "${status_file}" ]] || continue
+        total=$((total + 1))
+        manager="$(basename "${status_file}" .status)"
+        IFS=$'\t' read -r status detail <"${status_file}" || true
+        case "${status}" in
+            done)
+                done=$((done + 1))
+                ;;
+            running)
+                running=$((running + 1))
+                if [[ "${#active_details[@]}" -lt 2 ]]; then
+                    active_details+=("$(manager_label "${manager}"): ${detail:-working}")
+                fi
+                ;;
+            *)
+                queued=$((queued + 1))
+                ;;
+        esac
+    done
+
+    [[ "${total}" -gt 0 ]] || return 0
+
+    active_display=""
+    for idx in "${!active_details[@]}"; do
+        if [[ -n "${active_display}" ]]; then
+            active_display+=", "
+        fi
+        active_display+="${active_details[$idx]}"
+    done
+    if [[ "${running}" -gt "${#active_details[@]}" ]]; then
+        if [[ -n "${active_display}" ]]; then
+            active_display+=", "
+        fi
+        active_display+="+$((running - ${#active_details[@]})) more"
+    fi
+
+    printf "%s/%s done" "${done}" "${total}"
+    if [[ -n "${active_display}" ]]; then
+        printf " | active: %s" "${active_display}"
+    fi
+    if [[ "${queued}" -gt 0 ]]; then
+        printf " | queued: %s" "${queued}"
+    fi
+}
+
+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
+        local started_epoch
+        local elapsed_seconds=0
+        local snapshot=""
+
+        started_epoch="$(date +%s)"
+        if ! [[ "${started_epoch}" =~ ^[0-9]+$ ]]; then
+            started_epoch=0
+        fi
+
+        while true; do
+            elapsed_seconds="$(( $(date +%s) - started_epoch ))"
+            if [[ "${elapsed_seconds}" -lt 0 ]]; then
+                elapsed_seconds=0
+            fi
+
+            snapshot="$(loading_progress_snapshot)"
+            if [[ -n "${snapshot}" ]]; then
+                printf "\r\033[2K%s [%s] %s | elapsed: %ss" "${message}" "${frames:frame_index:1}" "${snapshot}" "${elapsed_seconds}" >&2
+            else
+                printf "\r\033[2K%s [%s] elapsed: %ss" "${message}" "${frames:frame_index:1}" "${elapsed_seconds}" >&2
+            fi
+            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 +1065,9 @@ run_preview_item_action() {
 }
 
 cleanup_session_tmp_root() {
+    stop_loading_indicator
+    loading_progress_end
+
     if [[ -n "${SESSION_TMP_ROOT}" && -d "${SESSION_TMP_ROOT}" ]]; then
         rm -rf "${SESSION_TMP_ROOT}"
     fi
@@ -2711,6 +2918,10 @@ collect_search_display_rows() {
         part_files+=("${part_file}")
 
         (
+            local local_source_file
+            local result_count=0
+
+            loading_progress_mark_running "${manager}" "searching package index"
             local_source_file="$(mktemp "${SESSION_TMP_ROOT}/source.XXXXXX")"
             manager_search_entries "${manager}" "${query}" >"${local_source_file}" || true
             if [[ -s "${local_source_file}" ]]; then
@@ -2723,6 +2934,11 @@ collect_search_display_rows() {
                 ' "${local_source_file}" >"${part_file}"
             fi
             rm -f "${local_source_file}"
+
+            if [[ -s "${part_file}" ]]; then
+                result_count="$(awk 'END { print NR + 0 }' "${part_file}")"
+            fi
+            loading_progress_mark_done "${manager}" "${result_count} results indexed"
         ) &
         gather_pids+=("$!")
     done
@@ -2755,6 +2971,64 @@ 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 result_count=0
+
+            loading_progress_mark_running "${manager}" "reading installed packages"
+            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}"
+
+            if [[ -s "${part_file}" ]]; then
+                result_count="$(awk 'END { print NR + 0 }' "${part_file}")"
+            fi
+            loading_progress_mark_done "${manager}" "${result_count} installed entries"
+        ) &
+        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"
@@ -3286,48 +3560,19 @@ main() {
     ensure_fzf "${managers[@]-}"
 
     if [[ "${ACTION}" == "search" ]]; then
-        collect_search_display_rows "${query}" "${display_file}" "${managers[@]-}"
+        loading_progress_begin "${managers[@]-}"
+        if ! run_with_loading_indicator "Loading packages from ${manager_display}" collect_search_display_rows "${query}" "${display_file}" "${managers[@]-}"; then
+            loading_progress_end
+            die "Failed to load package search results."
+        fi
+        loading_progress_end
     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}"
+        loading_progress_begin "${managers[@]-}"
+        if ! run_with_loading_indicator "Loading installed packages from ${manager_display}" collect_installed_display_rows "${display_file}" "${managers[@]-}"; then
+            loading_progress_end
+            die "Failed to load installed package results."
         fi
+        loading_progress_end
     fi
 
     if [[ ! -s "${display_file}" ]]; then
@@ -3370,7 +3615,12 @@ 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[@]-}"
+                loading_progress_begin "${managers[@]-}"
+                if ! run_with_loading_indicator "Preparing baseline search results" collect_search_display_rows "" "${reload_fallback_file}" "${managers[@]-}"; then
+                    loading_progress_end
+                    die "Failed to prepare baseline search results."
+                fi
+                loading_progress_end
                 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.34",
+  "version": "1.6.36",
   "description": "Cross-platform fuzzy package finder powered by fzf",
   "bin": {
     "fpf": "fpf"