fpf-cli 1.6.37 → 1.6.39

package/fpf

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 SCRIPT_NAME="fpf"
-SCRIPT_VERSION="1.6.37"
+SCRIPT_VERSION="1.6.39"
 TMP_ROOT="${TMPDIR:-/tmp}/fpf"
 SESSION_TMP_ROOT=""
 HELP_FILE=""
@@ -98,17 +98,39 @@ loading_progress_mark_done() {
     loading_progress_mark_state "${manager}" "done" "${detail}"
 }
 
-loading_progress_repeat_char() {
-    local count="$1"
-    local char="$2"
-    local chunk=""
+loading_indicator_terminal_cols() {
+    local cols="${COLUMNS:-}"
 
-    if ! [[ "${count}" =~ ^[0-9]+$ ]] || [[ "${count}" -le 0 ]]; then
-        return 0
+    if ! [[ "${cols}" =~ ^[0-9]+$ ]] || [[ "${cols}" -lt 40 ]]; then
+        if command_exists tput; then
+            cols="$(tput cols 2>/dev/null || true)"
+        fi
+    fi
+
+    if ! [[ "${cols}" =~ ^[0-9]+$ ]] || [[ "${cols}" -lt 40 ]]; then
+        cols=120
+    fi
+
+    printf "%s" "${cols}"
+}
+
+loading_indicator_fit_line() {
+    local line="$1"
+    local cols
+    local max_len
+
+    cols="$(loading_indicator_terminal_cols)"
+    max_len=$((cols - 1))
+    if [[ "${max_len}" -lt 20 ]]; then
+        max_len=20
+    fi
+
+    if [[ "${#line}" -gt "${max_len}" ]]; then
+        printf "%s..." "${line:0:$((max_len - 3))}"
+        return
     fi
 
-    printf -v chunk "%*s" "${count}" ""
-    printf "%s" "${chunk// /${char}}"
+    printf "%s" "${line}"
 }
 
 loading_progress_snapshot() {
@@ -116,31 +138,22 @@ loading_progress_snapshot() {
     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 active_total=0
+    local max_active_items=3
     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))
@@ -152,7 +165,10 @@ loading_progress_snapshot() {
                 ;;
             running)
                 running=$((running + 1))
-                active_details+=("$(manager_label "${manager}"): ${detail:-working}")
+                active_total=$((active_total + 1))
+                if [[ "${#active_details[@]}" -lt "${max_active_items}" ]]; then
+                    active_details+=("${manager}: ${detail:-work}")
+                fi
                 ;;
             *)
                 queued=$((queued + 1))
