state sep
This commit is contained in:
57
src/main.sh
57
src/main.sh
@@ -44,6 +44,9 @@ set -eu
|
|||||||
# Load list-generating methods
|
# Load list-generating methods
|
||||||
. "sh/lists.sh"
|
. "sh/lists.sh"
|
||||||
|
|
||||||
|
# State management
|
||||||
|
. "sh/state.sh"
|
||||||
|
|
||||||
# FZF handlers
|
# FZF handlers
|
||||||
. "sh/fzf.sh"
|
. "sh/fzf.sh"
|
||||||
|
|
||||||
@@ -133,10 +136,16 @@ tmpdir=$(mktemp -d)
|
|||||||
LOCKFILE="$tmpdir/lock"
|
LOCKFILE="$tmpdir/lock"
|
||||||
RESULTS="$tmpdir/results"
|
RESULTS="$tmpdir/results"
|
||||||
PIDFILE="$tmpdir/pid"
|
PIDFILE="$tmpdir/pid"
|
||||||
STATEFILE="$tmpdir/state"
|
|
||||||
ARGSFILE="$tmpdir/state-args"
|
|
||||||
trap 'rm -rf "$tmpdir"' EXIT INT
|
trap 'rm -rf "$tmpdir"' EXIT INT
|
||||||
export LOCKFILE RESULTS PIDFILE STATEFILE ARGSFILE
|
export LOCKFILE RESULTS PIDFILE
|
||||||
|
|
||||||
|
statedir=$(mktemp -d)
|
||||||
|
STATEFILE="$statedir/state"
|
||||||
|
ARGSFILE="$statedir/state-args"
|
||||||
|
STATEFILE_LAST="$statedir/state2"
|
||||||
|
ARGSFILE_LAST="$statedir/state-args2"
|
||||||
|
touch "$STATEFILE" "$ARGSFILE" "$STATEFILE_LAST" "$ARGSFILE_LAST"
|
||||||
|
export STATEFILE ARGSFILE STATEFILE_LAST ARGSFILE_LAST
|
||||||
|
|
||||||
if [ "${1:-}" = "--ni-search-artist" ]; then
|
if [ "${1:-}" = "--ni-search-artist" ]; then
|
||||||
$0 --internal-search "artist" "$2"
|
$0 --internal-search "artist" "$2"
|
||||||
@@ -167,35 +176,20 @@ export VIEW_ARTIST VIEW_RELEASEGROUP VIEW_RELEASE VIEW_SEARCH_ARTIST \
|
|||||||
case "${1:-}" in
|
case "${1:-}" in
|
||||||
"--artist")
|
"--artist")
|
||||||
[ ! "${2:-}" ] && err "MusicBrainz Artist ID not specified (see --help)" && exit 1
|
[ ! "${2:-}" ] && err "MusicBrainz Artist ID not specified (see --help)" && exit 1
|
||||||
printf "%s#%s" "$VIEW_ARTIST" "$MODE_NORMAL" >"$STATEFILE"
|
state_init "$VIEW_ARTIST" "$MODE_NORMAL" "$2"
|
||||||
printf "%s" "$2" >"$ARGSFILE"
|
|
||||||
;;
|
;;
|
||||||
"--releasegroup")
|
"--releasegroup")
|
||||||
[ ! "${2:-}" ] && err "MusicBrainz Release-Group ID not specified (see --help)" && exit 1
|
[ ! "${2:-}" ] && err "MusicBrainz Release-Group ID not specified (see --help)" && exit 1
|
||||||
printf "%s#%s" "$VIEW_RELEASEGROUP" "$MODE_NORMAL" >"$STATEFILE"
|
state_init "$VIEW_RELEASEGROUP" "$MODE_NORMAL" "$2"
|
||||||
printf "%s" "$2" >"$ARGSFILE"
|
|
||||||
;;
|
;;
|
||||||
"--release")
|
"--release")
|
||||||
[ ! "${2:-}" ] && err "MusicBrainz Release ID not specified (see --help)" && exit 1
|
[ ! "${2:-}" ] && err "MusicBrainz Release ID not specified (see --help)" && exit 1
|
||||||
printf "%s#%s" "$VIEW_RELEASE" "$MODE_NORMAL" >"$STATEFILE"
|
state_init "$VIEW_RELEASE" "$MODE_NORMAL" "$2"
|
||||||
printf "%s" "$2" >"$ARGSFILE"
|
|
||||||
;;
|
|
||||||
"--search-artist")
|
|
||||||
printf "%s#%s" "$VIEW_SEARCH_ARTIST" "$MODE_INSERT" >"$STATEFILE"
|
|
||||||
printf "%s" "${2:-}" >"$ARGSFILE"
|
|
||||||
;;
|
|
||||||
"--search-album")
|
|
||||||
printf "%s#%s" "$VIEW_SEARCH_ALBUM" "$MODE_INSERT" >"$STATEFILE"
|
|
||||||
printf "%s" "${2:-}" >"$ARGSFILE"
|
|
||||||
;;
|
|
||||||
"--artists" | "")
|
|
||||||
printf "%s#%s" "$VIEW_LIST_ARTISTS" "$MODE_NORMAL" >"$STATEFILE"
|
|
||||||
printf "%s" "" >"$ARGSFILE"
|
|
||||||
;;
|
|
||||||
"--albums")
|
|
||||||
printf "%s#%s" "$VIEW_LIST_ALBUMS" "$MODE_NORMAL" >"$STATEFILE"
|
|
||||||
printf "%s" "" >"$ARGSFILE"
|
|
||||||
;;
|
;;
|
||||||
|
"--search-artist") state_init "$VIEW_SEARCH_ARTIST" "$MODE_INSERT" "${2:-}" ;;
|
||||||
|
"--search-album") state_init "$VIEW_SEARCH_ALBUM" "$MODE_INSERT" "${2:-}" ;;
|
||||||
|
"--artists" | "") state_init "$VIEW_LIST_ARTISTS" "$MODE_NORMAL" "" ;;
|
||||||
|
"--albums") state_init "$VIEW_LIST_ALBUMS" "$MODE_NORMAL" "" ;;
|
||||||
*)
|
*)
|
||||||
err "Unknown option $1 (see --help)"
|
err "Unknown option $1 (see --help)"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -207,9 +201,9 @@ mpv_start
|
|||||||
|
|
||||||
# $KEYS_PLAY main loop
|
# $KEYS_PLAY main loop
|
||||||
while true; do
|
while true; do
|
||||||
view=$(cut -d "#" -f 1 "$STATEFILE")
|
view=$(state_get_view)
|
||||||
mode=$(cut -d "#" -f 2 "$STATEFILE")
|
mode=$(state_get_mode)
|
||||||
args=$(cat "$ARGSFILE")
|
args=$(state_get_args)
|
||||||
case "$view" in
|
case "$view" in
|
||||||
"$VIEW_SELECT_ARTIST")
|
"$VIEW_SELECT_ARTIST")
|
||||||
sel=$(
|
sel=$(
|
||||||
@@ -219,7 +213,7 @@ while true; do
|
|||||||
--bind="$KEYS_HALFPAGE_DOWN,$KEYS_HALFPAGE_UP,\
|
--bind="$KEYS_HALFPAGE_DOWN,$KEYS_HALFPAGE_UP,\
|
||||||
$KEYS_BROWSE,\
|
$KEYS_BROWSE,\
|
||||||
$KEYS_FILTER_LOCAL:transform:$0 --fzf-key {2} {3} {4}" \
|
$KEYS_FILTER_LOCAL:transform:$0 --fzf-key {2} {3} {4}" \
|
||||||
-1 \
|
-0 -1 \
|
||||||
--border="bold" \
|
--border="bold" \
|
||||||
--border-label="Select artist" \
|
--border-label="Select artist" \
|
||||||
--delimiter="\t" \
|
--delimiter="\t" \
|
||||||
@@ -227,10 +221,9 @@ $KEYS_FILTER_LOCAL:transform:$0 --fzf-key {2} {3} {4}" \
|
|||||||
--margin="5%,20%" \
|
--margin="5%,20%" \
|
||||||
--bind="$KEYS_FILTER_LOCAL:change-query($FORMAT_LOCAL )" \
|
--bind="$KEYS_FILTER_LOCAL:change-query($FORMAT_LOCAL )" \
|
||||||
--accept-nth="{3}" \
|
--accept-nth="{3}" \
|
||||||
--with-nth="{1}"
|
--with-nth="{1}" || true
|
||||||
)
|
)
|
||||||
printf "%s#%s" "$VIEW_ARTIST" "$mode" >"$STATEFILE"
|
[ "$sel" ] && state_update "$VIEW_ARTIST" "$mode" "$sel" || state_revert
|
||||||
printf "%s" "$sel" >"$ARGSFILE"
|
|
||||||
;;
|
;;
|
||||||
"$VIEW_PLAYLIST")
|
"$VIEW_PLAYLIST")
|
||||||
list_playlist |
|
list_playlist |
|
||||||
|
218
src/sh/fzf.sh
218
src/sh/fzf.sh
@@ -1,6 +1,6 @@
|
|||||||
__set_prompt() {
|
__set_prompt() {
|
||||||
view=$(cut -d "#" -f 1 "$STATEFILE")
|
view=$(state_get_view)
|
||||||
mode=$(cut -d "#" -f 2 "$STATEFILE")
|
mode=$(state_get_mode)
|
||||||
case "$view" in
|
case "$view" in
|
||||||
"$VIEW_ARTIST")
|
"$VIEW_ARTIST")
|
||||||
name="$(mb_artist "$args" | $JQ -r '.name')"
|
name="$(mb_artist "$args" | $JQ -r '.name')"
|
||||||
@@ -27,9 +27,9 @@ __set_prompt() {
|
|||||||
|
|
||||||
# Reload data for FZF
|
# Reload data for FZF
|
||||||
fzf_handle_reload() {
|
fzf_handle_reload() {
|
||||||
view=$(cut -d "#" -f 1 "$STATEFILE")
|
view=$(state_get_view)
|
||||||
mode=$(cut -d "#" -f 2 "$STATEFILE")
|
mode=$(state_get_mode)
|
||||||
args=$(cat "$ARGSFILE")
|
args=$(state_get_args)
|
||||||
case "$view" in
|
case "$view" in
|
||||||
"$VIEW_ARTIST")
|
"$VIEW_ARTIST")
|
||||||
list_releasegroups "$args"
|
list_releasegroups "$args"
|
||||||
@@ -51,9 +51,9 @@ fzf_handle_reload() {
|
|||||||
|
|
||||||
# Handle for after loading data into FZF
|
# Handle for after loading data into FZF
|
||||||
fzf_handle_load() {
|
fzf_handle_load() {
|
||||||
view=$(cut -d "#" -f 1 "$STATEFILE")
|
view=$(state_get_view)
|
||||||
mode=$(cut -d "#" -f 2 "$STATEFILE")
|
mode=$(state_get_mode)
|
||||||
args=$(cat "$ARGSFILE")
|
args=$(state_get_args)
|
||||||
case "$view" in
|
case "$view" in
|
||||||
"$VIEW_ARTIST")
|
"$VIEW_ARTIST")
|
||||||
secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")"
|
secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")"
|
||||||
@@ -76,8 +76,7 @@ fzf_handle_load() {
|
|||||||
;;
|
;;
|
||||||
"$VIEW_LIST_ALBUMS") ;;
|
"$VIEW_LIST_ALBUMS") ;;
|
||||||
esac
|
esac
|
||||||
printf "+change-query(%s)" "${QUERY:-}"
|
[ "${DISABLE_SEARCH:-}" ] && printf "+disable-search+change-query(%s)" "${QUERY:-"$FZF_QUERY"}" || printf "+enable-search+change-query(%s)" "${QUERY:-}"
|
||||||
[ "${DISABLE_SEARCH:-}" ] && printf "+disable-search" || printf "+enable-search"
|
|
||||||
[ "${SHOW_PREVIEW:-}" ] && printf "+show-preview" || printf "+hide-preview"
|
[ "${SHOW_PREVIEW:-}" ] && printf "+show-preview" || printf "+hide-preview"
|
||||||
[ "${ENABLE_CHANGE:-}" ] && printf "+rebind(change)" || printf "+unbind(change)"
|
[ "${ENABLE_CHANGE:-}" ] && printf "+rebind(change)" || printf "+unbind(change)"
|
||||||
__set_prompt
|
__set_prompt
|
||||||
@@ -85,9 +84,9 @@ fzf_handle_load() {
|
|||||||
|
|
||||||
# Print info string for FZF
|
# Print info string for FZF
|
||||||
fzf_info() {
|
fzf_info() {
|
||||||
view=$(cut -d "#" -f 1 "$STATEFILE")
|
view=$(state_get_view)
|
||||||
mode=$(cut -d "#" -f 2 "$STATEFILE")
|
mode=$(state_get_mode)
|
||||||
args=$(cat "$ARGSFILE")
|
args=$(state_get_args)
|
||||||
case "$view" in
|
case "$view" in
|
||||||
"$VIEW_SEARCH_ARTIST")
|
"$VIEW_SEARCH_ARTIST")
|
||||||
echo "Search music artist on MusicBrainz"
|
echo "Search music artist on MusicBrainz"
|
||||||
@@ -102,7 +101,7 @@ fzf_info() {
|
|||||||
echo "Search albums"
|
echo "Search albums"
|
||||||
;;
|
;;
|
||||||
"$VIEW_SELECT_ARTIST")
|
"$VIEW_SELECT_ARTIST")
|
||||||
echo "Select artist (WE SHOULDNT SEE THIS; THIS IS A BUG!)"
|
foo "Select artist (WE SHOULDNT SEE THIS; THIS IS A BUG!)"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
if [ "$FZF_KEY" ]; then
|
if [ "$FZF_KEY" ]; then
|
||||||
@@ -140,7 +139,7 @@ fzf_handle_change() {
|
|||||||
echo "$$" >"$PIDFILE"
|
echo "$$" >"$PIDFILE"
|
||||||
touch "$LOCKFILE"
|
touch "$LOCKFILE"
|
||||||
sleep 1
|
sleep 1
|
||||||
view=$(cut -d "#" -f 1 "$STATEFILE")
|
view=$(state_get_view)
|
||||||
if [ "$view" = "$VIEW_SEARCH_ARTIST" ]; then
|
if [ "$view" = "$VIEW_SEARCH_ARTIST" ]; then
|
||||||
api_mb_search_artist "$FZF_QUERY" |
|
api_mb_search_artist "$FZF_QUERY" |
|
||||||
$JQ -r '.artists[] | [
|
$JQ -r '.artists[] | [
|
||||||
@@ -212,9 +211,9 @@ fzf_handle_key() {
|
|||||||
parentmbid="${1:-}"
|
parentmbid="${1:-}"
|
||||||
mbid="${2:-}"
|
mbid="${2:-}"
|
||||||
path="${3:-}"
|
path="${3:-}"
|
||||||
view=$(cut -d "#" -f 1 "$STATEFILE")
|
view=$(state_get_view)
|
||||||
mode=$(cut -d "#" -f 2 "$STATEFILE")
|
mode=$(state_get_mode)
|
||||||
args=$(cat "$ARGSFILE")
|
args=$(state_get_args)
|
||||||
|
|
||||||
# If we are in the insert mode, and the key pressed is an "input" key, then
|
# If we are in the insert mode, and the key pressed is an "input" key, then
|
||||||
# put it and quit.
|
# put it and quit.
|
||||||
@@ -237,6 +236,23 @@ fzf_handle_key() {
|
|||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# Keys in insert mode only
|
||||||
|
case ",$KEYS_I_NORMAL," in
|
||||||
|
*",$FZF_KEY,"*)
|
||||||
|
case "$view" in
|
||||||
|
"$VIEW_PLAYLIST") ;;
|
||||||
|
*)
|
||||||
|
if [ "$mode" = "$MODE_INSERT" ]; then
|
||||||
|
state_update_keep_args "$view" "$MODE_NORMAL"
|
||||||
|
__set_prompt
|
||||||
|
else
|
||||||
|
printf "put(%s)" "$FZF_KEY"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Handle key press
|
# Handle key press
|
||||||
@@ -289,10 +305,10 @@ fzf_handle_key() {
|
|||||||
"$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST")
|
"$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST")
|
||||||
VIEW_NEXT="$VIEW_ARTIST"
|
VIEW_NEXT="$VIEW_ARTIST"
|
||||||
;;
|
;;
|
||||||
"$VIEW_ARTIST")
|
"$VIEW_ARTIST" | "$VIEW_SEARCH_ALBUM")
|
||||||
VIEW_NEXT="$VIEW_RELEASEGROUP"
|
VIEW_NEXT="$VIEW_RELEASEGROUP"
|
||||||
;;
|
;;
|
||||||
"$VIEW_RELEASEGROUP" | "$VIEW_LIST_ALBUMS" | "$VIEW_SEARCH_ALBUM")
|
"$VIEW_RELEASEGROUP" | "$VIEW_LIST_ALBUMS")
|
||||||
VIEW_NEXT="$VIEW_RELEASE"
|
VIEW_NEXT="$VIEW_RELEASE"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -392,8 +408,14 @@ fzf_handle_key() {
|
|||||||
case "$view" in
|
case "$view" in
|
||||||
"$VIEW_SEARCH_ARTIST") VIEW_NEXT="$VIEW_LIST_ARTISTS" ;;
|
"$VIEW_SEARCH_ARTIST") VIEW_NEXT="$VIEW_LIST_ARTISTS" ;;
|
||||||
"$VIEW_SEARCH_ALBUM") VIEW_NEXT="$VIEW_LIST_ALBUMS" ;;
|
"$VIEW_SEARCH_ALBUM") VIEW_NEXT="$VIEW_LIST_ALBUMS" ;;
|
||||||
"$VIEW_LIST_ARTISTS") VIEW_NEXT="$VIEW_SEARCH_ARTIST" ;;
|
"$VIEW_LIST_ARTISTS")
|
||||||
"$VIEW_LIST_ALBUMS") VIEW_NEXT="$VIEW_SEARCH_ALBUM" ;;
|
VIEW_NEXT="$VIEW_SEARCH_ARTIST"
|
||||||
|
MODE_NEXT="$MODE_INSERT"
|
||||||
|
;;
|
||||||
|
"$VIEW_LIST_ALBUMS")
|
||||||
|
VIEW_NEXT="$VIEW_SEARCH_ALBUM"
|
||||||
|
MODE_NEXT="$MODE_INSERT"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -447,15 +469,15 @@ fzf_handle_key() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# Keys in normal mode only
|
# Keys in normal mode only
|
||||||
case ",$KEYS_N_DOWN," in
|
if [ "$mode" = "$MODE_NORMAL" ]; then
|
||||||
*",$FZF_KEY,"*) [ "$mode" = "$MODE_NORMAL" ] && printf "down" || printf "put(%s)" "$FZF_KEY" ;;
|
case ",$KEYS_N_DOWN," in
|
||||||
esac
|
*",$FZF_KEY,"*) printf "down" ;;
|
||||||
case ",$KEYS_N_UP," in
|
esac
|
||||||
*",$FZF_KEY,"*) [ "$mode" = "$MODE_NORMAL" ] && printf "up" || printf "put(%s)" "$FZF_KEY" ;;
|
case ",$KEYS_N_UP," in
|
||||||
esac
|
*",$FZF_KEY,"*) printf "up" ;;
|
||||||
case ",$KEYS_N_OUT," in
|
esac
|
||||||
*",$FZF_KEY,"*)
|
case ",$KEYS_N_OUT," in
|
||||||
if [ "$mode" = "$MODE_NORMAL" ]; then
|
*",$FZF_KEY,"*)
|
||||||
case "$view" in
|
case "$view" in
|
||||||
"$VIEW_ARTIST")
|
"$VIEW_ARTIST")
|
||||||
VIEW_NEXT="$VIEW_LIST_ARTISTS"
|
VIEW_NEXT="$VIEW_LIST_ARTISTS"
|
||||||
@@ -475,118 +497,78 @@ fzf_handle_key() {
|
|||||||
ACCEPT=1
|
ACCEPT=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
else
|
;;
|
||||||
printf "put(%s)" "$FZF_KEY"
|
esac
|
||||||
fi
|
case ",$KEYS_N_IN," in
|
||||||
;;
|
*",$FZF_KEY,"*)
|
||||||
esac
|
|
||||||
case ",$KEYS_N_IN," in
|
|
||||||
*",$FZF_KEY,"*)
|
|
||||||
if [ "$mode" = "$MODE_NORMAL" ]; then
|
|
||||||
[ "$mbid" ] || return 0
|
[ "$mbid" ] || return 0
|
||||||
VIEW_NEXT_ARGS="$mbid"
|
VIEW_NEXT_ARGS="$mbid"
|
||||||
case "$view" in
|
case "$view" in
|
||||||
"$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST")
|
"$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST")
|
||||||
VIEW_NEXT="$VIEW_ARTIST"
|
VIEW_NEXT="$VIEW_ARTIST"
|
||||||
;;
|
;;
|
||||||
"$VIEW_ARTIST")
|
"$VIEW_ARTIST" | "$VIEW_SEARCH_ALBUM")
|
||||||
VIEW_NEXT="$VIEW_RELEASEGROUP"
|
VIEW_NEXT="$VIEW_RELEASEGROUP"
|
||||||
;;
|
;;
|
||||||
"$VIEW_RELEASEGROUP" | "$VIEW_LIST_ALBUMS" | "$VIEW_SEARCH_ALBUM")
|
"$VIEW_RELEASEGROUP" | "$VIEW_LIST_ALBUMS")
|
||||||
VIEW_NEXT="$VIEW_RELEASE"
|
VIEW_NEXT="$VIEW_RELEASE"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
else
|
|
||||||
printf "put(%s)" "$FZF_KEY"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case ",$KEYS_N_TOP," in
|
|
||||||
*",$FZF_KEY,"*) [ "$mode" = "$MODE_NORMAL" ] && printf "first" || printf "put(%s)" "$FZF_KEY" ;;
|
|
||||||
esac
|
|
||||||
case ",$KEYS_N_BOT," in
|
|
||||||
*",$FZF_KEY,"*) [ "$mode" = "$MODE_NORMAL" ] && printf "last" || printf "put(%s)" "$FZF_KEY" ;;
|
|
||||||
esac
|
|
||||||
case ",$KEYS_N_QUIT," in
|
|
||||||
*",$FZF_KEY,"*)
|
|
||||||
case "$view" in
|
|
||||||
"$VIEW_SELECT_ARTIST" | "$VIEW_PLAYLIST")
|
|
||||||
[ "$mode" = "$MODE_NORMAL" ] && printf "accept" || printf "put(%s)" "$FZF_KEY"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
[ "$mode" = "$MODE_NORMAL" ] && printf "abort" || printf "put(%s)" "$FZF_KEY"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
case ",$KEYS_N_TOP," in
|
||||||
esac
|
*",$FZF_KEY,"*) printf "first" ;;
|
||||||
case ",$KEYS_N_INSERT," in
|
esac
|
||||||
*",$FZF_KEY,"*)
|
case ",$KEYS_N_BOT," in
|
||||||
case "$view" in
|
*",$FZF_KEY,"*) printf "last" ;;
|
||||||
"$VIEW_PLAYLIST") ;;
|
esac
|
||||||
*)
|
case ",$KEYS_N_QUIT," in
|
||||||
if [ "$mode" = "$MODE_NORMAL" ]; then
|
*",$FZF_KEY,"*)
|
||||||
printf "%s#%s" "$view" "$MODE_INSERT" >"$STATEFILE"
|
case "$view" in
|
||||||
|
"$VIEW_SELECT_ARTIST" | "$VIEW_PLAYLIST") printf "accept" ;;
|
||||||
|
*) printf "abort" ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
case ",$KEYS_N_INSERT," in
|
||||||
|
*",$FZF_KEY,"*)
|
||||||
|
case "$view" in
|
||||||
|
"$VIEW_PLAYLIST") ;;
|
||||||
|
*)
|
||||||
|
state_update_keep_args "$view" "$MODE_INSERT"
|
||||||
__set_prompt
|
__set_prompt
|
||||||
else
|
;;
|
||||||
printf "put(%s)" "$FZF_KEY"
|
esac
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
case ",$KEYS_N_TOGGLE_PLAY_PAUSE," in
|
||||||
esac
|
*",$FZF_KEY,"*) mpv_toggle_pause >/dev/null ;;
|
||||||
case ",$KEYS_N_TOGGLE_PLAY_PAUSE," in
|
esac
|
||||||
*",$FZF_KEY,"*) [ "$mode" = "$MODE_NORMAL" ] && mpv_toggle_pause >/dev/null || printf "put(%s)" "$FZF_KEY" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case ",$KEYS_N_PLAY_NEXT," in
|
case ",$KEYS_N_PLAY_NEXT," in
|
||||||
*",$FZF_KEY,"*)
|
*",$FZF_KEY,"*)
|
||||||
if [ "$mode" = "$MODE_NORMAL" ]; then
|
|
||||||
mpv_next >/dev/null
|
mpv_next >/dev/null
|
||||||
[ "$view" = "$VIEW_PLAYLIST" ] && VIEW_NEXT="$VIEW_PLAYLIST" && ACCEPT=1
|
[ "$view" = "$VIEW_PLAYLIST" ] && VIEW_NEXT="$VIEW_PLAYLIST" && ACCEPT=1
|
||||||
else
|
|
||||||
printf "put(%s)" "$FZF_KEY"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case ",$KEYS_N_PLAY_PREV," in
|
|
||||||
*",$FZF_KEY,"*)
|
|
||||||
if [ "$mode" = "$MODE_NORMAL" ]; then
|
|
||||||
mpv_prev >/dev/null
|
|
||||||
[ "$view" = "$VIEW_PLAYLIST" ] && VIEW_NEXT="$VIEW_PLAYLIST" && ACCEPT=1
|
|
||||||
else
|
|
||||||
printf "put(%s)" "$FZF_KEY"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case ",$KEYS_N_SEEK_FORWARD," in
|
|
||||||
*",$FZF_KEY,"*) "$mode" = "$MODE_NORMAL" ] && mpv_seek_forward >/dev/null || printf "put(%s)" "$FZF_KEY" ;;
|
|
||||||
esac
|
|
||||||
case ",$KEYS_N_SEEK_BACKWARD," in
|
|
||||||
*",$FZF_KEY,"*) "$mode" = "$MODE_NORMAL" ] && mpv_seek_backward >/dev/null || printf "put(%s)" "$FZF_KEY" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Keys in insert mode only
|
|
||||||
case ",$KEYS_I_NORMAL," in
|
|
||||||
*",$FZF_KEY,"*)
|
|
||||||
case "$view" in
|
|
||||||
"$VIEW_PLAYLIST") ;;
|
|
||||||
*)
|
|
||||||
if [ "$mode" = "$MODE_INSERT" ]; then
|
|
||||||
printf "%s#%s" "$view" "$MODE_NORMAL" >"$STATEFILE"
|
|
||||||
__set_prompt
|
|
||||||
else
|
|
||||||
printf "put(%s)" "$FZF_KEY"
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
case ",$KEYS_N_PLAY_PREV," in
|
||||||
esac
|
*",$FZF_KEY,"*)
|
||||||
|
mpv_prev >/dev/null
|
||||||
|
[ "$view" = "$VIEW_PLAYLIST" ] && VIEW_NEXT="$VIEW_PLAYLIST" && ACCEPT=1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
case ",$KEYS_N_SEEK_FORWARD," in
|
||||||
|
*",$FZF_KEY,"*) mpv_seek_forward >/dev/null ;;
|
||||||
|
esac
|
||||||
|
case ",$KEYS_N_SEEK_BACKWARD," in
|
||||||
|
*",$FZF_KEY,"*) mpv_seek_backward >/dev/null ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
# Post processing
|
# Post processing
|
||||||
[ "${QUERY:-}" ] && printf "+change-query(%s)" "$QUERY"
|
[ "${QUERY:-}" ] && printf "+change-query(%s)" "$QUERY"
|
||||||
if [ "${VIEW_NEXT:-}" ]; then
|
if [ "${VIEW_NEXT:-}" ]; then
|
||||||
printf "%s#%s" "$VIEW_NEXT" "$mode" >"$STATEFILE"
|
state_update "$VIEW_NEXT" "${MODE_NEXT:-"$mode"}" "${VIEW_NEXT_ARGS:-}"
|
||||||
printf "%s" "${VIEW_NEXT_ARGS:-}" >"$ARGSFILE"
|
|
||||||
[ "${ACCEPT:-}" ] && printf "+accept" || printf "+reload:%s" "$0 --fzf-reload"
|
[ "${ACCEPT:-}" ] && printf "+accept" || printf "+reload:%s" "$0 --fzf-reload"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
49
src/sh/state.sh
Normal file
49
src/sh/state.sh
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
# Update state
|
||||||
|
# @argument $1: view
|
||||||
|
# @argument $2: mode
|
||||||
|
# @argument $3: arguments
|
||||||
|
state_update() {
|
||||||
|
mv "$STATEFILE" "$STATEFILE_LAST"
|
||||||
|
mv "$ARGSFILE" "$ARGSFILE_LAST"
|
||||||
|
printf "%s#%s" "${1:-}" "${2:-}" >"$STATEFILE"
|
||||||
|
printf "%s" "${3:-}" >"$ARGSFILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Initialize state
|
||||||
|
# @argument $1: view
|
||||||
|
# @argument $2: mode
|
||||||
|
# @argument $3: arguments
|
||||||
|
state_init() {
|
||||||
|
state_update "$1" "$2" "$3"
|
||||||
|
state_update "$1" "$2" "$3"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Update state and keep arguments
|
||||||
|
# @argument $1: view
|
||||||
|
# @argument $2: mode
|
||||||
|
state_update_keep_args() {
|
||||||
|
mv "$STATEFILE" "$STATEFILE_LAST"
|
||||||
|
cp "$ARGSFILE" "$ARGSFILE_LAST"
|
||||||
|
printf "%s#%s" "${1:-}" "${2:-}" >"$STATEFILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Go back to previous state
|
||||||
|
state_revert() {
|
||||||
|
cp "$STATEFILE_LAST" "$STATEFILE"
|
||||||
|
cp "$ARGSFILE_LAST" "$ARGSFILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Get view
|
||||||
|
state_get_view() {
|
||||||
|
cut -d "#" -f 1 "$STATEFILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Get mode
|
||||||
|
state_get_mode() {
|
||||||
|
cut -d "#" -f 2 "$STATEFILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Get args
|
||||||
|
state_get_args() {
|
||||||
|
cat "$ARGSFILE"
|
||||||
|
}
|
Reference in New Issue
Block a user