bugfix and open key

bugfixes and improved themeing support
playlist view: add r key (not functioning)
2025-09-02 14:07:14 +02:00 · 2025-09-02 12:31:44 +02:00 · 2025-09-01 09:34:32 +02:00 · 2025-08-29 15:49:21 +02:00 · 2025-08-29 10:35:37 +02:00 · 2025-08-29 10:34:12 +02:00
13 changed files with 639 additions and 295 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 demo
 muf
+muf.debug.log
--- a/share/theme/bw.sh
+++ b/share/theme/bw.sh
@@ -0,0 +1,117 @@
+# Simple black-and-white theme
+
+# Pointers
+# ========
+# Sign that indicates the existence of audio files
+FORMAT_LOCAL="|>"
+# Pointer to the track currently playing (playlist)
+FORMAT_CURRENT="->"
+
+# Input prompts
+# =============
+# General search prompt
+SEARCH_PROMPT="search> "
+# Prompt that takes an artist name as argument
+ARTIST_PROMPT="%s > "
+# Prompt that takes an artist name and a release name as arguments (in that
+# order)
+FULL_PROMPT="%s > %s > "
+
+# Visual representation of current mode
+# =====================================
+# Sign to indicate `normal` mode
+PROMPT_NORMAL="n  "
+# Sign to indicate `insert` mode
+PROMPT_INSERT="i  "
+
+# Artist view
+# ===========
+# Artist string for persons
+AV_PERSON="<<name>>"
+# Artist string for groups
+AV_GROUP="<<name>>"
+# Artist disambiguation string
+AV_DISAMBIGUATION=" (<<disambiguation>>)"
+
+# Release-group view
+# ==================
+# Default release group string
+RGV_RELEASE="<<title>>"
+# Release group string if the artist name differs from the current artist
+RGV_RELEASE_W_ARTIST="<<title>> by <<artist>>"
+# Year of the release group
+RGV_YEAR="[<<year>>]"
+
+# Release-group types
+# ===================
+# Album
+FORMAT_TYPE_ALBUM="[LP]"
+# EP
+FORMAT_TYPE_EP="[EP]"
+# Single
+FORMAT_TYPE_SINGLE="[single]"
+# Broadcast
+FORMAT_TYPE_BROADCAST="[broadcast]"
+# Other
+FORMAT_TYPE_OTHER="[other]"
+# Flag to indicate that the given release group has associated secondary types.
+FORMAT_TYPE_HAS_SECONDARY="%s xx"
+# Style to represent secondary types (takes one %s placeholder)
+FORMAT_TYPE_SECONDARY="(%s)"
+# Secondary types
+FORMAT_TYPE_SECONDARY_COMPILATION="compilation"
+FORMAT_TYPE_SECONDARY_SOUNDTRACK="OST"
+FORMAT_TYPE_SECONDARY_SPOKENWORD="spokenword"
+FORMAT_TYPE_SECONDARY_INTERVIEW="interview"
+FORMAT_TYPE_SECONDARY_AUDIOBOOK="book"
+FORMAT_TYPE_SECONDARY_AUDIODRAMA="drama"
+FORMAT_TYPE_SECONDARY_LIVE="live"
+FORMAT_TYPE_SECONDARY_REMIX="remix"
+FORMAT_TYPE_SECONDARY_DJMIX="DJ"
+FORMAT_TYPE_SECONDARY_MIXTAPE="mixtape"
+FORMAT_TYPE_SECONDARY_DEMO="demo"
+FORMAT_TYPE_SECONDARY_FIELDREC="field rec"
+
+# Artist Preview
+# ==============
+# Main preview format. Takes two %s placeholder. The first is for the artist
+# biography. The second for the life span.
+APV_FORMAT="\n\n%s\n\n%s"
+# Specification of a date
+APV_DATE="%s"
+# Specification of a place
+APV_PLACE="%s"
+# Specification of a date and a place (in that order)
+APV_DATEPLACE="%s in %s"
+# String to represent when/where a person is born
+APV_BORN="Born: %s"
+# String to represent when/where a person died
+APV_DIED="Died: %s"
+
+# Release view
+# ============
+# Format of a string that represents a release.
+RV_FORMAT="<<status>>\t<<tracks>> tracks\t<<media>>\t<<year>>\t<<country>>\t<<label>>"
+# Additional string to display the release title and artist name
+RV_TITLE_ARTIST="<<artist>> - <<title>>"
+# Additional string to display the release title
+RV_TITLE="<<title>>"
+# Additional string to display the artist
+RV_ARTIST="<<artist>>"
+
+# Release Status
+# ==============
+FORMAT_STATUS_OFFICIAL="official"
+FORMAT_STATUS_PROMO="promo"
+FORMAT_STATUS_BOOTLEG="bootleg"
+FORMAT_STATUS_PSEUDO="psuedo"
+FORMAT_STATUS_WITHDRAWN="withdrawn"
+FORMAT_STATUS_EXPUNGED="expunged"
+FORMAT_STATUS_CANCELLED="cancelled"
+
+# Recording view
+# ==============
+# Format of a track in a release
+REC_FORMAT="<<med>>\t<<nr>>\t<<title>>\t<<artist>>\t<<duration>>"
+# Format of a track in the playlist
+REC_FORMAT_NO_NUMBER="<<title>>\t<<artist>>\t<<duration>>"
--- a/share/theme/simple.sh
+++ b/share/theme/simple.sh
@@ -0,0 +1,118 @@
+# Simple theme without emojis
+
+# Colors (internal only)
+ESC=$(printf '\033')
+RED="${ESC}[31m"
+GREEN="${ESC}[32m"
+YELLOW="${ESC}[33m"
+BLUE="${ESC}[34m"
+PURPLE="${ESC}[35m"
+CYAN="${ESC}[36m"
+WHITE="${ESC}[37m"
+OFF="${ESC}[m"
+
+# Pointers
+# ========
+# Sign that indicates the existence of audio files
+FORMAT_LOCAL="${BLUE}|>$OFF"
+# Pointer to the track currently playing (playlist)
+FORMAT_CURRENT="${WHITE}-->$OFF"
+
+# Input prompts
+# =============
+# General search prompt
+SEARCH_PROMPT="search: "
+# Prompt that takes an artist name as argument
+ARTIST_PROMPT="artist: %s: "
+# Prompt that takes an artist name and a release name as arguments (in that
+# order)
+FULL_PROMPT="artist: %s / %s: "
+
+# Visual representation of current mode
+# =====================================
+# Sign to indicate `normal` mode
+PROMPT_NORMAL="n)"
+# Sign to indicate `insert` mode
+PROMPT_INSERT="i)"
+
+# Artist view
+# ===========
+# Artist string for persons
+AV_PERSON="(P) ${CYAN}<<name>>$OFF"
+# Artist string for groups
+AV_GROUP="(G) ${CYAN}<<name>>$OFF"
+# Artist disambiguation string
+AV_DISAMBIGUATION="// <<disambiguation>>"
+
+# Release-group view
+# ==================
+# Default release group string
+RGV_RELEASE="${PURPLE}<<title>>$OFF"
+# Release group string if the artist name differs from the current artist
+RGV_RELEASE_W_ARTIST="${PURPLE}<<title>>$OFF by ${CYAN}<<artist>>$OFF"
+# Year of the release group
+RGV_YEAR="[<<year>>]"
+
+# Release-group types
+# ===================
+# Album
+FORMAT_TYPE_ALBUM="${YELLOW}LP$OFF"
+# EP
+FORMAT_TYPE_EP="${YELLOW}EP$OFF"
+# Single
+FORMAT_TYPE_SINGLE="${YELLOW}Single$OFF"
+# Broadcast
+FORMAT_TYPE_BROADCAST="${YELLOW}Broadcast$OFF"
+# Other
+FORMAT_TYPE_OTHER=""
+# Flag to indicate that the given release group has associated secondary types.
+FORMAT_TYPE_HAS_SECONDARY="%s ${RED}xx${OFF}"
+# Style to represent secondary types (takes one %s placeholder)
+FORMAT_TYPE_SECONDARY="${RED}(${OFF}%s${RED})${OFF}"
+# Secondary types
+FORMAT_TYPE_SECONDARY_COMPILATION="${YELLOW}compilation$OFF"
+FORMAT_TYPE_SECONDARY_SOUNDTRACK="${YELLOW}soundtrack$OFF"
+FORMAT_TYPE_SECONDARY_SPOKENWORD="${YELLOW}spokenword$OFF"
+FORMAT_TYPE_SECONDARY_INTERVIEW="${YELLOW}interview$OFF"
+FORMAT_TYPE_SECONDARY_AUDIOBOOK="${YELLOW}audiobook$OFF"
+FORMAT_TYPE_SECONDARY_AUDIODRAMA="${YELLOW}audio drama$OFF"
+FORMAT_TYPE_SECONDARY_LIVE="${YELLOW}live$OFF"
+FORMAT_TYPE_SECONDARY_REMIX="${YELLOW}remix$OFF"
+FORMAT_TYPE_SECONDARY_DJMIX="${YELLOW}DJ-mix$OFF"
+FORMAT_TYPE_SECONDARY_MIXTAPE="${YELLOW}mixtape$OFF"
+FORMAT_TYPE_SECONDARY_DEMO="${YELLOW}demo$OFF"
+FORMAT_TYPE_SECONDARY_FIELDREC="${YELLOW}field recording$OFF"
+
+# Artist Preview
+# ==============
+# Main preview format. Takes two %s placeholder. The first is for the artist
+# biography. The second for the life span.
+APV_FORMAT="\n\nBio:\n%s\n\n${WHITE}%s${OFF}"
+# Specification of a date
+APV_DATE="%s"
+# Specification of a place
+APV_PLACE="%s"
+# Specification of a date and a place (in that order)
+APV_DATEPLACE="%s in %s"
+# String to represent when/where a person is born
+APV_BORN="Born: %s"
+# String to represent when/where a person died
+APV_DIED="Died: %s"
+
+# Release view
+# ============
+# Format of a string that represents a release.
+RV_FORMAT="<<media>> (<<tracks>>, yr: <<year>>)\t<<label>>"
+# Additional string to display the release title and artist name
+RV_TITLE_ARTIST="${CYAN}<<artist>>$OFF - ${PURPLE}<<title>>$OFF"
+# Additional string to display the release title
+RV_TITLE="${PURPLE}<<title>>$OFF"
+# Additional string to display the artist
+RV_ARTIST="${CYAN}<<artist>>$OFF"
+
+# Recording view
+# ==============
+# Format of a track in a release
+REC_FORMAT="<<med>>\t${RED}<<nr>>$OFF\t${GREEN}<<title>>$OFF\t${CYAN}<<artist>>$OFF\t${WHITE}<<duration>>$OFF"
+# Format of a track in the playlist
+REC_FORMAT_NO_NUMBER="${GREEN}<<title>>$OFF\t${CYAN}<<artist>>$OFF\t${WHITE}<<duration>>$OFF"
--- a/src/main.sh
+++ b/src/main.sh
@@ -44,6 +44,9 @@ set -eu
 # Load list-generating methods
 . "sh/lists.sh"

