bugfix: mpv text expansion

src/sh/api.sh

@@ -5,22 +5,19 @@ SLEEP_ON_ERROR=1
 export MB_BROWSE_STEPS
 
 __mpv_command() {
-  echo "mpv_command: $*" >>/tmp/foo
   printf "{ \"command\": [\"%s\"] }\n" "$1" | $SOCAT - "$MPV_SOCKET"
 }
 
 __mpv_command_with_arg() {
-  echo "mpv_command_1: $*" >>/tmp/foo
   printf "{ \"command\": [\"%s\", \"%s\"] }\n" "$1" "$2" | $SOCAT - "$MPV_SOCKET"
 }
 
 __mpv_command_with_args2() {
-  echo "mpv_command_2: $*" >>/tmp/foo
   printf "{ \"command\": [\"%s\", \"%s\", \"%s\"] }\n" "$1" "$2" "$3" | $SOCAT - "$MPV_SOCKET"
 }
 
 __mpv_get() {
-  __mpv_command_with_arg "expand-text" "$2" | $JQ -r '.data'
+  __mpv_command_with_arg "expand-text" "$1" | $JQ -r '.data'
 }
 
 mpv_playlist_count() {
@@ -37,7 +34,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 &
 }
 

src/sh/helper.sh

@@ -13,3 +13,7 @@ info() {
 debug() {
   echo "${DBG}DEBUG${OFF} ${INFO}$(date)${OFF}: $*" >/dev/stderr
 }
+
+foo() {
+  echo "${DBG}DEBUG${OFF} ${INFO} [$$] $(date)${OFF}: $*" >>/tmp/foo
+}

src/sh/keys.sh

@@ -0,0 +1,25 @@
+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,right"}"
+KEYS_PLAY_PREV="${KEYS_PLAY_PREV:-"h,left"}"
+KEYS_SEEK_FORWARD="${KEYS_SEEK_FORWARD:-"L,shift-right"}"
+KEYS_SEEK_BACKWARD="${KEYS_SEEK_BACKWARD:-"H,shift-left"}"
+KEYS_SHOW_PLAYLIST="${KEYS_SHOW_PLAYLIST:-"ctrl-p"}"
+
+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 KEYS_SHOW_PLAYLIST

src/sh/lists.sh

@@ -0,0 +1,167 @@
+# List release groups of given artist
+# argument $1: MB artist id
+list_releasegroups() {
+  name=$(mb_artist "$1" | $JQ -r '.name')
+  mb_artist_releasegroups "$1" |
+    $JQ -r '."release-groups"[] | [
+  .id,
+  ."primary-type",
+  (."secondary-types" // []|join(";")),
+  ."first-release-date",
+  .title,
+  (."artist-credit" | map(([.name, .joinphrase]|join(""))) | join(""))
+  ] | join("\t")' |
+    awk \
+      -F "\t" \
+      -v artist="$name" \
+      -v file_local_releasegroups="${LOCALDATA_RELEASEGROUPS:-}" \
+      -v format_release="$RGV_RELEASE" \
+      -v format_release_w_artist="$RGV_RELEASE_W_ARTIST" \
+      -v format_year="$RGV_YEAR" \
+      -v format_album="$FORMAT_TYPE_ALBUM" \
+      -v format_single="$FORMAT_TYPE_SINGLE" \
+      -v format_ep="$FORMAT_TYPE_EP" \
+      -v format_broadcast="$FORMAT_TYPE_BROADCAST" \
+      -v format_other="$FORMAT_TYPE_OTHER" \
+      -v format_has_secondary="$FORMAT_TYPE_HAS_SECONDARY" \
+      -v format_secondary="$FORMAT_TYPE_SECONDARY" \
+      -v format_compilation="$FORMAT_TYPE_SECONDARY_COMPILATION" \
+      -v format_soundtrack="$FORMAT_TYPE_SECONDARY_SOUNDTRACK" \
+      -v format_spokenword="$FORMAT_TYPE_SECONDARY_SPOKENWORD" \
+      -v format_interview="$FORMAT_TYPE_SECONDARY_INTERVIEW" \
+      -v format_audiobook="$FORMAT_TYPE_SECONDARY_AUDIOBOOK" \
+      -v format_audiodrama="$FORMAT_TYPE_SECONDARY_AUDIODRAMA" \
+      -v format_live="$FORMAT_TYPE_SECONDARY_LIVE" \
+      -v format_remix="$FORMAT_TYPE_SECONDARY_REMIX" \
+      -v format_djmix="$FORMAT_TYPE_SECONDARY_DJMIX" \
+      -v format_mixtape="$FORMAT_TYPE_SECONDARY_MIXTAPE" \
+      -v format_demo="$FORMAT_TYPE_SECONDARY_DEMO" \
+      -v format_fieldrec="$FORMAT_TYPE_SECONDARY_FIELDREC" \
+      -v format_local="$FORMAT_LOCAL" \
+      "$AWK_RELEASEGROUPS" |
+    sort -n -r |
+    cut -d "$(printf '\t')" -f 2- |
+    column -t -s "$(printf '\t')" |
+    sed 's| \+\([0-9a-f-]\+\)$|\t\1|'
+}
+
+# List releases in given relese group
+# argument $1: MB release-group id
+list_releases() {
+  title="$(mb_releasegroup "$1" |
+    $JQ -r '.title')"
+  artist="$(mb_releasegroup "$1" |
+    $JQ -r '."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")')"
+  mb_releasegroup_releases "$1" |
+    $JQ -r '."releases"[] | [
+  .id,
+  .status,
+  .date,
+  ."cover-art-archive".count,
+  (."label-info" | map(.label.name) | unique | join(", ")),
+  (.media | map(."track-count") | add),
+  (.media | map(.format) | unique | join(", ")),
+  .country,
+  .title,
+  (."artist-credit" | map(([.name, .joinphrase]|join(""))) | join(""))
+  ] | join("\t")' |
+    awk \
+      -F "\t" \
+      -v file_local_releases="${LOCALDATA_RELEASES:-}" \
+      -v release_official="$FORMAT_STATUS_OFFICIAL" \
+      -v release_promotion="$FORMAT_STATUS_PROMO" \
+      -v release_bootleg="$FORMAT_STATUS_BOOTLEG" \
+      -v release_pseudo="$FORMAT_STATUS_PSEUDO" \
+      -v release_withdrawn="$FORMAT_STATUS_WITHDRAWN" \
+      -v release_expunged="$FORMAT_STATUS_EXPUNGED" \
+      -v release_cancelled="$FORMAT_STATUS_CANCELLED" \
+      -v release_format="$RV_FORMAT" \
+      -v release_format_title_artist="$RV_TITLE_ARTIST" \
+      -v release_format_title="$RV_TITLE" \
+      -v release_format_artist="$RV_ARTIST" \
+      -v rg_artist="$artist" \
+      -v rg_title="$title" \
+      -v format_local="$FORMAT_LOCAL" \
+      "$AWK_RELEASES" |
+    sort -n -r |
+    cut -d "$(printf '\t')" -f 2- |
+    column -t -s "$(printf '\t')" |
+    sed 's| \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2|'
+}
+
+# List recordings of given release
+# argument $1: MB release id
+list_recordings() {
+  deco="$(grep "$1" "$LOCALDATA_RELEASES" | cut -d "$(printf '\t')" -f 2)"
+  if [ "$deco" ]; then
+    base="$(dirname "$deco")"
+    rectmp=$(mktemp)
+    $JQ -r --arg base "$base/" '.tracks | to_entries | map(.key + "\t" + $base + .value) | join("\n")' "$deco" >"$rectmp"
+  fi
+  mb_release "$1" |
+    $JQ -r '.media[] |
+    .position as $pos |
+    .tracks[] | [
+      .id,
+      $pos,
+      .number,
+      .length,
+      .recording.title,
+      (.recording."artist-credit" | map([.name, .joinphrase] | join("")) | join(""))
+    ] |
+    join("\t")' |
+    awk \
+      -F "\t" \
+      -v file_local_recordings="${rectmp:-}" \
+      -v format="$REC_FORMAT" \
+      -v format_local="$FORMAT_LOCAL" \
+      "$AWK_RECORDINGS" |
+    sort -k1,1n -k2,2g |
+    cut -d "$(printf '\t')" -f 2- |
+    column -t -s "$(printf '\t')" -R 2,3,6 |
+    sed 's| \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2|'
+  if [ "${rectmp:-}" ] && [ -f "$rectmp" ]; then
+    rm -f "$rectmp"
+  fi
+}
+
+# List artists (local)
+list_local_artists() {
+  cat "$LOCALDATA_ARTISTS_VIEW" 2>/dev/null
+}
+
+# List release groups (local)
+list_local_releasegroups() {
+  cat "$LOCALDATA_RELEASEGROUPS_VIEW" 2>/dev/null
+}
+
+# List releases (local)
+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)[]'
+}

