From 872cb3a7414d813be77635a4143f5a395e3f8dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=84min=20Baumeler?= Date: Tue, 2 Sep 2025 14:07:14 +0200 Subject: [PATCH] bugfix and open key --- src/main.sh | 1 + src/sh/fzf.sh | 15 +++++++++++---- src/sh/keys.sh | 5 +++-- src/sh/theme.sh | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main.sh b/src/main.sh index 56260b9..8a8d069 100755 --- a/src/main.sh +++ b/src/main.sh @@ -217,6 +217,7 @@ while true; do $FZF \ --bind="$KEYS_HALFPAGE_DOWN,$KEYS_HALFPAGE_UP,\ $KEYS_BROWSE,\ +$KEYS_OPEN,\ $KEYS_FILTER_LOCAL:transform:$0 --fzf-key {2} {3} {4}" \ -0 -1 \ --border="bold" \ diff --git a/src/sh/fzf.sh b/src/sh/fzf.sh index 2b142d1..e7c38bd 100644 --- a/src/sh/fzf.sh +++ b/src/sh/fzf.sh @@ -271,6 +271,13 @@ fzf_handle_key() { case ",$KEYS_HALFPAGE_UP," in *",$FZF_KEY,"*) printf "half-page-up" ;; esac + case ",$KEYS_OPEN," in + *",$FZF_KEY,"*) + [ "$path" ] || return 0 + open "$(dirname "$path")" + return 0 + ;; + esac case ",$KEYS_BROWSE," in *",$FZF_KEY,"*) [ "$mbid" ] || return 0 @@ -314,10 +321,10 @@ fzf_handle_key() { "$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST") VIEW_NEXT="$VIEW_ARTIST" ;; - "$VIEW_ARTIST" | "$VIEW_SEARCH_ALBUM") + "$VIEW_ARTIST" | "$VIEW_SEARCH_ALBUM" | "$VIEW_LIST_ALBUMS") VIEW_NEXT="$VIEW_RELEASEGROUP" ;; - "$VIEW_RELEASEGROUP" | "$VIEW_LIST_ALBUMS") + "$VIEW_RELEASEGROUP") VIEW_NEXT="$VIEW_RELEASE" ;; esac @@ -477,10 +484,10 @@ fzf_handle_key() { "$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST") VIEW_NEXT="$VIEW_ARTIST" ;; - "$VIEW_ARTIST" | "$VIEW_SEARCH_ALBUM") + "$VIEW_ARTIST" | "$VIEW_SEARCH_ALBUM" | "$VIEW_LIST_ALBUMS") VIEW_NEXT="$VIEW_RELEASEGROUP" ;; - "$VIEW_RELEASEGROUP" | "$VIEW_LIST_ALBUMS") + "$VIEW_RELEASEGROUP") VIEW_NEXT="$VIEW_RELEASE" ;; esac diff --git a/src/sh/keys.sh b/src/sh/keys.sh index 5bf9f99..99f2f60 100644 --- a/src/sh/keys.sh +++ b/src/sh/keys.sh @@ -7,6 +7,7 @@ export KEYS_INPUT_SINGLE KEYS_INPUT_SPECIAL KEYS_HALFPAGE_DOWN="${KEYS_HALFPAGE_DOWN:-"ctrl-d"}" KEYS_HALFPAGE_UP="${KEYS_HALFPAGE_UP:-"ctrl-u"}" KEYS_BROWSE="${KEYS_BROWSE:-"alt-b"}" +KEYS_OPEN="${KEYS_OPEN:-"alt-o"}" KEYS_OUT="${KEYS_OUT:-"ctrl-h"}" KEYS_IN="${KEYS_IN:-"ctrl-l"}" KEYS_SELECT_ARTIST="${KEYS_SELECT_ARTIST:-"ctrl-a"}" @@ -43,7 +44,7 @@ KEYS_PLAYLIST_RELOAD="${KEYS_PLAYLIST_RELOAD:-"r"}" KEYS_I_NORMAL="${KEYS_I_NORMAL:-"esc"}" # Grouping -KEYS_GROUP_NI="$KEYS_HALFPAGE_DOWN,$KEYS_HALFPAGE_UP,$KEYS_BROWSE,$KEYS_OUT,$KEYS_IN,$KEYS_SELECT_ARTIST,$KEYS_FILTER_LOCAL,$KEYS_FILTER_1,$KEYS_FILTER_2,$KEYS_FILTER_3,$KEYS_FILTER_4,$KEYS_SWITCH_ARTIST_ALBUM,$KEYS_SWITCH_LOCAL_REMOTE,$KEYS_PLAY,$KEYS_QUEUE,$KEYS_SHOW_PLAYLIST" +KEYS_GROUP_NI="$KEYS_HALFPAGE_DOWN,$KEYS_HALFPAGE_UP,$KEYS_OPEN,$KEYS_BROWSE,$KEYS_OUT,$KEYS_IN,$KEYS_SELECT_ARTIST,$KEYS_FILTER_LOCAL,$KEYS_FILTER_1,$KEYS_FILTER_2,$KEYS_FILTER_3,$KEYS_FILTER_4,$KEYS_SWITCH_ARTIST_ALBUM,$KEYS_SWITCH_LOCAL_REMOTE,$KEYS_PLAY,$KEYS_QUEUE,$KEYS_SHOW_PLAYLIST" KEYS_GROUP_N="$KEYS_N_DOWN,$KEYS_N_UP,$KEYS_N_OUT,$KEYS_N_IN,$KEYS_N_TOP,$KEYS_N_BOT,$KEYS_N_QUIT,$KEYS_N_INSERT,$KEYS_N_TOGGLE_PLAY_PAUSE,$KEYS_N_PLAY_NEXT,$KEYS_N_PLAY_PREV,$KEYS_N_SEEK_FORWARD,$KEYS_N_SEEK_BACKWARD" @@ -53,7 +54,7 @@ KEYS_PLAYLIST="$KEYS_PLAYLIST_RELOAD" KEYS_ALL="$KEYS_GROUP_NI,$KEYS_GROUP_N,$KEYS_GROUP_I,$KEYS_INPUT_SINGLE,$KEYS_INPUT_SPECIAL,$KEYS_PLAYLIST" -export KEYS_HALFPAGE_DOWN KEYS_HALFPAGE_UP KEYS_BROWSE KEYS_OUT KEYS_IN \ +export KEYS_HALFPAGE_DOWN KEYS_HALFPAGE_UP KEYS_OPEN KEYS_BROWSE KEYS_OUT KEYS_IN \ KEYS_SELECT_ARTIST KEYS_FILTER_LOCAL KEYS_FILTER_1 KEYS_FILTER_2 KEYS_FILETER_3 KEYS_FILTER_4 \ KEYS_SWITCH_ARTIST_ALBUM KEYS_SWITCH_LOCAL_REMOTE KEYS_PLAY KEYS_QUEUE \ KEYS_N_DOWN KEYS_N_UP KEYS_N_OUT KEYS_N_IN KEYS_N_TOP KEYS_N_BOT KEYS_N_QUIT KEYS_N_INSERT \ diff --git a/src/sh/theme.sh b/src/sh/theme.sh index 4f1b1b5..8210652 100644 --- a/src/sh/theme.sh +++ b/src/sh/theme.sh @@ -37,9 +37,9 @@ FULL_PROMPT="${FULL_PROMPT:-"🎤 ${CARTIST}%s$OFF 》${CTITLE}%s$OFF 〉"}" # Visual representation of current mode # ===================================== # Sign to indicate `normal` mode -PROMPT_NORMAL="${PROMPT_NORMAL:-"[n]"}" +PROMPT_NORMAL="${PROMPT_NORMAL:-"${FAINT}[n]${OFF}"}" # Sign to indicate `insert` mode -PROMPT_INSERT="${PROMPT_INSERT:-"[i]"}" +PROMPT_INSERT="${PROMPT_INSERT:-"${FAINT}[i]${OFF}"}" # Artist view # ===========