+# State management
+. "sh/state.sh"
+
 # FZF handlers
 . "sh/fzf.sh"

@@ -125,6 +128,11 @@ EOF
  exit 0
 fi

+if [ "${1:-}" = "--refresh-view" ]; then
+  precompute_view
+  exit 0
+fi
+
 # Set window title
 printf '\033]0;%s\007' "$WINDOW_TITLE"

@@ -133,10 +141,16 @@ tmpdir=$(mktemp -d)
 LOCKFILE="$tmpdir/lock"
 RESULTS="$tmpdir/results"
 PIDFILE="$tmpdir/pid"
-STATEFILE="$tmpdir/state"
-ARGSFILE="$tmpdir/state-args"
 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
  $0 --internal-search "artist" "$2"
@@ -167,35 +181,20 @@ export VIEW_ARTIST VIEW_RELEASEGROUP VIEW_RELEASE VIEW_SEARCH_ARTIST \
 case "${1:-}" in
 "--artist")
  [ ! "${2:-}" ] && err "MusicBrainz Artist ID not specified (see --help)" && exit 1
-  printf "%s#%s" "$VIEW_ARTIST" "$MODE_NORMAL" >"$STATEFILE"
-  printf "%s" "$2" >"$ARGSFILE"
+  state_init "$VIEW_ARTIST" "$MODE_NORMAL" "$2"
  ;;
 "--releasegroup")
  [ ! "${2:-}" ] && err "MusicBrainz Release-Group ID not specified (see --help)" && exit 1
-  printf "%s#%s" "$VIEW_RELEASEGROUP" "$MODE_NORMAL" >"$STATEFILE"
-  printf "%s" "$2" >"$ARGSFILE"
+  state_init "$VIEW_RELEASEGROUP" "$MODE_NORMAL" "$2"
  ;;
 "--release")
  [ ! "${2:-}" ] && err "MusicBrainz Release ID not specified (see --help)" && exit 1
-  printf "%s#%s" "$VIEW_RELEASE" "$MODE_NORMAL" >"$STATEFILE"
-  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"
+  state_init "$VIEW_RELEASE" "$MODE_NORMAL" "$2"
  ;;
+"--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)"
  exit 1
@@ -207,9 +206,9 @@ mpv_start

 # $KEYS_PLAY main loop
 while true; do
