bugfixes and improved themeing support
This commit is contained in:
@@ -59,11 +59,10 @@ fzf_handle_load() {
|
||||
args=$(state_get_args)
|
||||
case "$view" in
|
||||
"$VIEW_ARTIST")
|
||||
secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")"
|
||||
QUERY="$(printf "!%s " "$secsymb")"
|
||||
QUERY="!'$QUERY_HAS_SECONDARY' "
|
||||
;;
|
||||
"$VIEW_RELEASEGROUP")
|
||||
QUERY="$(printf "%s " "$FORMAT_STATUS_OFFICIAL")"
|
||||
[ "$QUERY_RV" ] && QUERY="'$QUERY_RV' " || QUERY=""
|
||||
;;
|
||||
"$VIEW_SEARCH_ARTIST")
|
||||
ENABLE_CHANGE=1
|
||||
@@ -104,7 +103,7 @@ fzf_info() {
|
||||
echo "Search albums"
|
||||
;;
|
||||
"$VIEW_SELECT_ARTIST")
|
||||
foo "Select artist (WE SHOULDNT SEE THIS; THIS IS A BUG!)"
|
||||
debug "Select artist (WE SHOULDNT SEE THIS; THIS IS A BUG!)"
|
||||
;;
|
||||
*)
|
||||
if [ "$FZF_KEY" ]; then
|
||||
@@ -247,7 +246,7 @@ fzf_handle_key() {
|
||||
"$VIEW_PLAYLIST") ;;
|
||||
*)
|
||||
state_update_keep_args "$view" "$MODE_NORMAL"
|
||||
__set_prompt "$view" "$mode"
|
||||
__set_prompt "$view" "$MODE_NORMAL"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -258,8 +257,8 @@ fzf_handle_key() {
|
||||
if [ "$view" = "$VIEW_PLAYLIST" ]; then
|
||||
case ",$KEYS_PLAYLIST_RELOAD," in
|
||||
*",$FZF_KEY,"*)
|
||||
foo "hit playlist reload key"
|
||||
foo "going to call $(printf "reload:%s" "$0 --fzf-reload")"
|
||||
debug "hit playlist reload key"
|
||||
debug "going to call $(printf "reload:%s" "$0 --fzf-reload")"
|
||||
printf "reload:%s" "$0 --fzf-reload"
|
||||
;;
|
||||
esac
|
||||
@@ -341,7 +340,7 @@ fzf_handle_key() {
|
||||
ACCEPT=1
|
||||
;;
|
||||
"$VIEW_PLAYLIST")
|
||||
foo "NOT IMPLEMENTED"
|
||||
debug "NOT IMPLEMENTED"
|
||||
;;
|
||||
esac
|
||||
[ "$VIEW_NEXT_ARGS" ] && VIEW_NEXT="$VIEW_SELECT_ARTIST"
|
||||
@@ -351,7 +350,7 @@ fzf_handle_key() {
|
||||
*",$FZF_KEY,"*)
|
||||
case "$view" in
|
||||
"$VIEW_SEARCH_ARTIST" | "$VIEW_SEARCH_ALBUM" | "$VIEW_PLAYLIST") ;;
|
||||
*) QUERY="$FORMAT_LOCAL " ;;
|
||||
*) QUERY="'$QUERY_LOCAL' " ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
@@ -360,49 +359,10 @@ fzf_handle_key() {
|
||||
# VIEW_LIST_ARTISTS="list-artists"
|
||||
# VIEW_SELECT_ARTIST="select-artist"
|
||||
# VIEW_PLAYLIST="playlist"
|
||||
case ",$KEYS_FILTER_1," in
|
||||
*",$FZF_KEY,"*)
|
||||
case "$view" in
|
||||
"$VIEW_ARTIST" | "$VIEW_LIST_ALBUMS")
|
||||
secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")"
|
||||
QUERY="!$secsymb "
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
case ",$KEYS_FILTER_2," in
|
||||
*",$FZF_KEY,"*)
|
||||
case "$view" in
|
||||
"$VIEW_ARTIST" | "$VIEW_LIST_ALBUMS")
|
||||
secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")"
|
||||
typesymb="$(printf "$FORMAT_TYPE_ALBUM" | sed "s/ /\\\ /g")"
|
||||
QUERY="!$secsymb '$typesymb' "
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
case ",$KEYS_FILTER_3," in
|
||||
*",$FZF_KEY,"*)
|
||||
case "$view" in
|
||||
"$VIEW_ARTIST" | "$VIEW_LIST_ALBUMS")
|
||||
secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")"
|
||||
typesymb="$(printf "$FORMAT_TYPE_EP" | sed "s/ /\\\ /g")"
|
||||
QUERY="!$secsymb '$typesymb' "
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
case ",$KEYS_FILTER_4," in
|
||||
*",$FZF_KEY,"*)
|
||||
case "$view" in
|
||||
"$VIEW_ARTIST" | "$VIEW_LIST_ALBUMS")
|
||||
secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")"
|
||||
typesymb="$(printf "$FORMAT_TYPE_SINGLE" | sed "s/ /\\\ /g")"
|
||||
QUERY="!$secsymb '$typesymb' "
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
case ",$KEYS_FILTER_1," in *",$FZF_KEY,"*) case "$view" in "$VIEW_ARTIST" | "$VIEW_LIST_ALBUMS") QUERY="!'$QUERY_HAS_SECONDARY' " ;; esac ;; esac
|
||||
case ",$KEYS_FILTER_2," in *",$FZF_KEY,"*) case "$view" in "$VIEW_ARTIST" | "$VIEW_LIST_ALBUMS") QUERY="!'$QUERY_HAS_SECONDARY' '$QUERY_ALBUM' " ;; esac ;; esac
|
||||
case ",$KEYS_FILTER_3," in *",$FZF_KEY,"*) case "$view" in "$VIEW_ARTIST" | "$VIEW_LIST_ALBUMS") QUERY="!'$QUERY_HAS_SECONDARY' '$QUERY_EP' " ;; esac ;; esac
|
||||
case ",$KEYS_FILTER_4," in *",$FZF_KEY,"*) case "$view" in "$VIEW_ARTIST" | "$VIEW_LIST_ALBUMS") QUERY="!'$QUERY_HAS_SECONDARY' '$QUERY_SINGLE' " ;; esac ;; esac
|
||||
case ",$KEYS_SWITCH_ARTIST_ALBUM," in
|
||||
*",$FZF_KEY,"*)
|
||||
case "$view" in
|
||||
@@ -440,7 +400,7 @@ fzf_handle_key() {
|
||||
[ "$path" ] || return 0
|
||||
case "$view" in
|
||||
"$VIEW_ARTIST" | "$VIEW_SEARCH_ARTIST" | "$VIEW_SEARCH_ALBUM" | "$VIEW_LIST_ARTISTS" | "$VIEW_LIST_ALBUMS")
|
||||
foo "not implemented"
|
||||
debug "not implemented"
|
||||
;;
|
||||
"$VIEW_RELEASEGROUP")
|
||||
generate_playlist "$mbid" "$path" | mpv_play_list >/dev/null
|
||||
@@ -461,7 +421,7 @@ fzf_handle_key() {
|
||||
[ "$path" ] || return 0
|
||||
case "$view" in
|
||||
"$VIEW_ARTIST" | "$VIEW_SEARCH_ARTIST" | "$VIEW_SEARCH_ALBUM" | "$VIEW_LIST_ARTISTS" | "$VIEW_LIST_ALBUMS")
|
||||
foo "not implemented"
|
||||
debug "not implemented"
|
||||
;;
|
||||
"$VIEW_RELEASEGROUP")
|
||||
generate_playlist "$mbid" "$path" | mpv_queue_list >/dev/null
|
||||
@@ -536,7 +496,7 @@ fzf_handle_key() {
|
||||
*",$FZF_KEY,"*)
|
||||
case "$view" in
|
||||
"$VIEW_SELECT_ARTIST" | "$VIEW_PLAYLIST") printf "accept" ;;
|
||||
*) printf "abort" ;;
|
||||
*) printf "print(Q)+abort" ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
@@ -546,7 +506,7 @@ fzf_handle_key() {
|
||||
"$VIEW_PLAYLIST") ;;
|
||||
*)
|
||||
state_update_keep_args "$view" "$MODE_INSERT"
|
||||
__set_prompt "$view" "$mode"
|
||||
__set_prompt "$view" "$MODE_INSERT"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
Reference in New Issue
Block a user