@@ -163,25 +179,18 @@ loading_progress_snapshot() {
     [[ "${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+="; "
+                active_text+=", "
             fi
             active_text+="${active_details[$idx]}"
         done
+        if [[ "${active_total}" -gt "${#active_details[@]}" ]]; then
+            active_text+=", +$((active_total - ${#active_details[@]}))"
+        fi
         phase_text="active: ${active_text}"
     elif [[ "${queued}" -gt 0 ]]; then
         phase_text="starting queued managers (${queued} remaining)"
@@ -189,7 +198,7 @@ loading_progress_snapshot() {
         phase_text="finalizing combined results"
     fi
 
-    printf "[%s] %3s%% (%s/%s) | %s" "${bar}" "${progress_percent}" "${done}" "${total}" "${phase_text}"
+    printf "%3s%% (%s/%s) | %s" "${progress_percent}" "${done}" "${total}" "${phase_text}"
 }
 
 start_loading_indicator() {
@@ -206,6 +215,7 @@ start_loading_indicator() {
         local started_epoch
         local elapsed_seconds=0
         local snapshot=""
+        local line_output=""
 
         started_epoch="$(date +%s)"
         if ! [[ "${started_epoch}" =~ ^[0-9]+$ ]]; then
@@ -220,11 +230,13 @@ start_loading_indicator() {
 
             snapshot="$(loading_progress_snapshot)"
             if [[ -n "${snapshot}" ]]; then
-                printf "\r\033[2K%s %s | elapsed: %ss" "${message}" "${snapshot}" "${elapsed_seconds}" >&2
+                line_output="${message} ${snapshot} | ${elapsed_seconds}s"
             else
-                printf "\r\033[2K%s [working] | elapsed: %ss" "${message}" "${elapsed_seconds}" >&2
+                line_output="${message} working | ${elapsed_seconds}s"
             fi
-            sleep 0.1
+            line_output="$(loading_indicator_fit_line "${line_output}")"
+            printf "\r\033[2K%s" "${line_output}" >&2
+            sleep 0.15
         done
     ) &
     LOADING_INDICATOR_PID="$!"
@@ -2853,9 +2865,23 @@ manager_installed_names_cached() {
 mark_installed_packages() {
     local source_file="$1"
     local output_file="$2"
+    local unique_managers_file
+    local manager_counts_file
     local installed_file
     local installed_map_file
+    local installed_part_file
+    local manager_match_count
+    local installed_match_count
+    local installed_part_files=()
+    local gather_pids=()
     local manager
+    local gather_pid
+
+    unique_managers_file="$(mktemp "${SESSION_TMP_ROOT}/installed-managers.XXXXXX")"
+    awk -F'\t' 'NF >= 1 && $1 != "" { print $1 }' "${source_file}" | awk '!seen[$0]++' >"${unique_managers_file}"
+
+    manager_counts_file="$(mktemp "${SESSION_TMP_ROOT}/installed-counts.XXXXXX")"
+    awk -F'\t' 'NF >= 1 && $1 != "" { counts[$1]++ } END { for (mgr in counts) print mgr "\t" counts[mgr] }' "${source_file}" >"${manager_counts_file}"
 
     if [[ "${FPF_SKIP_INSTALLED_MARKERS:-0}" == "1" ]]; then
         awk -F'\t' '
@@ -2865,6 +2891,11 @@ mark_installed_packages() {
                 print $1 "\t" $2 "\t  " desc
             }
         ' "${source_file}" >"${output_file}"
+        while IFS= read -r manager; do
+            [[ -n "${manager}" ]] || continue
+            loading_progress_mark_done "${manager}" "installed marker check skipped"
+        done <"${unique_managers_file}"
+        rm -f "${unique_managers_file}" "${manager_counts_file}"
         return
     fi
 
@@ -2873,13 +2904,39 @@ mark_installed_packages() {
 
     while IFS= read -r manager; do
         [[ -n "${manager}" ]] || continue
-        installed_file="$(mktemp "${SESSION_TMP_ROOT}/installed.${manager}.XXXXXX")"
-        manager_installed_names_cached "${manager}" "${installed_file}"
-        if [[ -s "${installed_file}" ]]; then
-            awk -F'\t' -v mgr="${manager}" 'NF > 0 && $1 != "" { print mgr "\t" $1 }' "${installed_file}" >>"${installed_map_file}"
+        installed_part_file="$(mktemp "${SESSION_TMP_ROOT}/installed-map.${manager}.XXXXXX")"
+        installed_part_files+=("${installed_part_file}")
+
+        (
+            manager_match_count="$(awk -F'\t' -v mgr="${manager}" '$1 == mgr { print $2; found=1; exit } END { if (!found) print 0 }' "${manager_counts_file}")"
+            if ! [[ "${manager_match_count}" =~ ^[0-9]+$ ]]; then
+                manager_match_count=0
+            fi
+
+            loading_progress_mark_running "${manager}" "mark installed (${manager_match_count})"
+            installed_file="$(mktemp "${SESSION_TMP_ROOT}/installed.${manager}.XXXXXX")"
+            manager_installed_names_cached "${manager}" "${installed_file}" || true
+            installed_match_count=0
+            if [[ -s "${installed_file}" ]]; then
+                awk -F'\t' -v mgr="${manager}" 'NF > 0 && $1 != "" { print mgr "\t" $1 }' "${installed_file}" >"${installed_part_file}"
+                installed_match_count="$(awk 'END { print NR + 0 }' "${installed_part_file}")"
+            fi
+            rm -f "${installed_file}"
+            loading_progress_mark_done "${manager}" "${manager_match_count} matches, ${installed_match_count} installed"
+        ) &
+        gather_pids+=("$!")
+    done <"${unique_managers_file}"
+
+    for gather_pid in "${gather_pids[@]-}"; do
+        wait "${gather_pid}" || true
+    done
+
+    for installed_part_file in "${installed_part_files[@]-}"; do
+        if [[ -s "${installed_part_file}" ]]; then
+            cat "${installed_part_file}" >>"${installed_map_file}"
         fi
-        rm -f "${installed_file}"
-    done < <(awk -F'\t' 'NF >= 1 && $1 != "" { print $1 }' "${source_file}" | awk '!seen[$0]++')
+        rm -f "${installed_part_file}"
+    done
 
     awk -F'\t' '
         FILENAME == ARGV[1] {
@@ -2898,6 +2955,7 @@ mark_installed_packages() {
         }
     ' "${installed_map_file}" "${source_file}" >"${output_file}"
 
+    rm -f "${unique_managers_file}" "${manager_counts_file}"
     rm -f "${installed_map_file}"
 }
 
@@ -2949,7 +3007,7 @@ collect_search_display_rows() {
             local local_source_file
             local result_count=0
 
-            loading_progress_mark_running "${manager}" "querying package index"
+            loading_progress_mark_running "${manager}" "query 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
@@ -2966,7 +3024,7 @@ collect_search_display_rows() {
             if [[ -s "${part_file}" ]]; then
                 result_count="$(awk 'END { print NR + 0 }' "${part_file}")"
             fi
-            loading_progress_mark_done "${manager}" "${result_count} packages matched"
+            loading_progress_mark_running "${manager}" "${result_count} indexed; mark installed"
         ) &
         gather_pids+=("$!")
     done
@@ -2994,6 +3052,10 @@ collect_search_display_rows() {
             awk -v limit="${query_limit}" 'NR <= limit' "${output_file}" >"${output_file}.limited"
             mv "${output_file}.limited" "${output_file}"
         fi
+    else
+        for manager in "${managers[@]-}"; do
+            loading_progress_mark_done "${manager}" "0 packages matched"
+        done
     fi
 
     rm -f "${merged_source_file}" "${merged_marked_file}"
@@ -3019,7 +3081,7 @@ collect_installed_display_rows() {
             local local_source_file
             local result_count=0
 
-            loading_progress_mark_running "${manager}" "reading installed package list"
+            loading_progress_mark_running "${manager}" "read installed"
             local_source_file="$(mktemp "${SESSION_TMP_ROOT}/source.XXXXXX")"
             manager_installed_entries "${manager}" >"${local_source_file}" || true
             if [[ -s "${local_source_file}" ]]; then

package/package.json

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