-  view=$(cut -d "#" -f 1 "$STATEFILE")
-  mode=$(cut -d "#" -f 2 "$STATEFILE")
-  args=$(cat "$ARGSFILE")
+  view=$(state_get_view)
+  mode=$(state_get_mode)
+  args=$(state_get_args)
  case "$view" in
  "$VIEW_SELECT_ARTIST")
    sel=$(
@@ -218,19 +217,19 @@ 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}" \
-          -1 \
+          -0 -1 \
          --border="bold" \
          --border-label="Select artist" \
          --delimiter="\t" \
          --prompt="$SEARCH_PROMPT" \
          --margin="5%,20%" \
-          --bind="$KEYS_FILTER_LOCAL:change-query($FORMAT_LOCAL )" \
+          --bind="$KEYS_FILTER_LOCAL:change-query('$QUERY_LOCAL' )" \
          --accept-nth="{3}" \
-          --with-nth="{1}"
+          --with-nth="{1}" || true
    )
-    printf "%s#%s" "$VIEW_ARTIST" "$mode" >"$STATEFILE"
-    printf "%s" "$sel" >"$ARGSFILE"
+    [ "$sel" ] && state_update "$VIEW_ARTIST" "$mode" "$sel" || state_revert
    ;;
  "$VIEW_PLAYLIST")
    list_playlist |
@@ -246,18 +245,22 @@ $KEYS_FILTER_LOCAL:transform:$0 --fzf-key {2} {3} {4}" \
        --with-nth="{1}" >/dev/null
    ;;
  *) # 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_ALL:transform:$0 --fzf-key {2} {3} {4}" \
-      --info="inline-right" \
-      --info-command="$0 --fzf-info" \
-      --preview-window="right,25%,border-left,wrap,<30(hidden)" \
-      --preview="$0 --internal-preview-artist {3}" \
-      --delimiter="\t" \
-      --with-nth="{1}" >/dev/null
+    sel=$(
+      $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_ALL:transform:$0 --fzf-key {2} {3} {4}" \
+        --expect="ctrl-c" \
+        --info="inline-right" \
+        --info-command="$0 --fzf-info" \
+        --preview-window="right,25%,border-left,wrap,<30(hidden)" \
+        --preview="$0 --internal-preview-artist {3}" \
+        --delimiter="\t" \
+        --with-nth="{1}" || true
+    )
+    [ "$(echo "$sel" | head -1)" = "ctrl-c" ] && break
    ;;
  esac
 done
--- a/src/sh/config.sh
+++ b/src/sh/config.sh
@@ -1,4 +1,5 @@
-if [ "${CONFIGFILE:-}" ]; then
-  [ ! -f "$CONFIGFILE" ] && err "Configuration $CONFIGFILE not found." && exit 1
-  . "$CONFIGFLIE"
-fi
+CONFIGFILE_DEFAULT="$HOME/.config/$APP_NAME/config"
+CONFIGFILE="${CONFIGFILE:-"$CONFIGFILE_DEFAULT"}"
+[ "$CONFIGFILE" != "$CONFIGFILE_DEFAULT" ] && [ ! -f "$CONFIGFILE" ] && err "The configuration file manually specified with the environment variable CONFIGFILE=($CONFIGFILE) does not exist." && exit 1
+# shellcheck source=/dev/null
+[ -f "$CONFIGFILE" ] && . "$CONFIGFILE"
--- a/src/sh/fzf.sh
+++ b/src/sh/fzf.sh
@@ -1,8 +1,38 @@
+# Set prompt of input field
+# @argument $1: view
+# @argument $2: mode
+__set_prompt() {
+  view=$1
+  mode=$2
+  case "$view" in
+  "$VIEW_ARTIST")
+    name="$(mb_artist "$args" | $JQ -r '.name')"
+    PROMPT=$(printf "$ARTIST_PROMPT" "$name")
+    ;;
+  "$VIEW_RELEASEGROUP")
+    title="$(mb_releasegroup "$args" |
+      $JQ -r '.title')"
+    artist="$(mb_releasegroup "$args" |
+      $JQ -r '."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")')"
+    PROMPT=$(printf "$FULL_PROMPT" "$artist" "$title")
+    ;;
+  "$VIEW_RELEASE")
+    title="$(mb_release "$args" |
+      $JQ -r '.title')"
+    artist="$(mb_release "$args" |
+      $JQ -r '."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")')"
+    PROMPT=$(printf "$FULL_PROMPT" "$artist" "$title")
+    ;;
+  esac
+  [ "$mode" = "$MODE_INSERT" ] && PT="$PROMPT_INSERT" || PT="$PROMPT_NORMAL"
+  printf "+change-prompt(%s %s)" "$PT" "${PROMPT:-"$SEARCH_PROMPT"}"
+}
+
 # Reload data for FZF
 fzf_handle_reload() {
-  view=$(cut -d "#" -f 1 "$STATEFILE")
-  mode=$(cut -d "#" -f 2 "$STATEFILE")
-  args=$(cat "$ARGSFILE")
+  view=$(state_get_view)
+  mode=$(state_get_mode)
+  args=$(state_get_args)
  case "$view" in
  "$VIEW_ARTIST")
    list_releasegroups "$args"
@@ -24,30 +54,15 @@ fzf_handle_reload() {

 # Handle for after loading data into FZF
 fzf_handle_load() {
-  view=$(cut -d "#" -f 1 "$STATEFILE")
-  mode=$(cut -d "#" -f 2 "$STATEFILE")
-  args=$(cat "$ARGSFILE")
+  view=$(state_get_view)
+  mode=$(state_get_mode)
+  args=$(state_get_args)
  case "$view" in
  "$VIEW_ARTIST")
-    secsymb="$(printf "$FORMAT_TYPE_HAS_SECONDARY" "")"
-    QUERY="$(printf "!%s " "$secsymb")"
-    name="$(mb_artist "$args" | $JQ -r '.name')"
-    PROMPT=$(printf "$ARTIST_PROMPT" "$name")
+    QUERY="!'$QUERY_HAS_SECONDARY' "
    ;;
  "$VIEW_RELEASEGROUP")
-    title="$(mb_releasegroup "$args" |
-      $JQ -r '.title')"
-    artist="$(mb_releasegroup "$args" |
-      $JQ -r '."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")')"
-    QUERY="$(printf "%s " "$FORMAT_STATUS_OFFICIAL")"
-    PROMPT=$(printf "$FULL_PROMPT" "$artist" "$title")
-    ;;
-  "$VIEW_RELEASE")
-    title="$(mb_release "$args" |
-      $JQ -r '.title')"
-    artist="$(mb_release "$args" |
-      $JQ -r '."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")')"
-    PROMPT=$(printf "$FULL_PROMPT" "$artist" "$title")
+    [ "$QUERY_RV" ] && QUERY="'$QUERY_RV' " || QUERY=""
    ;;
  "$VIEW_SEARCH_ARTIST")
    ENABLE_CHANGE=1
