fpf-cli 1.6.47 → 1.6.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/fpf +40 -9
- package/package.json +1 -1
package/fpf
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
set -euo pipefail
|
|
4
4
|
|
|
5
5
|
SCRIPT_NAME="fpf"
|
|
6
|
-
SCRIPT_VERSION="1.6.
|
|
6
|
+
SCRIPT_VERSION="1.6.48"
|
|
7
7
|
TMP_ROOT="${TMPDIR:-/tmp}/fpf"
|
|
8
8
|
SESSION_TMP_ROOT=""
|
|
9
9
|
HELP_FILE=""
|
|
@@ -3343,6 +3343,7 @@ collect_installed_display_rows() {
|
|
|
3343
3343
|
build_dynamic_reload_command() {
|
|
3344
3344
|
local manager_override="$1"
|
|
3345
3345
|
local fallback_file="$2"
|
|
3346
|
+
local manager_list_csv="${3:-}"
|
|
3346
3347
|
local script_path="${BASH_SOURCE[0]}"
|
|
3347
3348
|
local bypass_query_cache="1"
|
|
3348
3349
|
|
|
@@ -3352,13 +3353,14 @@ build_dynamic_reload_command() {
|
|
|
3352
3353
|
script_path="$(pwd)/${script_path}"
|
|
3353
3354
|
fi
|
|
3354
3355
|
|
|
3355
|
-
printf 'FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --dynamic-reload -- "{q}"' "${bypass_query_cache}" "${manager_override}" "${fallback_file}" "${script_path}"
|
|
3356
|
+
printf 'FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_MANAGER_LIST=%q FPF_IPC_FALLBACK_FILE=%q %q --dynamic-reload -- "{q}"' "${bypass_query_cache}" "${manager_override}" "${manager_list_csv}" "${fallback_file}" "${script_path}"
|
|
3356
3357
|
}
|
|
3357
3358
|
|
|
3358
3359
|
build_dynamic_reload_command_for_query() {
|
|
3359
3360
|
local manager_override="$1"
|
|
3360
3361
|
local fallback_file="$2"
|
|
3361
|
-
local
|
|
3362
|
+
local manager_list_csv="$3"
|
|
3363
|
+
local query_value="$4"
|
|
3362
3364
|
local script_path="${BASH_SOURCE[0]}"
|
|
3363
3365
|
local bypass_query_cache="1"
|
|
3364
3366
|
|
|
@@ -3368,31 +3370,33 @@ build_dynamic_reload_command_for_query() {
|
|
|
3368
3370
|
script_path="$(pwd)/${script_path}"
|
|
3369
3371
|
fi
|
|
3370
3372
|
|
|
3371
|
-
printf 'FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --dynamic-reload -- %q' "${bypass_query_cache}" "${manager_override}" "${fallback_file}" "${script_path}" "${query_value}"
|
|
3373
|
+
printf 'FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_MANAGER_LIST=%q FPF_IPC_FALLBACK_FILE=%q %q --dynamic-reload -- %q' "${bypass_query_cache}" "${manager_override}" "${manager_list_csv}" "${fallback_file}" "${script_path}" "${query_value}"
|
|
3372
3374
|
}
|
|
3373
3375
|
|
|
3374
3376
|
build_dynamic_reload_ipc_command() {
|
|
3375
3377
|
local manager_override="$1"
|
|
3376
3378
|
local fallback_file="$2"
|
|
3379
|
+
local manager_list_csv="${3:-}"
|
|
3377
3380
|
local script_path="${BASH_SOURCE[0]}"
|
|
3378
3381
|
|
|
3379
3382
|
if [[ "${script_path}" != /* ]]; then
|
|
3380
3383
|
script_path="$(pwd)/${script_path}"
|
|
3381
3384
|
fi
|
|
3382
3385
|
|
|
3383
|
-
printf 'FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --ipc-reload -- "{q}"' "${manager_override}" "${fallback_file}" "${script_path}"
|
|
3386
|
+
printf 'FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_MANAGER_LIST=%q FPF_IPC_FALLBACK_FILE=%q %q --ipc-reload -- "{q}"' "${manager_override}" "${manager_list_csv}" "${fallback_file}" "${script_path}"
|
|
3384
3387
|
}
|
|
3385
3388
|
|
|
3386
3389
|
build_dynamic_query_notify_ipc_command() {
|
|
3387
3390
|
local manager_override="$1"
|
|
3388
3391
|
local fallback_file="$2"
|
|
3392
|
+
local manager_list_csv="${3:-}"
|
|
3389
3393
|
local script_path="${BASH_SOURCE[0]}"
|
|
3390
3394
|
|
|
3391
3395
|
if [[ "${script_path}" != /* ]]; then
|
|
3392
3396
|
script_path="$(pwd)/${script_path}"
|
|
3393
3397
|
fi
|
|
3394
3398
|
|
|
3395
|
-
printf 'FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --ipc-query-notify -- "{q}"' "${manager_override}" "${fallback_file}" "${script_path}"
|
|
3399
|
+
printf 'FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_MANAGER_LIST=%q FPF_IPC_FALLBACK_FILE=%q %q --ipc-query-notify -- "{q}"' "${manager_override}" "${manager_list_csv}" "${fallback_file}" "${script_path}"
|
|
3396
3400
|
}
|
|
3397
3401
|
|
|
3398
3402
|
fzf_supports_listen() {
|
|
@@ -3497,11 +3501,15 @@ send_fzf_prompt_action() {
|
|
|
3497
3501
|
run_dynamic_reload_action() {
|
|
3498
3502
|
local query="$1"
|
|
3499
3503
|
local manager_override="${FPF_IPC_MANAGER_OVERRIDE:-}"
|
|
3504
|
+
local manager_list_csv="${FPF_IPC_MANAGER_LIST:-}"
|
|
3500
3505
|
local fallback_file="${FPF_IPC_FALLBACK_FILE:-}"
|
|
3501
3506
|
local min_chars="${FPF_RELOAD_MIN_CHARS:-2}"
|
|
3502
3507
|
local reload_debounce="${FPF_RELOAD_DEBOUNCE:-0.12}"
|
|
3503
3508
|
local output_file=""
|
|
3504
3509
|
local detected_manager=""
|
|
3510
|
+
local manager_seen=""
|
|
3511
|
+
local manager_entry=""
|
|
3512
|
+
local -a manager_list_entries=()
|
|
3505
3513
|
local -a managers=()
|
|
3506
3514
|
|
|
3507
3515
|
if [[ -z "${fallback_file}" || ! -r "${fallback_file}" ]]; then
|
|
@@ -3530,6 +3538,25 @@ run_dynamic_reload_action() {
|
|
|
3530
3538
|
return 0
|
|
3531
3539
|
fi
|
|
3532
3540
|
managers+=("${manager_override}")
|
|
3541
|
+
elif [[ -n "${manager_list_csv}" ]]; then
|
|
3542
|
+
IFS=',' read -r -a manager_list_entries <<<"${manager_list_csv}"
|
|
3543
|
+
for manager_entry in "${manager_list_entries[@]-}"; do
|
|
3544
|
+
manager_entry="$(trim_whitespace "${manager_entry}")"
|
|
3545
|
+
[[ -n "${manager_entry}" ]] || continue
|
|
3546
|
+
|
|
3547
|
+
detected_manager="$(normalize_manager "${manager_entry}")"
|
|
3548
|
+
if ! manager_supported "${detected_manager}" || ! manager_command_ready "${detected_manager}"; then
|
|
3549
|
+
continue
|
|
3550
|
+
fi
|
|
3551
|
+
|
|
3552
|
+
case " ${manager_seen} " in
|
|
3553
|
+
*" ${detected_manager} "*)
|
|
3554
|
+
continue
|
|
3555
|
+
;;
|
|
3556
|
+
esac
|
|
3557
|
+
manager_seen+=" ${detected_manager}"
|
|
3558
|
+
managers+=("${detected_manager}")
|
|
3559
|
+
done
|
|
3533
3560
|
else
|
|
3534
3561
|
while IFS= read -r detected_manager; do
|
|
3535
3562
|
[[ -n "${detected_manager}" ]] || continue
|
|
@@ -3559,6 +3586,7 @@ run_dynamic_reload_action() {
|
|
|
3559
3586
|
run_ipc_reload_action() {
|
|
3560
3587
|
local query="$1"
|
|
3561
3588
|
local manager_override="${FPF_IPC_MANAGER_OVERRIDE:-}"
|
|
3589
|
+
local manager_list_csv="${FPF_IPC_MANAGER_LIST:-}"
|
|
3562
3590
|
local fallback_file="${FPF_IPC_FALLBACK_FILE:-}"
|
|
3563
3591
|
local reload_command
|
|
3564
3592
|
local action_payload
|
|
@@ -3572,7 +3600,7 @@ run_ipc_reload_action() {
|
|
|
3572
3600
|
manager_supported "${manager_override}" || return 1
|
|
3573
3601
|
fi
|
|
3574
3602
|
|
|
3575
|
-
reload_command="$(build_dynamic_reload_command_for_query "${manager_override}" "${fallback_file}" "${query}")"
|
|
3603
|
+
reload_command="$(build_dynamic_reload_command_for_query "${manager_override}" "${fallback_file}" "${manager_list_csv}" "${query}")"
|
|
3576
3604
|
action_payload="change-prompt(Search> )+reload(${reload_command})"
|
|
3577
3605
|
send_fzf_listen_action "${action_payload}"
|
|
3578
3606
|
}
|
|
@@ -3962,8 +3990,11 @@ main() {
|
|
|
3962
3990
|
local reload_cmd=""
|
|
3963
3991
|
local reload_ipc_cmd=""
|
|
3964
3992
|
local reload_fallback_file="${display_file}"
|
|
3993
|
+
local reload_manager_list=""
|
|
3965
3994
|
if [[ "${ACTION}" == "search" ]]; then
|
|
3966
3995
|
if dynamic_reload_enabled "${#managers[@]}"; then
|
|
3996
|
+
reload_manager_list="$(IFS=,; printf "%s" "${managers[*]-}")"
|
|
3997
|
+
|
|
3967
3998
|
if [[ -n "${query}" ]]; then
|
|
3968
3999
|
reload_fallback_file="$(mktemp "${SESSION_TMP_ROOT}/reload-fallback.XXXXXX")"
|
|
3969
4000
|
loading_progress_begin "${managers[@]-}"
|
|
@@ -3977,9 +4008,9 @@ main() {
|
|
|
3977
4008
|
fi
|
|
3978
4009
|
fi
|
|
3979
4010
|
|
|
3980
|
-
reload_cmd="$(build_dynamic_reload_command "${MANAGER_OVERRIDE}" "${reload_fallback_file}")"
|
|
4011
|
+
reload_cmd="$(build_dynamic_reload_command "${MANAGER_OVERRIDE}" "${reload_fallback_file}" "${reload_manager_list}")"
|
|
3981
4012
|
if dynamic_reload_use_ipc; then
|
|
3982
|
-
reload_ipc_cmd="$(build_dynamic_query_notify_ipc_command "${MANAGER_OVERRIDE}" "${reload_fallback_file}")"
|
|
4013
|
+
reload_ipc_cmd="$(build_dynamic_query_notify_ipc_command "${MANAGER_OVERRIDE}" "${reload_fallback_file}" "${reload_manager_list}")"
|
|
3983
4014
|
fi
|
|
3984
4015
|
fi
|
|
3985
4016
|
fi
|