From a1ae20fa827b88e03382c4c759e35fd11f051048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=84min=20Baumeler?= Date: Wed, 27 Aug 2025 17:38:11 +0200 Subject: [PATCH] keys configurable, multiple keys support, decreasesd fzf processes --- src/main.sh | 471 +++++++++++------------------------------------- src/sh/api.sh | 2 +- src/sh/keys.sh | 24 +++ src/sh/lists.sh | 26 +++ src/sh/tools.sh | 2 +- 5 files changed, 157 insertions(+), 368 deletions(-) create mode 100644 src/sh/keys.sh diff --git a/src/main.sh b/src/main.sh index 968e2ba..b157c29 100755 --- a/src/main.sh +++ b/src/main.sh @@ -14,6 +14,9 @@ set -eu # Load theme . "sh/theme.sh" +# Load keys +. "sh/keys.sh" + # Load AWK scripts . "sh/awk.sh" @@ -57,9 +60,6 @@ if [ "${1:-}" = "--fzf-reload" ]; then "$MODE_LIST_ALBUMS") list_local_releasegroups ;; - "$MODE_SELECT_ARTIST") - true - ;; esac exit 0 fi @@ -101,9 +101,8 @@ if [ "${1:-}" = "--fzf-load" ]; then SHOW_PREVIEW=1 ;; "$MODE_LIST_ALBUMS") ;; - "$MODE_SELECT_ARTIST") ;; esac - [ "${QUERY:-}" ] && printf "+change-query(%s)" "$QUERY" + printf "+change-query(%s)" "${QUERY:-}" printf "+change-prompt(%s)" "${PROMPT:-"$SEARCH_PROMPT"}" [ "${DISABLE_SEARCH:-}" ] && printf "+disable-search" || printf "+enable-search" [ "${SHOW_PREVIEW:-}" ] && printf "+show-preview" || printf "+hide-preview" @@ -128,7 +127,7 @@ if [ "${1:-}" = "--fzf-info" ]; then echo "Search albums" ;; "$MODE_SELECT_ARTIST") - echo "Select artist" + echo "Select artist (WE SHOULDNT SEE THIS; THIS IS A BUG!)" ;; *) if [ "$FZF_KEY" ]; then @@ -231,37 +230,18 @@ if [ "${1:-}" = "--fzf-change" ]; then exit 0 fi -generate_playlist() { - dir="$(dirname "$2")" - mb_release "$1" | - $JQ -r --slurpfile deco "$2" --arg base "$dir" '$deco[].tracks as $filenames | - .media[] | - .position as $pos | - .tracks | - map({ - $pos, - number: .number, - file: $filenames[.id] - }) | - map( - if(.number | type == "string" and test("^[0-9]+$")) then - .number |= tonumber - else - . - end - ) | - sort_by([.pos, .number]) | - map($base + "/" + .file)[]' -} - if [ "${1:-}" = "--fzf-key" ]; then + foo "KEY: $*" mbid="${2:-}" path="${3:-}" mode=$(cut -d "#" -f 1 "$MODEFILE") args=$(cut -d "#" -f 2- "$MODEFILE") - if [ "$FZF_KEY" = "enter" ] && [ "$path" ]; then - case "$mode" in + + case ",$FZF_KEY," in + *",$KEYS_PLAY,"*) + [ "$path" ] && case "$mode" in "$MODE_RELEASEGROUP") + tmplist=$(mktemp) generate_playlist "$mbid" "$path" >"$tmplist" mpv_play_list "$tmplist" >/dev/null rm -f "$tmplist" @@ -270,62 +250,60 @@ if [ "${1:-}" = "--fzf-key" ]; then mpv_play_file "$path" >/dev/null ;; esac - elif [ "$FZF_KEY" = "alt-enter" ] && [ "$path" ]; then - case "$mode" in + ;; + *",$KEYS_QUEUE,"*) + [ "$path" ] && case "$mode" in "$MODE_RELEASEGROUP") + tmplist=$(mktemp) generate_playlist "$mbid" "$path" >"$tmplist" mpv_queue_list "$tmplist" >/dev/null rm -f "$tmplist" ;; "$MODE_RELEASE") - mpv_queue_file "$path" >/dev/null + mpv_play_file "$path" >/dev/null ;; esac - elif [ "$FZF_KEY" = "alt-space" ]; then - mpv_toggle_pause >/dev/null - elif [ "$FZF_KEY" = "ctrl-n" ] && [ "$path" ]; then - mpv_next >/dev/null - elif [ "$FZF_KEY" = "ctrl-p" ] && [ "$path" ]; then - mpv_prev >/dev/null - elif [ "$FZF_KEY" = "shift-right" ] && [ "$path" ]; then - mpv_seek_forward >/dev/null - elif [ "$FZF_KEY" = "shift-left" ] && [ "$path" ]; then - mpv_seek_backward >/dev/null - elif [ "$FZF_KEY" = "ctrl-d" ]; then - printf "half-page-down" - elif [ "$FZF_KEY" = "down" ]; then - printf "preview-half-page-down" - elif [ "$FZF_KEY" = "up" ]; then - printf "preview-half-page-up" - elif [ "$FZF_KEY" = "ctrl-u" ]; then - printf "half-page-up" - elif [ "$FZF_KEY" = "alt-l" ]; then + ;; + *",$KEYS_TOGGLE_PLAY_PAUSE,"*) mpv_toggle_pause >/dev/null ;; + *",$KEYS_PLAY_NEXT,"*) [ "$path" ] && mpv_next >/dev/null ;; + *",$KEYS_PLAY_PREV,"*) [ "$path" ] && mpv_prev >/dev/null ;; + *",$KEYS_SEEK_FORWARD,"*) mpv_seek_forward >/dev/null ;; + *",$KEYS_SEEK_BACKWARD,"*) mpv_seek_backward >/dev/null ;; + *",$KEYS_HALFPAGE_DOWN,"*) printf "half-page-down" ;; + *",$KEYS_HALFPAGE_UP,"*) printf "half-page-up" ;; + *",$KEYS_FILTER_LOCAL,"*) case "$mode" in "$MODE_SEARCH_ARTIST" | "$MODE_SEARCH_ALBUM") ;; *) QUERY="$FORMAT_LOCAL " ;; esac - elif [ "$FZF_KEY" = "tab" ]; then + ;; + *",$KEYS_SWITCH_ARTIST_ALBUM,"*) case "$mode" in "$MODE_SEARCH_ARTIST") MODE_NEXT="$MODE_SEARCH_ALBUM" ;; "$MODE_SEARCH_ALBUM") MODE_NEXT="$MODE_SEARCH_ARTIST" ;; "$MODE_LIST_ARTISTS") MODE_NEXT="$MODE_LIST_ALBUMS" ;; "$MODE_LIST_ALBUMS") MODE_NEXT="$MODE_LIST_ARTISTS" ;; esac - elif [ "$FZF_KEY" = "ctrl-/" ]; then + ;; + *",$KEYS_SWITCH_LOCAL_REMOTE,"*) case "$mode" in "$MODE_SEARCH_ARTIST") MODE_NEXT="$MODE_LIST_ARTISTS" ;; "$MODE_SEARCH_ALBUM") MODE_NEXT="$MODE_LIST_ALBUMS" ;; "$MODE_LIST_ARTISTS") MODE_NEXT="$MODE_SEARCH_ARTIST" ;; "$MODE_LIST_ALBUMS") MODE_NEXT="$MODE_SEARCH_ALBUM" ;; esac - elif [ "$FZF_KEY" = "alt-b" ] && [ "$mbid" ]; then + ;; + *",$KEYS_BROWSE,"*) + [ "$mbid" ] || exit 0 case "$mode" in + "$MODE_SEARCH_ARTIST" | "$MODE_LIST_ARTISTS") urltype="artist" ;; "$MODE_ARTIST") urltype="release-group" ;; "$MODE_RELEASEGROUP") urltype="release" ;; "$MODE_RELEASE") urltype="track" ;; esac - printf "esecute-silent(xdg-open \"https://musicbrainz.org/%s/%s\" &)" "$urltype" "$mbid" - elif [ "$FZF_KEY" = "ctrl-h" ]; then + printf "execute-silent(xdg-open \"https://musicbrainz.org/%s/%s\" &)" "$urltype" "$mbid" + ;; + *",$KEYS_OUT,"*) case "$mode" in "$MODE_ARTIST") MODE_NEXT="$MODE_LIST_ARTISTS" @@ -333,13 +311,16 @@ if [ "${1:-}" = "--fzf-key" ]; then "$MODE_RELEASEGROUP") MODE_NEXT="$MODE_SELECT_ARTIST" MODE_NEXT_ARGS="$(mb_releasegroup "$args" | $JQ -r --compact-output '."artist-credit"')" + ACCEPT=1 ;; "$MODE_RELEASE") MODE_NEXT="$MODE_RELEASEGROUP" MODE_NEXT_ARGS="$(mb_release "$args" | $JQ -r --compact-output '."release-group".id')" ;; esac - elif [ "$FZF_KEY" = "ctrl-l" ] && [ "$mbid" ]; then + ;; + *",$KEYS_IN,"*) + [ "$mbid" ] || exit 0 MODE_NEXT_ARGS="$mbid" case "$mode" in "$MODE_LIST_ARTISTS" | "$MODE_SEARCH_ARTIST") @@ -352,40 +333,40 @@ if [ "${1:-}" = "--fzf-key" ]; then MODE_NEXT="$MODE_RELEASE" ;; esac - elif [ "$FZF_KEY" = "ctrl-a" ] && [ "$mbid" ]; then + ;; + *",$KEYS_SELECT_ARTIST,"*) + [ "$mbid" ] || exit 0 case "$mode" in "$MODE_ARTIST" | "$MODE_SEARCH_ARTIST" | "$MODE_LIST_ARTISTS") MODE_NEXT_ARGS="$(mb_releasegroup "$mbid" | $JQ -r --compact-output '."artist-credit"')" + ACCEPT=1 ;; "$MODE_RELEASEGROUP" | "$MODE_SEARCH_ALBUM" | "$MODE_LIST_ALBUMS") MODE_NEXT_ARGS="$(mb_release "$mbid" | $JQ -r --compact-output '."artist-credit"')" + ACCEPT=1 ;; "$MODE_RELEASE") MODE_NEXT_ARGS="$(mb_release "$args" | $JQ -r --compact-output '."artist-credit"')" + ACCEPT=1 ;; esac [ "$MODE_NEXT_ARGS" ] && MODE_NEXT="$MODE_SELECT_ARTIST" - else - # View specific commands - case "$mode" in - "$MODE_ARTIST") - case "$FZF_KEY" in - "alt-1") - secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")" - QUERY="!$secsymb " - ;; - "alt-2") - secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")" - QUERY="$secsymb " - ;; - esac - ;; - esac - fi + ;; + *",$KEYS_FILTER_PRIMARY,"*) + [ "$mode" = "$MODE_ARTIST" ] || exit 0 + secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")" + QUERY="!$secsymb " + ;; + *",$KEYS_FILTER_SECONDARY,"*) + [ "$mode" = "$MODE_ARTIST" ] || exit 0 + secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")" + QUERY="$secsymb " + ;; + esac [ "${QUERY:-}" ] && printf "+change-query(%s)" "$QUERY" if [ "$MODE_NEXT" ]; then printf "%s#%s" "$MODE_NEXT" "${MODE_NEXT_ARGS:-}" >"$MODEFILE" - printf "+clear-query+reload:%s" "$0 --fzf-reload" + [ "${ACCEPT:-}" ] && printf "+accept" || printf "+reload:%s" "$0 --fzf-reload" fi exit 0 fi @@ -433,7 +414,7 @@ GENERAL OPTIONS: MANAGE LOCAL MUSIC: --decorate Decorate directory containing a tagged release - --reload Populate database with decorated local music from + --reload Populate da$KEYS_SWITCH_ARTIST_ALBUMase with decorated local music from EOF exit 0 fi @@ -469,8 +450,10 @@ MODE_SEARCH_ALBUM="search-album" MODE_LIST_ARTISTS="list-artists" MODE_LIST_ALBUMS="list-albums" MODE_SELECT_ARTIST="select-artist" +MODE_PLAYLIST="playlist" export MODE_ARTIST MODE_RELEASEGROUP MODE_RELEASE MODE_SEARCH_ARTIST \ - MODE_SEARCH_ALBUM MODE_LIST_ARTISTS MODE_LIST_ALBUMS MODE_SELECT_ARTIST + MODE_SEARCH_ALBUM MODE_LIST_ARTISTS MODE_LIST_ALBUMS MODE_SELECT_ARTIST \ + MODE_PLAYLIST case "${1:-}" in "--artist") @@ -506,134 +489,14 @@ esac # Start mpv mpv_start -$FZF \ - --bind="start:reload:$0 --fzf-reload" \ - --bind="load:transform:$0 --fzf-load" \ - --bind="change:execute-silent($0 --fzf-change &)+reload:$0 --fzf-change-reload" \ - --bind="ctrl-d:transform:$0 --fzf-key" \ - --bind="ctrl-u:transform:$0 --fzf-key" \ - --bind="alt-b:transform:$0 --fzf-key {2}" \ - --bind="ctrl-h:transform:$0 --fzf-key {2}" \ - --bind="ctrl-l:transform:$0 --fzf-key {2}" \ - --bind="ctrl-a:transform:$0 --fzf-key {2}" \ - --bind="alt-l:transform:$0 --fzf-key" \ - --bind="alt-1:transform:$0 --fzf-key" \ - --bind="alt-2:transform:$0 --fzf-key" \ - --bind="tab:transform:$0 --fzf-key" \ - --bind="ctrl-/:transform:$0 --fzf-key" \ - --bind="enter:transform:$0 --fzf-key {2} {3}" \ - --bind="alt-enter:transform:$0 --fzf-key {2} {3}" \ - --bind="alt-space:transform:$0 --fzf-key" \ - --bind="alt-space:transform:$0 --fzf-key" \ - --bind="ctrl-n:transform:$0 --fzf-key" \ - --bind="ctrl-p:transform:$0 --fzf-key" \ - --bind="shift-right:transform:$0 --fzf-key" \ - --bind="shift-left:transform:$0 --fzf-key" \ - --info="inline-right" \ - --info-command="$0 --fzf-info" \ - --preview-window="right,25%,border-left,wrap,<30(hidden)" \ - --preview="$0 --internal-preview-artist {2}" \ - --delimiter="\t" \ - --with-nth="{1}" \ - --accept-nth="{2}" - +# $KEYS_PLAY main loop while true; do - case "${1:-}" in - "--releasegroup") - title="$(mb_releasegroup "$2" | - $JQ -r '.title')" - artist="$(mb_releasegroup "$2" | - $JQ -r '."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")')" + mode=$(cut -d "#" -f 1 "$MODEFILE") + args=$(cut -d "#" -f 2- "$MODEFILE") + case "$mode" in + "$MODE_SELECT_ARTIST") sel=$( - $0 --internal-list-releases "$2" | - $FZF \ - --no-clear \ - --ansi \ - --reverse \ - --cycle \ - --no-sort \ - --query="$FORMAT_STATUS_OFFICIAL " \ - --delimiter="\t" \ - --prompt="$(printf "$FULL_PROMPT" "$artist" "$title")" \ - --accept-nth="{2}" \ - --with-nth="{1}" \ - --expect="ctrl-h,ctrl-a" \ - --bind="alt-l:change-query($FORMAT_LOCAL )" \ - --bind="load:transform:[ \"\$FZF_TOTAL_COUNT\" -gt 0 ] && echo \"rebind:ctrl-l\" || echo \"unbind:ctrl-l\"" \ - --bind="enter:execute-silent:$0 --play-release {2} {3}" \ - --bind="alt-enter:execute-silent:$0 --play-release {2} {3} q" \ - --bind="alt-space:execute-silent:$0 --play-toggle" \ - --bind="ctrl-n:execute-silent:$0 --play-next" \ - --bind="ctrl-p:execute-silent:$0 --play-previous" \ - --bind="shift-right:execute-silent:$0 --seek-forward" \ - --bind="shift-left:execute-silent:$0 --seek-backward" \ - --bind="focus:transform: - [ {3} ] && c=rebind || c=unbind - for key in enter alt-enter alt-space ctrl-n ctrl-p shift-right shift-left; do - printf \"+%s(%s)\" \"\$c\" \"\$key\" - done - " \ - --bind="ctrl-l:accept" \ - --bind="alt-b:execute-silent:xdg-open 'https://musicbrainz.org/release/{r2}' &" \ - --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" - ) - lns=$(echo "$sel" | wc -l) - key=$(echo "$sel" | head -1 | tail -1) - mid=$(echo "$sel" | head -2 | tail -1) - [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--release" "$mid" - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-h" ] && set -- "--select-artist" "$(mb_releasegroup "$2" | $JQ -r -c '."artist-credit"')" - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_release "$mid" | $JQ -r -c '."artist-credit"')" - ;; - "--release") - title="$(mb_release "$2" | - $JQ -r '.title')" - artist="$(mb_release "$2" | - $JQ -r '."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")')" - sel=$( - $0 --internal-list-recordings "$2" | - $FZF \ - --no-clear \ - --ansi \ - --reverse \ - --cycle \ - --no-sort \ - --delimiter="\t" \ - --prompt="$(printf "$FULL_PROMPT" "$artist" "$title")" \ - --accept-nth="{2}" \ - --with-nth="{1}" \ - --expect="ctrl-h,ctrl-a" \ - --bind="alt-l:change-query($FORMAT_LOCAL )" \ - --bind="enter:execute-silent:$0 --play-recording {3}" \ - --bind="alt-enter:execute-silent:$0 --play-recording {3} q" \ - --bind="alt-space:execute-silent:$0 --play-toggle" \ - --bind="ctrl-n:execute-silent:$0 --play-next" \ - --bind="ctrl-p:execute-silent:$0 --play-previous" \ - --bind="shift-right:execute-silent:$0 --seek-forward" \ - --bind="shift-left:execute-silent:$0 --seek-backward" \ - --bind="focus:transform: - [ {3} ] && c=rebind || c=unbind - for key in enter alt-enter alt-space ctrl-n ctrl-p shift-right shift-left; do - printf \"+%s(%s)\" \"\$c\" \"\$key\" - done - " \ - --bind="alt-b:execute-silent:xdg-open 'https://musicbrainz.org/track/{r2}' &" \ - --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" - ) - lns=$(echo "$sel" | wc -l) - key=$(echo "$sel" | head -1 | tail -1) - mid=$(echo "$sel" | head -2 | tail -1) - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-h" ] && set -- "--releasegroup" "$(mb_release "$2" | $JQ -r -c '."release-group".id')" - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_release "$2" | $JQ -r -c ".media[].tracks[] | select(.id==\"$mid\") | .\"artist-credit\"")" - ;; - "--playlist") - count=$(mpv_playlist_count) - echo "Playlist: count=$count" >>/tmp/foo - set -- "" - ;; - "--select-artist") - tput rmcup - sel=$( - echo "$2" | + echo "$args" | $JQ -r 'map([.artist.id, .artist.type, .name] | join("\t")) | join("\n")' | awk \ -F "\t" \ @@ -646,177 +509,53 @@ while true; do column -t -s "$(printf '\t')" | sed 's| \+\([0-9a-f-]\+\)$|\t\1|' | $FZF \ - --no-clear \ + --bind="$KEYS_HALFPAGE_DOWN:transform:$0 --fzf-key" \ + --bind="$KEYS_HALFPAGE_UP:transform:$0 --fzf-key" \ + --bind="$KEYS_BROWSE:transform:$0 --fzf-key {2}" \ + --bind="$KEYS_FILTER_LOCAL:transform:$0 --fzf-key" \ + --bind="$KEYS_TOGGLE_PLAY_PAUSE:transform:$0 --fzf-key" \ + --bind="$KEYS_PLAY_NEXT:transform:$0 --fzf-key" \ + --bind="$KEYS_PLAY_PREV:transform:$0 --fzf-key" \ + --bind="$KEYS_SEEK_FORWARD:transform:$0 --fzf-key" \ + --bind="$KEYS_SEEK_BACKWARD:transform:$0 --fzf-key" \ -1 \ - --ansi \ - --cycle \ - --no-sort \ --border="bold" \ --border-label="Select artist" \ --delimiter="\t" \ --prompt="$SEARCH_PROMPT" \ --margin="5%,20%" \ - --bind="alt-l:change-query($FORMAT_LOCAL )" \ + --bind="$KEYS_FILTER_LOCAL:change-query($FORMAT_LOCAL )" \ --accept-nth="{2}" \ --with-nth="{1}" ) - [ "$sel" ] && set -- "--artist" "$sel" + printf "%s#%s" "$MODE_ARTIST" "$sel" >"$MODEFILE" ;; - "--search-album") - sel=$( - printf "" | - $FZF \ - --no-clear \ - --ansi \ - --reverse \ - --no-sort \ - --disabled \ - --cycle \ - --delimiter="\t" \ - --prompt="$SEARCH_PROMPT" \ - --info="inline-right" \ - --info-command="echo \"Search album on MusicBrainz\"" \ - --color='input-fg:#ba478f' \ - --accept-nth="{2}" \ - --with-nth="{1}" \ - --expect="ctrl-c,ctrl-q,tab" \ - --expect="ctrl-/" \ - --bind="alt-l:change-query($FORMAT_LOCAL )" \ - --bind="start:transform:[ \"${2:-}\" ] && echo \"change-query:${2:-}\"" \ - --bind="load:unbind(enter)+unbind(alt-enter)+transform:[ \"\$FZF_TOTAL_COUNT\" -gt 0 ] && echo \"rebind:ctrl-l\" || echo \"unbind:ctrl-l\"" \ - --bind="ctrl-l:accept" \ - --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" \ - --bind="alt-b:execute-silent:xdg-open 'https://musicbrainz.org/release-group/{r2}' &" \ - --bind="change:execute-silent($0 --internal-search releasegroup \$FZF_QUERY &)+reload($0 --internal-reload)" || true - ) - lns=$(echo "$sel" | wc -l) - key=$(echo "$sel" | head -1 | tail -1) - mid=$(echo "$sel" | head -2 | tail -1) - [ "$key" = "ctrl-c" ] && tput rmcup && exit 0 - [ "$key" = "ctrl-q" ] && tput rmcup && exit 0 - [ "$key" = "tab" ] && set -- "--search-artist" - [ "$key" = "ctrl-/" ] && set -- "--albums" - [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--releasegroup" "$mid" + "$MODE_PLAYLIST") + count=$(mpv_playlist_count) + foo "Playlist: count=$count" + printf "%s#%s" "$MODE_LIST_ARTISTS" "" >"$MODEFILE" ;; - "--search-artist") - sel=$( - printf "" | - $FZF \ - --no-clear \ - --ansi \ - --reverse \ - --no-sort \ - --disabled \ - --cycle \ - --delimiter="\t" \ - --prompt="$SEARCH_PROMPT" \ - --info="inline-right" \ - --info-command="echo \"Search music artist on MusicBrainz\"" \ - --color='input-fg:#ba478f' \ - --accept-nth="{2}" \ - --with-nth="{1}" \ - --preview-window="right,25%,border-left,wrap,<30(hidden)" \ - --preview="$0 --internal-preview-artist {2}" \ - --expect="ctrl-c,ctrl-q,tab" \ - --expect="ctrl-/" \ - --bind="alt-l:change-query($FORMAT_LOCAL )" \ - --bind="start:transform:[ \"${2:-}\" ] && echo \"change-query:${2:-}\"" \ - --bind="load:unbind(enter)+unbind(alt-enter)+transform:[ \"\$FZF_TOTAL_COUNT\" -gt 0 ] && echo \"rebind:ctrl-l\" || echo \"unbind:ctrl-l\"" \ - --bind="ctrl-l:accept" \ - --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" \ - --bind="down:preview-half-page-down,up:preview-half-page-up" \ - --bind="alt-b:execute-silent:xdg-open 'https://musicbrainz.org/artist/{r2}' &" \ - --bind="change:execute-silent($0 --internal-search artist \$FZF_QUERY &)+reload($0 --internal-reload)" || true - ) - lns=$(echo "$sel" | wc -l) - key=$(echo "$sel" | head -1 | tail -1) - mid=$(echo "$sel" | head -2 | tail -1) - [ "$key" = "ctrl-c" ] && tput rmcup && exit 0 - [ "$key" = "ctrl-q" ] && tput rmcup && exit 0 - [ "$key" = "tab" ] && set -- "--search-album" - [ "$key" = "ctrl-/" ] && set -- "--artists" - [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--artist" "$mid" - ;; - "--albums") - sel=$( - $0 --internal-list-local-releasegroups | - $FZF \ - --no-clear \ - --ansi \ - --reverse \ - --cycle \ - --delimiter="\t" \ - --prompt="$SEARCH_PROMPT" \ - --info="inline-right" \ - --info-command="echo \"Search albums\"" \ - --accept-nth="{2}" \ - --with-nth="{1}" \ - --expect="ctrl-h,ctrl-a" \ - --expect="ctrl-c,ctrl-q,tab" \ - --expect="ctrl-/" \ - --bind="alt-l:change-query($FORMAT_LOCAL )" \ - --bind="load:transform:[ \"\$FZF_TOTAL_COUNT\" -gt 0 ] && echo \"rebind:ctrl-l\" || echo \"unbind:ctrl-l\"" \ - --bind="enter:execute-silent:$0 --play-release {2} {3}" \ - --bind="alt-enter:execute-silent:$0 --play-release {2} {3} q" \ - --bind="alt-space:execute-silent:$0 --play-toggle" \ - --bind="ctrl-n:execute-silent:$0 --play-next" \ - --bind="ctrl-p:execute-silent:$0 --play-previous" \ - --bind="shift-right:execute-silent:$0 --seek-forward" \ - --bind="shift-left:execute-silent:$0 --seek-backward" \ - --bind="focus:transform: - [ {3} ] && c=rebind || c=unbind - for key in enter alt-enter alt-space ctrl-n ctrl-p shift-right shift-left; do - printf \"+%s(%s)\" \"\$c\" \"\$key\" - done - " \ - --bind="ctrl-l:accept" \ - --bind="alt-b:execute-silent:xdg-open 'https://musicbrainz.org/release/{r2}' &" \ - --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" || true - ) - lns=$(echo "$sel" | wc -l) - key=$(echo "$sel" | head -1 | tail -1) - mid=$(echo "$sel" | head -2 | tail -1) - [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--releasegroup" "$mid" - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-h" ] && set -- "--albums" - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_releasegroup "$mid" | $JQ -r -c '."artist-credit"')" - [ "$key" = "ctrl-c" ] && tput rmcup && exit 0 - [ "$key" = "ctrl-q" ] && tput rmcup && exit 0 - [ "$key" = "ctrl-/" ] && set -- "--search-album" - [ "$key" = "tab" ] && set -- "--artists" - ;; - *) - sel=$( - $0 --internal-list-local-artists | - $FZF \ - --no-clear \ - --ansi \ - --reverse \ - --cycle \ - --delimiter="\t" \ - --prompt="$SEARCH_PROMPT" \ - --info="inline-right" \ - --info-command="echo \"Search music artist\"" \ - --accept-nth="{2}" \ - --with-nth="{1}" \ - --preview-window="right,25%,border-left,wrap,<30(hidden)" \ - --preview="$0 --internal-preview-artist {2}" \ - --expect="ctrl-c,ctrl-q,tab" \ - --expect="ctrl-/" \ - --bind="alt-l:change-query($FORMAT_LOCAL )" \ - --bind="load:unbind(enter)+unbind(alt-enter)+transform:[ \"\$FZF_TOTAL_COUNT\" -gt 0 ] && echo \"rebind:ctrl-l\" || echo \"unbind:ctrl-l\"" \ - --bind="ctrl-l:accept" \ - --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" \ - --bind="down:preview-half-page-down,up:preview-half-page-up" \ - --bind="alt-b:execute-silent:xdg-open 'https://musicbrainz.org/artist/{r2}' &" || true - ) - lns=$(echo "$sel" | wc -l) - key=$(echo "$sel" | head -1 | tail -1) - mid=$(echo "$sel" | head -2 | tail -1) - [ "$key" = "ctrl-c" ] && tput rmcup && exit 0 - [ "$key" = "ctrl-q" ] && tput rmcup && exit 0 - [ "$key" = "tab" ] && set -- "--albums" - [ "$key" = "ctrl-/" ] && set -- "--search-artist" - [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--artist" "$mid" + *) # Main instance + $FZF \ + --reverse \ + --bind="start:reload:$0 --fzf-reload" \ + --bind="load:transform:$0 --fzf-load" \ + --bind="change:execute-silent($0 --fzf-change &)+reload:$0 --fzf-change-reload" \ + --bind="$KEYS_HALFPAGE_DOWN,$KEYS_HALFPAGE_UP,\ +$KEYS_BROWSE,\ +$KEYS_IN,$KEYS_OUT,\ +$KEYS_SELECT_ARTIST,\ +$KEYS_FILTER_LOCAL,$KEYS_FILTER_PRIMARY,$KEYS_FILTER_SECONDARY,\ +$KEYS_SWITCH_ARTIST_ALBUM,$KEYS_SWITCH_LOCAL_REMOTE,\ +$KEYS_PLAY,$KEYS_QUEUE,$KEYS_TOGGLE_PLAY_PAUSE,\ +$KEYS_PLAY_NEXT,$KEYS_PLAY_PREV,\ +$KEYS_SEEK_FORWARD,$KEYS_SEEK_BACKWARD:transform:$0 --fzf-key {2} {3}" \ + --info="inline-right" \ + --info-command="$0 --fzf-info" \ + --preview-window="right,25%,border-left,wrap,<30(hidden)" \ + --preview="$0 --internal-preview-artist {2}" \ + --delimiter="\t" \ + --with-nth="{1}" >/dev/null ;; esac done diff --git a/src/sh/api.sh b/src/sh/api.sh index 72e14e1..d860bb8 100644 --- a/src/sh/api.sh +++ b/src/sh/api.sh @@ -37,7 +37,7 @@ mpv_quit() { mpv_start() { MPV_SOCKET="$(mktemp --suffix=.sock)" - trap 'mpv_quit; rm -f "$MPV_SOCKET"' EXIT INT + trap 'mpv_quit >/dev/null; rm -f "$MPV_SOCKET"' EXIT INT $MPV --no-config --no-terminal --input-ipc-server="$MPV_SOCKET" --idle --no-osc --no-input-default-bindings & } diff --git a/src/sh/keys.sh b/src/sh/keys.sh new file mode 100644 index 0000000..f278428 --- /dev/null +++ b/src/sh/keys.sh @@ -0,0 +1,24 @@ +KEYS_HALFPAGE_DOWN="${KEYS_HALFPAGE_DOWN:-"ctrl-d"}" +KEYS_HALFPAGE_UP="${KEYS_HALFPAGE_UP:-"ctrl-u"}" +KEYS_BROWSE="${KEYS_BROWSE:-"alt-b"}" +KEYS_OUT="${KEYS_OUT:-"ctrl-h"}" +KEYS_IN="${KEYS_IN:-"ctrl-l"}" +KEYS_SELECT_ARTIST="${KEYS_SELECT_ARTIST:-"ctrl-a"}" +KEYS_FILTER_LOCAL="${KEYS_FILTER_LOCAL:-"alt-l"}" +KEYS_FILTER_PRIMARY="${KEYS_FILTER_PRIMARY:-"alt-1"}" +KEYS_FILTER_SECONDARY="${KEYS_FILTER_SECONDARY:-"alt-2"}" +KEYS_SWITCH_ARTIST_ALBUM="${KEYS_SWITCH_ARTIST_ALBUM:-"tab"}" +KEYS_SWITCH_LOCAL_REMOTE="${KEYS_SWITCH_LOCAL_REMOTE:-"ctrl-/"}" +KEYS_PLAY="${KEYS_PLAY:-"enter"}" +KEYS_QUEUE="${KEYS_QUEUE:-"alt-enter"}" +KEYS_TOGGLE_PLAY_PAUSE="${KEYS_TOGGLE_PLAY_PAUSE:-"space"}" +KEYS_PLAY_NEXT="${KEYS_PLAY_NEXT:-"l"}" +KEYS_PLAY_PREV="${KEYS_PLAY_PREV:-"h"}" +KEYS_SEEK_FORWARD="${KEYS_SEEK_FORWARD:-"shift-right"}" +KEYS_SEEK_BACKWARD="${KEYS_SEEK_BACKWARD:-"shift-left"}" + +export KEYS_HALFPAGE_DOWN KEYS_HALFPAGE_UP KEYS_BROWSE KEYS_OUT KEYS_IN \ + KEYS_SELECT_ARTIST KEYS_FILTER_LOCAL KEYS_FILTER_PRIMARY KEYS_FILTER_SECONDARY \ + KEYS_SWITCH_ARTIST_ALBUM KEYS_SWITCH_LOCAL_REMOTE KEYS_PLAY KEYS_QUEUE \ + KEYS_TOGGLE_PLAY_PAUSE KEYS_PLAY_NEXT KEYS_PLAY_PREV KEYS_SEEK_FORWARD \ + KEYS_SEEK_BACKWARD diff --git a/src/sh/lists.sh b/src/sh/lists.sh index 8d86194..d7b3e15 100644 --- a/src/sh/lists.sh +++ b/src/sh/lists.sh @@ -139,3 +139,29 @@ list_local_releasegroups() { list_local_releases() { cat "$LOCALDATA_RELEASES_VIEW" 2>/dev/null } + +# Generate playlist from MB release ID and path to decoration +# @argument $1: MusicBrainz Release ID +# @argument $2: Path to decoration file +generate_playlist() { + dir="$(dirname "$2")" + mb_release "$1" | + $JQ -r --slurpfile deco "$2" --arg base "$dir" '$deco[].tracks as $filenames | + .media[] | + .position as $pos | + .tracks | + map({ + $pos, + number: .number, + file: $filenames[.id] + }) | + map( + if(.number | type == "string" and test("^[0-9]+$")) then + .number |= tonumber + else + . + end + ) | + sort_by([.pos, .number]) | + map($base + "/" + .file)[]' +} diff --git a/src/sh/tools.sh b/src/sh/tools.sh index 55b83b8..c03ea05 100644 --- a/src/sh/tools.sh +++ b/src/sh/tools.sh @@ -1,5 +1,5 @@ if command -v "fzf" >/dev/null; then - FZF="fzf --black --ansi --reverse --cycle" + FZF="fzf --black --ansi --cycle" else err "Did not find the command-line fuzzy finder fzf." exit 1