@@ -63,18 +78,17 @@ fzf_handle_load() {
    ;;
  "$VIEW_LIST_ALBUMS") ;;
  esac
-  printf "+change-query(%s)" "${QUERY:-}"
-  printf "+change-prompt(%s)" "${PROMPT:-"$SEARCH_PROMPT"}"
-  [ "${DISABLE_SEARCH:-}" ] && printf "+disable-search" || printf "+enable-search"
+  [ "${DISABLE_SEARCH:-}" ] && printf "+disable-search+change-query(%s)" "${QUERY:-"$FZF_QUERY"}" || printf "+enable-search+change-query(%s)" "${QUERY:-}"
  [ "${SHOW_PREVIEW:-}" ] && printf "+show-preview" || printf "+hide-preview"
  [ "${ENABLE_CHANGE:-}" ] && printf "+rebind(change)" || printf "+unbind(change)"
+  __set_prompt "$view" "$mode"
 }

 # Print info string for FZF
 fzf_info() {
-  view=$(cut -d "#" -f 1 "$STATEFILE")
-  mode=$(cut -d "#" -f 2 "$STATEFILE")
-  args=$(cat "$ARGSFILE")
+  view=$(state_get_view)
+  mode=$(state_get_mode)
+  args=$(state_get_args)
  case "$view" in
  "$VIEW_SEARCH_ARTIST")
    echo "Search music artist on MusicBrainz"
@@ -89,7 +103,7 @@ fzf_info() {
    echo "Search albums"
    ;;
  "$VIEW_SELECT_ARTIST")
-    echo "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
@@ -127,7 +141,7 @@ fzf_handle_change() {
  echo "$$" >"$PIDFILE"
  touch "$LOCKFILE"
  sleep 1
-  view=$(cut -d "#" -f 1 "$STATEFILE")
+  view=$(state_get_view)
  if [ "$view" = "$VIEW_SEARCH_ARTIST" ]; then
    api_mb_search_artist "$FZF_QUERY" |
      $JQ -r '.artists[] | [
@@ -196,27 +210,24 @@ fzf_handle_change() {
 # @argument $2: MusicBrainz ID of selected object
 # @argument $3: Path to decoration file (optional)
 fzf_handle_key() {
-  foo "FZF_KEY=$FZF_KEY"
  parentmbid="${1:-}"
  mbid="${2:-}"
  path="${3:-}"
-  view=$(cut -d "#" -f 1 "$STATEFILE")
-  mode=$(cut -d "#" -f 2 "$STATEFILE")
-  args=$(cat "$ARGSFILE")
+  view=$(state_get_view)
+  mode=$(state_get_mode)
+  args=$(state_get_args)

  # If we are in the insert mode, and the key pressed is an "input" key, then
  # put it and quit.
  if [ "$mode" = "$MODE_INSERT" ]; then
    case ",$KEYS_INPUT_SINGLE," in
    *",$FZF_KEY,"*)
-      foo "single key"
      printf "put(%s)" "$FZF_KEY"
      return 0
      ;;
    esac
    case ",$KEYS_INPUT_SPECIAL," in
    *",$FZF_KEY,"*)
-      foo "special key"
      case "$FZF_KEY" in
      "space") printf "put( )" ;;
      "backspace") printf "backward-delete-char" ;;
@@ -227,16 +238,46 @@ fzf_handle_key() {
      return 0
      ;;
    esac
+
+    # Keys in insert mode only
+    case ",$KEYS_I_NORMAL," in
+    *",$FZF_KEY,"*)
+      case "$view" in
+      "$VIEW_PLAYLIST") ;;
+      *)
+        state_update_keep_args "$view" "$MODE_NORMAL"
+        __set_prompt "$view" "$MODE_NORMAL"
+        ;;
+      esac
+      ;;
+    esac
+  fi
+
+  # Keys exclusive to playlist view
+  if [ "$view" = "$VIEW_PLAYLIST" ]; then
+    case ",$KEYS_PLAYLIST_RELOAD," in
+    *",$FZF_KEY,"*)
+      debug "hit playlist reload key"
+      debug "going to call $(printf "reload:%s" "$0 --fzf-reload")"
+      printf "reload:%s" "$0 --fzf-reload"
+      ;;
+    esac
  fi

  # Handle key press
-  foo "handle key..."
  case ",$KEYS_HALFPAGE_DOWN," in
  *",$FZF_KEY,"*) printf "half-page-down" ;;
  esac
  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
@@ -280,10 +321,10 @@ fzf_handle_key() {
    "$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST")
      VIEW_NEXT="$VIEW_ARTIST"
      ;;
-    "$VIEW_ARTIST")
+    "$VIEW_ARTIST" | "$VIEW_SEARCH_ALBUM" | "$VIEW_LIST_ALBUMS")
      VIEW_NEXT="$VIEW_RELEASEGROUP"
      ;;
-    "$VIEW_RELEASEGROUP" | "$VIEW_LIST_ALBUMS" | "$VIEW_SEARCH_ALBUM")
+    "$VIEW_RELEASEGROUP")
      VIEW_NEXT="$VIEW_RELEASE"
      ;;
    esac
@@ -306,7 +347,7 @@ fzf_handle_key() {
      ACCEPT=1
      ;;
    "$VIEW_PLAYLIST")
-      foo "NOT IMPLEMENTED"
+      debug "NOT IMPLEMENTED"
      ;;
    esac
    [ "$VIEW_NEXT_ARGS" ] && VIEW_NEXT="$VIEW_SELECT_ARTIST"
@@ -316,7 +357,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
@@ -325,49 +366,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
@@ -383,8 +385,14 @@ fzf_handle_key() {
    case "$view" in
    "$VIEW_SEARCH_ARTIST") VIEW_NEXT="$VIEW_LIST_ARTISTS" ;;
    "$VIEW_SEARCH_ALBUM") VIEW_NEXT="$VIEW_LIST_ALBUMS" ;;
-    "$VIEW_LIST_ARTISTS") VIEW_NEXT="$VIEW_SEARCH_ARTIST" ;;
-    "$VIEW_LIST_ALBUMS") VIEW_NEXT="$VIEW_SEARCH_ALBUM" ;;
+    "$VIEW_LIST_ARTISTS")
+      VIEW_NEXT="$VIEW_SEARCH_ARTIST"
+      MODE_NEXT="$MODE_INSERT"
+      ;;
+    "$VIEW_LIST_ALBUMS")
+      VIEW_NEXT="$VIEW_SEARCH_ALBUM"
+      MODE_NEXT="$MODE_INSERT"
+      ;;
    esac
    ;;
  esac
