fixed queue and movements
This commit is contained in:
41
src/main.sh
41
src/main.sh
@@ -251,11 +251,17 @@ if [ "${1:-}" = "--fzf-key" ]; then
|
||||
"$MODE_RELEASE")
|
||||
generate_playlist "$parentmbid" "$path" "$mbid" | mpv_play_list >/dev/null
|
||||
;;
|
||||
"$MODE_PLAYLIST")
|
||||
generate_playlist "$parentmbid" "$path" "$mbid" | mpv_play_list >/dev/null
|
||||
MODE_NEXT="$MODE_PLAYLIST"
|
||||
ACCEPT=1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
case ",$KEYS_QUEUE," in
|
||||
*",$FZF_KEY,"*)
|
||||
foo "queue key pressed"
|
||||
[ "$path" ] || exit 0
|
||||
case "$mode" in
|
||||
"$MODE_RELEASEGROUP")
|
||||
@@ -264,6 +270,11 @@ if [ "${1:-}" = "--fzf-key" ]; then
|
||||
"$MODE_RELEASE")
|
||||
generate_playlist "$parentmbid" "$path" "$mbid" | mpv_queue_list >/dev/null
|
||||
;;
|
||||
"$MODE_PLAYLIST")
|
||||
generate_playlist "$parentmbid" "$path" "$mbid" | mpv_queue_list >/dev/null
|
||||
MODE_NEXT="$MODE_PLAYLIST"
|
||||
ACCEPT=1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
@@ -271,10 +282,16 @@ if [ "${1:-}" = "--fzf-key" ]; then
|
||||
*",$FZF_KEY,"*) mpv_toggle_pause >/dev/null ;;
|
||||
esac
|
||||
case ",$KEYS_PLAY_NEXT," in
|
||||
*",$FZF_KEY,"*) mpv_next >/dev/null ;;
|
||||
*",$FZF_KEY,"*)
|
||||
mpv_next >/dev/null
|
||||
[ "$mode" = "$MODE_PLAYLIST" ] && MODE_NEXT="$MODE_PLAYLIST" && ACCEPT=1
|
||||
;;
|
||||
esac
|
||||
case ",$KEYS_PLAY_PREV," in
|
||||
*",$FZF_KEY,"*) mpv_prev >/dev/null ;;
|
||||
*",$FZF_KEY,"*)
|
||||
mpv_prev >/dev/null
|
||||
[ "$mode" = "$MODE_PLAYLIST" ] && MODE_NEXT="$MODE_PLAYLIST" && ACCEPT=1
|
||||
;;
|
||||
esac
|
||||
case ",$KEYS_SEEK_FORWARD," in
|
||||
*",$FZF_KEY,"*) mpv_seek_forward >/dev/null ;;
|
||||
@@ -323,9 +340,9 @@ if [ "${1:-}" = "--fzf-key" ]; then
|
||||
"$MODE_SEARCH_ARTIST" | "$MODE_LIST_ARTISTS") urltype="artist" ;;
|
||||
"$MODE_ARTIST") urltype="release-group" ;;
|
||||
"$MODE_RELEASEGROUP") urltype="release" ;;
|
||||
"$MODE_RELEASE") urltype="track" ;;
|
||||
"$MODE_RELEASE" | "$MODE_PLAYLIST") urltype="track" ;;
|
||||
esac
|
||||
printf "execute-silent(xdg-open \"https://musicbrainz.org/%s/%s\" &)" "$urltype" "$mbid"
|
||||
[ "${urltype:-}" ] && printf "execute-silent(xdg-open \"https://musicbrainz.org/%s/%s\" &)" "$urltype" "$mbid"
|
||||
;;
|
||||
esac
|
||||
case ",$KEYS_OUT," in
|
||||
@@ -343,6 +360,11 @@ if [ "${1:-}" = "--fzf-key" ]; then
|
||||
MODE_NEXT="$MODE_RELEASEGROUP"
|
||||
MODE_NEXT_ARGS="$(mb_release "$args" | $JQ -r --compact-output '."release-group".id')"
|
||||
;;
|
||||
"$MODE_PLAYLIST")
|
||||
MODE_NEXT="$MODE_RELEASE"
|
||||
MODE_NEXT_ARGS="$parentmbid"
|
||||
ACCEPT=1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
@@ -567,22 +589,11 @@ $KEYS_FILTER_LOCAL:transform:$0 --fzf-key {2} {3} {4}" \
|
||||
$KEYS_BROWSE,\
|
||||
$KEYS_OUT,\
|
||||
$KEYS_SELECT_ARTIST,\
|
||||
$KEYS_PLAY,$KEYS_QUEUE,\
|
||||
$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} {4}" \
|
||||
--delimiter="\t" \
|
||||
--with-nth="{1}" >/dev/null
|
||||
# --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}" \
|
||||
printf "%s#%s" "$MODE_LIST_ARTISTS" "" >"$MODEFILE"
|
||||
;;
|
||||
*) # Main instance
|
||||
$FZF \
|
||||
|
Reference in New Issue
Block a user