fpf-cli 1.6.35 → 1.6.37

package/README.md

@@ -98,7 +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.
-- Set `FPF_LOADING_INDICATOR=0` to disable the pre-search loading spinner.
+- Startup now shows a DynamicProgress-style pre-search bar with concurrent per-manager task text + 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,7 +3,7 @@
 set -euo pipefail
 
 SCRIPT_NAME="fpf"
-SCRIPT_VERSION="1.6.35"
+SCRIPT_VERSION="1.6.37"
 TMP_ROOT="${TMPDIR:-/tmp}/fpf"
 SESSION_TMP_ROOT=""
 HELP_FILE=""
@@ -11,6 +11,7 @@ KBINDS_FILE=""
 CACHE_FORMAT_VERSION="1"
 CACHE_ROOT=""
 LOADING_INDICATOR_PID=""
+LOADING_PROGRESS_DIR=""
 
 ACTION="search"
 MANAGER_OVERRIDE=""
@@ -43,6 +44,154 @@ loading_indicator_enabled() {
     [[ -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_repeat_char() {
+    local count="$1"
+    local char="$2"
+    local chunk=""
+
+    if ! [[ "${count}" =~ ^[0-9]+$ ]] || [[ "${count}" -le 0 ]]; then
+        return 0
+    fi
+
+    printf -v chunk "%*s" "${count}" ""
+    printf "%s" "${chunk// /${char}}"
+}
+
+loading_progress_snapshot() {
+    local status_file=""
+    local manager=""
+    local status=""
+    local detail=""
+    local bar_width="${FPF_LOADING_BAR_WIDTH:-26}"
+    local total=0
+    local done=0
+    local running=0
+    local queued=0
+    local progress_percent=0
+    local filled_width=0
+    local remaining_width=0
+    local bar=""
+    local -a active_details=()
+    local active_text=""
+    local phase_text=""
+    local idx
+
+    if [[ -z "${LOADING_PROGRESS_DIR}" || ! -d "${LOADING_PROGRESS_DIR}" ]]; then
+        return 0
+    fi
+
+    if ! [[ "${bar_width}" =~ ^[0-9]+$ ]] || [[ "${bar_width}" -lt 10 ]]; then
+        bar_width=26
+    fi
+    if [[ "${bar_width}" -gt 60 ]]; then
+        bar_width=60
+    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))
+                active_details+=("$(manager_label "${manager}"): ${detail:-working}")
+                ;;
+            *)
+                queued=$((queued + 1))
+                ;;
+        esac
+    done
+
+    [[ "${total}" -gt 0 ]] || return 0
+
+    progress_percent=$((done * 100 / total))
+    filled_width=$((done * bar_width / total))
+    if [[ "${done}" -ge "${total}" ]]; then
+        bar="$(loading_progress_repeat_char "${bar_width}" "=")"
+    else
+        remaining_width=$((bar_width - filled_width - 1))
+        bar="$(loading_progress_repeat_char "${filled_width}" "=")>"
+        if [[ "${remaining_width}" -gt 0 ]]; then
+            bar+=$(printf "%${remaining_width}s" "")
+        fi
+    fi
+
+    if [[ "${#active_details[@]}" -gt 0 ]]; then
+        active_text=""
+        for idx in "${!active_details[@]}"; do
+            if [[ -n "${active_text}" ]]; then
+                active_text+="; "
+            fi
+            active_text+="${active_details[$idx]}"
+        done
+        phase_text="active: ${active_text}"
+    elif [[ "${queued}" -gt 0 ]]; then
+        phase_text="starting queued managers (${queued} remaining)"
+    else
+        phase_text="finalizing combined results"
+    fi
+
+    printf "[%s] %3s%% (%s/%s) | %s" "${bar}" "${progress_percent}" "${done}" "${total}" "${phase_text}"
+}
+
 start_loading_indicator() {
     local message="${1:-Loading}"
 
@@ -54,11 +203,27 @@ start_loading_indicator() {
 
     (
         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
-            printf "\r\033[2K%s [%s]" "${message}" "${frames:frame_index:1}" >&2
-            frame_index=$(((frame_index + 1) % 4))
+            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 | elapsed: %ss" "${message}" "${snapshot}" "${elapsed_seconds}" >&2
+            else
+                printf "\r\033[2K%s [working] | elapsed: %ss" "${message}" "${elapsed_seconds}" >&2
+            fi
             sleep 0.1
         done
     ) &
@@ -929,6 +1094,7 @@ 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}"
@@ -2780,6 +2946,10 @@ collect_search_display_rows() {
         part_files+=("${part_file}")
 
         (
+            local local_source_file
+            local result_count=0
+
+            loading_progress_mark_running "${manager}" "querying 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
@@ -2792,6 +2962,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} packages matched"
         ) &
         gather_pids+=("$!")
     done
@@ -2842,6 +3017,9 @@ collect_installed_display_rows() {
 
         (
             local local_source_file
+            local result_count=0
+
+            loading_progress_mark_running "${manager}" "reading installed package list"
             local_source_file="$(mktemp "${SESSION_TMP_ROOT}/source.XXXXXX")"
             manager_installed_entries "${manager}" >"${local_source_file}" || true
             if [[ -s "${local_source_file}" ]]; then
@@ -2854,6 +3032,11 @@ collect_installed_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} installed packages"
         ) &
         gather_pids+=("$!")
     done
@@ -3405,9 +3588,19 @@ main() {
     ensure_fzf "${managers[@]-}"
 
     if [[ "${ACTION}" == "search" ]]; then
-        run_with_loading_indicator "Loading packages from ${manager_display}" 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
-        run_with_loading_indicator "Loading installed packages from ${manager_display}" collect_installed_display_rows "${display_file}" "${managers[@]-}"
+        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
@@ -3450,7 +3643,12 @@ main() {
         if dynamic_reload_enabled "${#managers[@]}"; then
             if [[ -n "${query}" ]]; then
                 reload_fallback_file="$(mktemp "${SESSION_TMP_ROOT}/reload-fallback.XXXXXX")"
-                run_with_loading_indicator "Preparing baseline search results" 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.35",
+  "version": "1.6.37",
   "description": "Cross-platform fuzzy package finder powered by fzf",
   "bin": {
     "fpf": "fpf"