@@ -399,7 +407,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
@@ -420,7 +428,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
@@ -438,15 +446,15 @@ fzf_handle_key() {
  esac

  # Keys in normal mode only
-  case ",$KEYS_N_DOWN," in
-  *",$FZF_KEY,"*) [ "$mode" = "$MODE_NORMAL" ] && printf "down" || printf "put(%s)" "$FZF_KEY" ;;
-  esac
-  case ",$KEYS_N_UP," in
-  *",$FZF_KEY,"*) [ "$mode" = "$MODE_NORMAL" ] && printf "up" || printf "put(%s)" "$FZF_KEY" ;;
-  esac
-  case ",$KEYS_N_OUT," in
-  *",$FZF_KEY,"*)
-    if [ "$mode" = "$MODE_NORMAL" ]; then
+  if [ "$mode" = "$MODE_NORMAL" ]; then
+    case ",$KEYS_N_DOWN," in
+    *",$FZF_KEY,"*) printf "down" ;;
+    esac
+    case ",$KEYS_N_UP," in
+    *",$FZF_KEY,"*) printf "up" ;;
+    esac
+    case ",$KEYS_N_OUT," in
+    *",$FZF_KEY,"*)
      case "$view" in
      "$VIEW_ARTIST")
        VIEW_NEXT="$VIEW_LIST_ARTISTS"
@@ -466,115 +474,79 @@ fzf_handle_key() {
        ACCEPT=1
        ;;
      esac
-    else
-      printf "put(%s)" "$FZF_KEY"
-    fi
-    ;;
-  esac
-  case ",$KEYS_N_IN," in
-  *",$FZF_KEY,"*)
-    if [ "$mode" = "$MODE_NORMAL" ]; then
+      ;;
+    esac
+    case ",$KEYS_N_IN," in
+    *",$FZF_KEY,"*)
      [ "$mbid" ] || return 0
      VIEW_NEXT_ARGS="$mbid"
      case "$view" in
      "$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST")
        VIEW_NEXT="$VIEW_ARTIST"
        ;;
-      "$VIEW_ARTIST")
+      "$VIEW_ARTIST" | "$VIEW_SEARCH_ALBUM" | "$VIEW_LIST_ALBUMS")
        VIEW_NEXT="$VIEW_RELEASEGROUP"
        ;;
-      "$VIEW_RELEASEGROUP" | "$VIEW_LIST_ALBUMS" | "$VIEW_SEARCH_ALBUM")
+      "$VIEW_RELEASEGROUP")
        VIEW_NEXT="$VIEW_RELEASE"
        ;;
      esac
-    else
-      printf "put(%s)" "$FZF_KEY"
-    fi
-    ;;
-  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_INSERT," in
-  *",$FZF_KEY,"*)
-    case "$view" in
-    "$VIEW_PLAYLIST") ;;
-    *)
-      if [ "$mode" = "$MODE_NORMAL" ]; then
-        printf "%s#%s" "$view" "$MODE_INSERT" >"$STATEFILE"
-        foo "Do more here?"
-      else
-        printf "put(%s)" "$FZF_KEY"
-      fi
+    case ",$KEYS_N_TOP," in
+    *",$FZF_KEY,"*) printf "first" ;;
+    esac
+    case ",$KEYS_N_BOT," in
+    *",$FZF_KEY,"*) printf "last" ;;
+    esac
+    case ",$KEYS_N_QUIT," in
+    *",$FZF_KEY,"*)
+      case "$view" in
+      "$VIEW_SELECT_ARTIST" | "$VIEW_PLAYLIST") printf "accept" ;;
+      *) printf "print(Q)+abort" ;;
+      esac
      ;;
    esac
-    ;;
-  esac
-  case ",$KEYS_N_TOGGLE_PLAY_PAUSE," in
-  *",$FZF_KEY,"*) [ "$mode" = "$MODE_NORMAL" ] && mpv_toggle_pause >/dev/null || printf "put(%s)" "$FZF_KEY" ;;
-  esac
+    case ",$KEYS_N_INSERT," in
+    *",$FZF_KEY,"*)
+      case "$view" in
+      "$VIEW_PLAYLIST") ;;
+      *)
+        state_update_keep_args "$view" "$MODE_INSERT"
+        __set_prompt "$view" "$MODE_INSERT"
+        ;;
+      esac
+      ;;
+    esac
+    case ",$KEYS_N_TOGGLE_PLAY_PAUSE," in
+    *",$FZF_KEY,"*) mpv_toggle_pause >/dev/null ;;
+    esac

-  case ",$KEYS_N_PLAY_NEXT," in
-  *",$FZF_KEY,"*)
-    if [ "$mode" = "$MODE_NORMAL" ]; then
+    case ",$KEYS_N_PLAY_NEXT," in
+    *",$FZF_KEY,"*)
      mpv_next >/dev/null
      [ "$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"
-        foo "Do more here?"
-      else
-        printf "put(%s)" "$FZF_KEY"
-      fi
      ;;
    esac
-    ;;
-  esac
+    case ",$KEYS_N_PLAY_PREV," in
+    *",$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
  [ "${QUERY:-}" ] && printf "+change-query(%s)" "$QUERY"
  if [ "${VIEW_NEXT:-}" ]; then
-    printf "%s#%s" "$VIEW_NEXT" "$mode" >"$STATEFILE"
-    printf "%s" "${VIEW_NEXT_ARGS:-}" >"$ARGSFILE"
+    [ "$VIEW_NEXT" = "$VIEW_PLAYLIST" ] && MODE_NEXT="$MODE_NORMAL"
+    state_update "$VIEW_NEXT" "${MODE_NEXT:-"$mode"}" "${VIEW_NEXT_ARGS:-}"
    [ "${ACCEPT:-}" ] && printf "+accept" || printf "+reload:%s" "$0 --fzf-reload"
  fi
 }
--- a/src/sh/helper.sh
+++ b/src/sh/helper.sh
@@ -2,6 +2,7 @@ ERR="\033[38;5;196m"
 INFO="\033[38;5;75m"
 DBG=$ERR
 OFF="\033[m"
+
 err() {
  echo "${ERR}ERROR:${OFF} ${1:-}" >/dev/stderr
 }
@@ -11,9 +12,5 @@ info() {
 }

 debug() {
-  echo "${DBG}DEBUG${OFF} ${INFO}$(date)${OFF}: $*" >/dev/stderr
-}
-
-foo() {
-  echo "${DBG}DEBUG${OFF} ${INFO} [$$] $(date)${OFF}: $*" >>/tmp/foo
+  echo "${DBG}DEBUG${OFF} ${INFO} [$$] $(date)${OFF}: $*" >>"$APP_NAME.debug.log"
 }