src/sh/local.sh

@@ -194,7 +194,7 @@ load_local() {
     column -t -s "$(printf '\t')" |
     sed 's| \+\([0-9a-f-]\+\)$|\t\1|' >"$LOCALDATA_RELEASEGROUPS_VIEW"
   info "Precomputing release view"
-  list_releases |
+  cut -d "$(printf '\t')" -f 1 "$LOCALDATA_RELEASES" |
     while IFS= read -r rid; do
       mb_release "$rid" | $JQ -r '[
       .id,
@@ -230,18 +230,3 @@ load_local() {
     column -t -s "$(printf '\t')" |
     sed 's| \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2|' >"$LOCALDATA_RELEASES_VIEW"
 }
-
-# List all releases
-list_releases() {
-  cut -d "$(printf '\t')" -f 1 "$LOCALDATA_RELEASES"
-}
-
-# List all release groups
-list_releasegroups() {
-  cat "$LOCALDATA_RELEASEGROUPS"
-}
-
-# List all album artists
-list_artists() {
-  cat "$LOCALDATA_ARTISTS"
-}

src/sh/theme.sh

@@ -11,6 +11,7 @@ CLIFE="\033[38;5;251m"
 OFF="\033[m"
 
 FORMAT_LOCAL="${FORMAT_LOCAL:-"🔆"}"
+export FORMAT_LOCAL
 
 # Prompts
 SEARCH_PROMPT=${SEARCH_PROMPT:-"🔎 〉"}

src/sh/tools.sh

@@ -1,5 +1,5 @@
 if command -v "fzf" >/dev/null; then
-  FZF="fzf --black"
+  FZF="fzf --black --ansi --cycle"
 else
   err "Did not find the command-line fuzzy finder fzf."
   exit 1