--- a/src/sh/info.sh
+++ b/src/sh/info.sh
@@ -1,5 +1,5 @@
 APP_NAME="muf"
 APP_VERSION="zero.zero"
 APP_WEBSITE="https://git.indyfac.ch/amin/muf"
-WINDOW_TITLE="🔎🎶 $APP_NAME | a simple music finder"
+WINDOW_TITLE="🔎🎶 $APP_NAME | a simple music finder and player"
 export APP_NAME APP_VERSION APP_WEBSITE WINDOW_TITLE
--- 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"}"
@@ -26,6 +27,7 @@ KEYS_N_DOWN="${KEYS_N_DOWN:-"j"}"
 KEYS_N_UP="${KEYS_N_UP:-"k"}"
 KEYS_N_OUT="${KEYS_N_OUT:-"h"}"
 KEYS_N_IN="${KEYS_N_IN:-"l"}"
+KEYS_N_TOP="${KEYS_N_TOP:-"1"}"
 KEYS_N_BOT="${KEYS_N_BOT:-"G"}"
 KEYS_N_QUIT="${KEYS_N_QUIT:-"q"}"
 KEYS_N_INSERT="${KEYS_N_INSERT:-"a,i,/"}"
@@ -35,23 +37,28 @@ KEYS_N_PLAY_PREV="${KEYS_N_PLAY_PREV:-"left"}"
 KEYS_N_SEEK_FORWARD="${KEYS_N_SEEK_FORWARD:-"shift-right"}"
 KEYS_N_SEEK_BACKWARD="${KEYS_N_SEEK_BACKWARD:-"shift-left"}"

+# Special playlist keys
+KEYS_PLAYLIST_RELOAD="${KEYS_PLAYLIST_RELOAD:-"r"}"
+
 # Keys in insert mode only
 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_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"
+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"

 KEYS_GROUP_I="$KEYS_I_NORMAL"

-KEYS_ALL="$KEYS_GROUP_NI,$KEYS_GROUP_N,$KEYS_GROUP_I,$KEYS_INPUT_SINGLE,$KEYS_INPUT_SPECIAL"
+KEYS_PLAYLIST="$KEYS_PLAYLIST_RELOAD"

-export KEYS_HALFPAGE_DOWN KEYS_HALFPAGE_UP KEYS_BROWSE KEYS_OUT KEYS_IN \
+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_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_BOT KEYS_N_QUIT KEYS_N_INSERT \
+  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 KEYS_SHOW_PLAYLIST \
  KEYS_I_NORMAL \
-  KEYS_GROUP_NI KEYS_GROUP_N KEYS_GROUP_I KEYS_ALL
+  KEYS_GROUP_NI KEYS_GROUP_N KEYS_GROUP_I KEYS PLAYLIST KEYS_ALL
--- a/src/sh/local.sh
+++ b/src/sh/local.sh
@@ -103,32 +103,8 @@ LOCALDATA_RELEASEGROUPS_VIEW="$LOCALDATADIR/releasegroups_view"
 LOCALDATA_RELEASES_VIEW="$LOCALDATADIR/releases_view"
 DECORATION_FILENAME=${DECORATION_FILENAME:-"mbid.json"}

-# Load local music
-# argument $1: path to decorated music files
-load_local() {
-  [ -d "$LOCALDATADIR" ] || mkdir -p "$LOCALDATADIR"
-  tmpreleases=$(mktemp)
-  [ -f "$tmpreleases" ] || exit 1
-  info "Locating and parsing decoration files ($DECORATION_FILENAME)"
-  find "$1" -type f -name "$DECORATION_FILENAME" -print0 |
-    xargs -0 -P 4 $JQ -r '.releaseid+"\t"+input_filename' |
-    tee "$LOCALDATA_RELEASES" |
-    cut -d "$(printf '\t')" -f 1 >"$tmpreleases"
-  __batch_load_missing "$TYPE_RELEASE" "$tmpreleases"
-  # Get release groups and album artists
-  while IFS= read -r rid; do
-    mb=$(mb_release "$rid")
-    echo "$mb" | $JQ -r '."release-group".id' >>"$LOCALDATA_RELEASEGROUPS"
-    echo "$mb" | $JQ -r '."release-group"."artist-credit" | map(.artist.id) | join("\n")' >>"$LOCALDATA_ARTISTS"
-  done <"$tmpreleases"
-  tf=$(mktemp)
-  sort "$LOCALDATA_RELEASEGROUPS" | uniq >"$tf" && mv "$tf" "$LOCALDATA_RELEASEGROUPS"
-  sort "$LOCALDATA_ARTISTS" | uniq >"$tf" && mv "$tf" "$LOCALDATA_ARTISTS"
-  # Populate cache with missing data
-  __batch_load_missing "$TYPE_RELEASEGROUP" "$LOCALDATA_RELEASEGROUPS"
-  __batch_load_missing "$TYPE_ARTIST" "$LOCALDATA_ARTISTS"
-  rm -f "$tmpreleases"
-  # Precompute views
+# Precompute views
+precompute_view() {
  info "Precomputing artist view"
  while IFS= read -r aid; do
    mb_artist "$aid" | $JQ -r '[
@@ -231,3 +207,33 @@ load_local() {
    column -t -s "$(printf '\t')" |
    sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|' >"$LOCALDATA_RELEASES_VIEW"
 }
+
+# Load local music
+# argument $1: path to decorated music files
+load_local() {
+  [ -d "$LOCALDATADIR" ] || mkdir -p "$LOCALDATADIR"
+  tmpreleases=$(mktemp)
+  [ -f "$tmpreleases" ] || exit 1
+  info "Locating and parsing decoration files ($DECORATION_FILENAME)"
+  find "$1" -type f -name "$DECORATION_FILENAME" -print0 |
+    xargs -0 -P 4 $JQ -r '.releaseid+"\t"+input_filename' |
+    tee "$LOCALDATA_RELEASES" |
+    cut -d "$(printf '\t')" -f 1 >"$tmpreleases"
+  __batch_load_missing "$TYPE_RELEASE" "$tmpreleases"
+  # Get release groups and album artists
+  while IFS= read -r rid; do
+    mb=$(mb_release "$rid")
+    echo "$mb" | $JQ -r '."release-group".id' >>"$LOCALDATA_RELEASEGROUPS"
+    echo "$mb" | $JQ -r '."release-group"."artist-credit" | map(.artist.id) | join("\n")' >>"$LOCALDATA_ARTISTS"
+  done <"$tmpreleases"
+  tf=$(mktemp)
+  sort "$LOCALDATA_RELEASEGROUPS" | uniq >"$tf" && mv "$tf" "$LOCALDATA_RELEASEGROUPS"
+  sort "$LOCALDATA_ARTISTS" | uniq >"$tf" && mv "$tf" "$LOCALDATA_ARTISTS"
+  # Populate cache with missing data
+  __batch_load_missing "$TYPE_RELEASEGROUP" "$LOCALDATA_RELEASEGROUPS"
+  __batch_load_missing "$TYPE_ARTIST" "$LOCALDATA_ARTISTS"
+  rm -f "$tmpreleases"
+  info "Resetting views"
+  rm -f "$LOCALDATA_ARTISTS_VIEW" "$LOCALDATA_RELEASEGROUPS_VIEW" "$LOCALDATA_RELEASES_VIEW"
+  precompute_view
+}
--- a/src/sh/mpv.sh
+++ b/src/sh/mpv.sh
@@ -40,7 +40,6 @@ mpv_play_list() {
 }

 mpv_queue_list() {
-  foo "mpv_queue_list"
  t=$(mktemp)
  cat >"$t"
  __mpv_command_with_args2 "loadlist" "$t" "append-play"
--- a/src/sh/state.sh
+++ b/src/sh/state.sh
@@ -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"
+}
--- a/src/sh/theme.sh
+++ b/src/sh/theme.sh
@@ -1,42 +1,81 @@
-# Colors (local)
-FAINT="\033[2m"
-CARTIST="\033[38;5;209m"
-CTITLE="\033[38;5;229m"
-CYEAR="\033[38;5;179m"
-CDISAMB="$FAINT\033[38;5;172m"
-CNOTE="\033[38;5;242m"
-CXXX="\033[38;5;109m"
-CDESC="\033[38;5;254m"
-CLIFE="\033[38;5;251m"
-OFF="\033[m"
+# Theme file (default theme)
+# This file specifies the main theme of the visual representation. All
+# specifications provided here may be altered using the configuration file.
+#
+# This theme requires fonts that support utf-8, colors, and emojis.

+# Colors (internal only)
+ESC=$(printf '\033')
+FAINT="${ESC}[2m"
+CARTIST="${ESC}[38;5;209m"
+CTITLE="${ESC}[38;5;229m"
+CYEAR="${ESC}[38;5;179m"
+CDISAMB="$FAINT${ESC}[38;5;172m"
+CNOTE="${ESC}[38;5;242m"
+CXXX="${ESC}[38;5;109m"
+CDESC="${ESC}[38;5;254m"
+CLIFE="${ESC}[38;5;251m"
+OFF="${ESC}[m"
+
+# Pointers
+# ========
+# Sign that indicates the existence of audio files
 FORMAT_LOCAL="${FORMAT_LOCAL:-"🔆"}"
-export FORMAT_LOCAL
+# Pointer to the track currently playing (playlist)
 FORMAT_CURRENT="${FORMAT_CURRENT:-"👉"}"

-# Prompts
+# Input prompts
+# =============
+# General search prompt
 SEARCH_PROMPT=${SEARCH_PROMPT:-"🔎 〉"}
+# Prompt that takes an artist name as argument
 ARTIST_PROMPT="${ARTIST_PROMPT:-"🎤 ${CARTIST}%s$OFF 〉"}"
+# Prompt that takes an artist name and a release name as arguments (in that
+# order)
 FULL_PROMPT="${FULL_PROMPT:-"🎤 ${CARTIST}%s$OFF 》${CTITLE}%s$OFF 〉"}"

+# Visual representation of current mode
+# =====================================
+# Sign to indicate `normal` mode
+PROMPT_NORMAL="${PROMPT_NORMAL:-"${FAINT}[n]${OFF}"}"
+# Sign to indicate `insert` mode
+PROMPT_INSERT="${PROMPT_INSERT:-"${FAINT}[i]${OFF}"}"
+
 # Artist view
+# ===========
+# Artist string for persons
 AV_PERSON="${AV_PERSON:-"🧑‍🎤 $CARTIST<<name>>$OFF"}"
+# Artist string for groups
 AV_GROUP="${AV_GROUP:-"🧑‍🤝‍🧑 $CARTIST<<name>>$OFF"}"
+# Artist disambiguation string
 AV_DISAMBIGUATION="${AV_DISAMBIGUATION:-"$CDISAMB(<<disambiguation>>)$OFF"}"

-# Release group view
+# Release-group view
+# ==================
+# Default release group string
 RGV_RELEASE="${RGV_RELEASE:-"${CTITLE}<<title>>$OFF"}"
+# Release group string if the artist name differs from the current artist
 RGV_RELEASE_W_ARTIST="${RGV_RELEASE_W_ARTIST:-"${CTITLE}<<title>>$OFF — ${CARTIST}<<artist>>$OFF"}"
+# Year of the release group
 RGV_YEAR="${RGV_YEAR:-"${CYEAR}(<<year>>)$OFF"}"

-# Types
+# Release-group types
+# ===================
+# Album
 FORMAT_TYPE_ALBUM="${FORMAT_TYPE_ALBUM:-"LP 💽"}"
+# EP
 FORMAT_TYPE_EP="${FORMAT_TYPE_EP:-"EP 📀"}"
+# Single
 FORMAT_TYPE_SINGLE="${FORMAT_TYPE_SINGLE:-"SI 🎶"}"
+# Broadcast
 FORMAT_TYPE_BROADCAST="${FORMAT_TYPE_BROADCAST:-"BR 📻"}"
+# Other
 FORMAT_TYPE_OTHER="${FORMAT_TYPE_OTHER:-"OT ❔"}"
+# Flag to indicate that the given release group has associated secondary types.
 FORMAT_TYPE_HAS_SECONDARY="${FORMAT_TYPE_HAS_SECONDARY:-"%s☼"}"
+# Style to represent secondary types (takes one %s placeholder)
 FORMAT_TYPE_SECONDARY="${FORMAT_TYPE_SECONDARY:-"${CNOTE}[☼: %s]$OFF"}"
+# Secondary types
 FORMAT_TYPE_SECONDARY_COMPILATION="${FORMAT_TYPE_SECONDARY_COMPILATION:-"🧩 compilation"}"
 FORMAT_TYPE_SECONDARY_SOUNDTRACK="${FORMAT_TYPE_SECONDARY_SOUNDTRACK:-"🎬 soundtrack"}"
 FORMAT_TYPE_SECONDARY_SPOKENWORD="${FORMAT_TYPE_SECONDARY_SPOKENWORD:-"📖 spokenword"}"
@@ -51,14 +90,34 @@ FORMAT_TYPE_SECONDARY_DEMO="${FORMAT_TYPE_SECONDARY_DEMO:-"🧪 demo"}"
 FORMAT_TYPE_SECONDARY_FIELDREC="${FORMAT_TYPE_SECONDARY_FIELDREC:-"🌿 field recording"}"

 # Artist Preview
+# ==============
+# Main preview format. Takes two %s placeholder. The first is for the artist
+# biography. The second for the life span.
 APV_FORMAT="${APV_FORMAT:-"\n\n${CDESC}%s${OFF}\n\n${CLIFE}%s${OFF}"}"
+# Specification of a date
 APV_DATE="${APV_DATE:-"%s"}"
+# Specification of a place
 APV_PLACE="${APV_PLACE:-"%s"}"
+# Specification of a date and a place (in that order)
 APV_DATEPLACE="${APV_DATEPLACE:-"$APV_DATE, $APV_PLACE"}"
+# String to represent when/where a person is born
 APV_BORN="${APV_BORN:-"🍼 Born: %s"}"
+# String to represent when/where a person died
 APV_DIED="${APV_DIED:-"🕯️ Died: %s"}"

-# Status
+# Release view
+# ============
+# Format of a string that represents a release.
+RV_FORMAT="${RV_FORMAT:-"<<status>>\t${CXXX}<<tracks>> tracks\t<<media>>$OFF\t${CYEAR}<<year>>\t<<country>>$OFF\t${CARTIST}<<label>>$OFF"}"
+# Additional string to display the release title and artist name
+RV_TITLE_ARTIST="${RV_TITLE_ARTIST:-"${FAINT}as ${CTITLE}<<title>>$OFF by ${FAINT}${CARTIST}<<artist>>$OFF"}"
+# Additional string to display the release title
+RV_TITLE="${RV_TITLE:-"${FAINT}as ${CTITLE}<<title>>$OFF"}"
+# Additional string to display the artist
+RV_ARTIST="${RV_ARTIST:-"${FAINT}by ${CARTIST}<<artist>>$OFF"}"
+
+# Release Status
+# ==============
 FORMAT_STATUS_OFFICIAL="${FORMAT_STATUS_OFFICIAL:-"🟢 official"}"
 FORMAT_STATUS_PROMO="${FORMAT_STATUS_PROMO:-"📣 promo"}"
 FORMAT_STATUS_BOOTLEG="${FORMAT_STATUS_BOOTLEG:-"💣 bootleg"}"
@@ -67,12 +126,27 @@ FORMAT_STATUS_WITHDRAWN="${FORMAT_STATUS_WITHDRAWN:-"🔙 withdrawn"}"
 FORMAT_STATUS_EXPUNGED="${FORMAT_STATUS_EXPUNGED:-"🧹 expunged"}"
 FORMAT_STATUS_CANCELLED="${FORMAT_STATUS_CANCELLED:-"❌ cancelled"}"

-# Release view
-RV_FORMAT="<<status>>\t${CXXX}<<tracks>> tracks\t<<media>>$OFF\t${CYEAR}<<year>>\t<<country>>$OFF\t${CARTIST}<<label>>$OFF"
-RV_TITLE_ARTIST="${FAINT}as ${CTITLE}<<title>>$OFF by ${FAINT}${CARTIST}<<artist>>$OFF"
-RV_TITLE="${FAINT}as ${CTITLE}<<title>>$OFF"
-RV_ARTIST="${FAINT}by ${CARTIST}<<artist>>$OFF"
-
 # Recording view
-REC_FORMAT="${CNOTE}${FAINT}<<med>>\t${CNOTE}<<nr>>$OFF\t${CTITLE}<<title>>\t${CARTIST}<<artist>>\t${CXXX}<<duration>>$OFF"
-REC_FORMAT_NO_NUMBER="${CTITLE}<<title>>\t${CARTIST}<<artist>>\t${CXXX}<<duration>>$OFF"
+# ==============
+# Format of a track in a release
+REC_FORMAT="${REC_FORMAT:-"${CNOTE}${FAINT}<<med>>\t${CNOTE}<<nr>>$OFF\t${CTITLE}<<title>>\t${CARTIST}<<artist>>\t${CXXX}<<duration>>$OFF"}"
+# Format of a track in the playlist
+REC_FORMAT_NO_NUMBER="${REC_FORMAT_NO_NUMBER:-"${CTITLE}<<title>>\t${CARTIST}<<artist>>\t${CXXX}<<duration>>$OFF"}"
+
+# Derivatives
+# ===========
+QUERY_LOCAL=$(printf "%s" "$FORMAT_LOCAL" | sed "s/${ESC}\[[0-9;]*[mK]//g" | sed "s/ /\\\ /g")
+QUERY_HAS_SECONDARY=$(printf "$FORMAT_TYPE_HAS_SECONDARY" "" | sed "s/${ESC}\[[0-9;]*[mK]//g" | sed "s/ /\\\ /g")
+QUERY_ALBUM=$(printf "%s" "$FORMAT_TYPE_ALBUM" | sed "s/${ESC}\[[0-9;]*[mK]//g" | sed "s/ /\\\ /g")
+QUERY_EP=$(printf "%s" "$FORMAT_TYPE_EP" | sed "s/${ESC}\[[0-9;]*[mK]//g" | sed "s/ /\\\ /g")
+QUERY_SINGLE=$(printf "%s" "$FORMAT_TYPE_SINGLE" | sed "s/${ESC}\[[0-9;]*[mK]//g" | sed "s/ /\\\ /g")
+QUERY_BROADCAST=$(printf "%s" "$FORMAT_TYPE_BROADCAST" | sed "s/${ESC}\[[0-9;]*[mK]//g" | sed "s/ /\\\ /g")
+QUERY_OTHER=$(printf "%s" "$FORMAT_TYPE_OTHER" | sed "s/${ESC}\[[0-9;]*[mK]//g" | sed "s/ /\\\ /g")
+if printf "$RV_FORMAT" | grep -q "<<status>>"; then
+  QUERY_RV=$(printf "%s" "$FORMAT_STATUS_OFFICIAL" | sed "s/${ESC}\[[0-9;]*[mK]//g" | sed "s/ /\\\ /g")
+else
+  QUERY_RV=""
+fi
+
+# Necessary exports
+export QUERY_LOCAL QUERY_HAS_SECONDARY QUERY_ALBUM QUERY_EP QUERY_SINGLE QUERY_BROADCAST QUERY_OTHER QUERY_RV
Author	SHA1	Message	Date
Ämin Baumeler	872cb3a741	bugfix and open key	2025-09-02 14:07:14 +02:00
Ämin Baumeler	0ba9ec2932	bugfixes and improved themeing support	2025-09-02 12:31:44 +02:00
Ämin Baumeler	230b534501	playlist view: add r key (not functioning)	2025-09-01 09:34:32 +02:00
Ämin Baumeler	fc02d93158	state sep	2025-08-29 15:49:21 +02:00
Ämin Baumeler	8164b7de39	added key 1 (first)	2025-08-29 10:35:37 +02:00
Ämin Baumeler	3bd1cc7a87	feat: visually indicate normal vs insert	2025-08-29 10:34:12 +02:00