improved visuals

2025-07-30 21:42:24 +02:00
parent 3e3622b5be
commit 64afff2110
4 changed files with 71 additions and 66 deletions
--- a/src/awk/releases.awk
+++ b/src/awk/releases.awk
@@ -38,6 +38,7 @@ BEGIN { OFS="\t" }
  sub("<<label>>", label, line)
  sub("<<title>>", title, line)
  sub("<<artist>>", artist, line)
+  sub("<<country>>", country, line)
  sortk = year ? year : 0
  print sortk, line, id
 }
--- a/src/main.sh
+++ b/src/main.sh
@@ -66,9 +66,9 @@ if [ "${1:-}" = "--internal-search" ]; then
    ] | join("\t")' |
    awk \
      -F "\t" \
-      -v format_person="$FORMAT_PERSON" \
-      -v format_group="$FORMAT_GROUP" \
-      -v format_disambiguation="$FORMAT_DISAMBIGUATION" \
+      -v format_person="$AV_PERSON" \
+      -v format_group="$AV_GROUP" \
+      -v format_disambiguation="$AV_DISAMBIGUATION" \
      "$AWK_ARTISTS" |
    tee "$RESULTS" ||
    true
@@ -98,9 +98,9 @@ if [ "${1:-}" = "--internal-list-releasegroups" ]; then
    awk \
      -F "\t" \
      -v artist="$name" \
-      -v format_release="$FORMAT_RELEASE" \
-      -v format_release_w_artist="$FORMAT_RELEASE_W_ARTIST" \
-      -v format_year="$FORMAT_YEAR" \
+      -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" \
@@ -148,17 +148,17 @@ if [ "${1:-}" = "--internal-list-releases" ]; then
  ] | join("\t")' |
    awk \
      -F "\t" \
-      -v release_official="$RELEASE_OFFICIAL" \
-      -v release_promotion="$RELEASE_PROMOTION" \
-      -v release_bootleg="$RELEASE_BOOTLEG" \
-      -v release_pseudo="$RELEASE_PSEUDO" \
-      -v release_withdrawn="$RELEASE_WITHDRAWN" \
-      -v release_expunged="$RELEASE_EXPUNGED" \
-      -v release_cancelled="$RELEASE_CANCELLED" \
-      -v release_format="$RELEASE_FORMAT" \
-      -v release_format_title_artist="$RELEASE_TITLE_ARTIST" \
-      -v release_format_title="$RELEASE_TITLE" \
-      -v release_format_artist="$RELEASE_ARTIST" \
+      -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" \
      "$AWK_RELEASES" |
@@ -230,7 +230,7 @@ while true; do
          --reverse \
          --cycle \
          --no-sort \
-          --query="$RELEASE_OFFICIAL " \
+          --query="$FORMAT_STATUS_OFFICIAL " \
          --delimiter="\t" \
          --prompt="$(printf "$FULL_PROMPT" "$artist" "$title")" \
          --accept-nth="{2}" \
--- a/src/sh/preview.sh
+++ b/src/sh/preview.sh
@@ -14,26 +14,26 @@ __preview_artist() {
    ab=$(mb_artist "$1" | $JQ -r '."begin-area".name // ""')
    ae=$(mb_artist "$1" | $JQ -r '."end-area".name // ""')
    if [ "$lsb" ] && [ "$ab" ]; then
-      begin=$(printf "$FORMAT_DATEPLACE" "$lsb" "$ab")
+      begin=$(printf "$APV_DATEPLACE" "$lsb" "$ab")
    elif [ "$lsb" ]; then
-      begin=$(printf "$FORMAT_DATE" "$lsb")
+      begin=$(printf "$APV_DATE" "$lsb")
    elif [ "$ab" ]; then
-      begin=$(printf "$FORMAT_PLACE" "$ab")
+      begin=$(printf "$APV_PLACE" "$ab")
    else
      begin=""
    fi
    if [ "$lse" ] && [ "$ae" ]; then
-      end=$(printf "$FORMAT_DATEPLACE" "$lse" "$ae")
+      end=$(printf "$APV_DATEPLACE" "$lse" "$ae")
    elif [ "$lse" ]; then
-      end=$(printf "$FORMAT_DATE" "$lse")
+      end=$(printf "$APV_DATE" "$lse")
    elif [ "$ae" ]; then
-      end=$(printf "$FORMAT_PLACE" "$ae")
+      end=$(printf "$APV_PLACE" "$ae")
    else
      end=""
    fi
-    [ "$begin" ] && lifespan="$(printf "$FORMAT_LIFESPAN_BORN" "$begin")"
-    [ "$end" ] && lifespan="$(printf "%s\n$FORMAT_LIFESPAN_DIED" "$lifespan" "$end")"
+    [ "$begin" ] && lifespan="$(printf "$APV_BORN" "$begin")"
+    [ "$end" ] && lifespan="$(printf "%s\n$APV_DIED" "$lifespan" "$end")"
  fi
  #link=$(printf "More info:\033]8;;%s\033\\ %s\033]8;;\033\\" "https://musicbrainz.org/" "[MusicBrainz]")
-  printf "\n\n${COLOR_DESCRIPTION}%s${COLOR_RESET}\n\n${COLOR_LIFESPAN}%s$COLOR_RESET" "$desc" "${lifespan:-}"
+  printf "$APV_FORMAT" "$desc" "${lifespan:-}"
 }
--- a/src/sh/theme.sh
+++ b/src/sh/theme.sh
@@ -1,32 +1,38 @@
-# Colors
+# Colors (local)
 FAINT="\033[2m"
-COLOR_ARTIST="\033[38;5;209m"
-COLOR_DISAMBIGUATION="$FAINT\033[38;5;172m"
-COLOR_DESCRIPTION="${COLOR_DESCRIPTION:-"\033[38;5;254m"}"
-COLOR_LIFESPAN="${COLOR_LIFESPAN:-"\033[38;5;251m"}"
-COLOR_RESET="\033[m"
-COLOR_NOTE="\033[38;5;242m"
-COLOR_TYPE_SECONDARY="$COLOR_NOTE"
-COLOR_RELEASE_TITLE="\033[38;5;229m"
-COLOR_RELEASE_YEAR="\033[38;5;179m"
-COLOR_RELEASE_STATUS="$COLOR_RELEASE_YEAR"
+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"
+
+# Prompts
+SEARCH_PROMPT=${SEARCH_PROMPT:-"🔎 〉"}
+ARTIST_PROMPT="${ARTIST_PROMPT:-"🎤 ${CARTIST}%s$OFF 〉"}"
+FULL_PROMPT="${FULL_PROMPT:-"🎤 ${CARTIST}%s$OFF » ${CTITLE}%s$OFF 〉"}"

 # Artist view
-FORMAT_PERSON="${FORMAT_PERSON:-🧑‍🎤 $COLOR_ARTIST<<name>>$COLOR_RESET}"
-FORMAT_GROUP="${FORMAT_GROUP:-🧑‍🤝‍🧑 $COLOR_ARTIST<<name>>$COLOR_RESET}"
-FORMAT_DISAMBIGUATION="${FORMAT_DISAMBIGUATION:-$COLOR_DISAMBIGUATION(<<disambiguation>>)$COLOR_RESET}"
+AV_PERSON="${AV_PERSON:-"🧑‍🎤 $CARTIST<<name>>${OFF}"}"
+AV_GROUP="${AV_GROUP:-"🧑‍🤝‍🧑 $CARTIST<<name>>${OFF}"}"
+AV_DISAMBIGUATION="${AV_DISAMBIGUATION:-"$CDISAMB(<<disambiguation>>)${OFF}"}"

 # Release group view
-FORMAT_RELEASE="${FORMAT_RELEASE:-"${COLOR_RELEASE_TITLE}<<title>>$COLOR_RESET"}"
-FORMAT_RELEASE_W_ARTIST="${FORMAT_RELEASE_W_ARTIST:-"${COLOR_RELEASE_TITLE}<<title>>$COLOR_RESET — ${COLOR_ARTIST}<<artist>>$COLOR_RESET"}"
-FORMAT_YEAR="${FORMAT_YEAR:-"${COLOR_RELEASE_YEAR}(<<year>>)${COLOR_RESET}"}"
+RGV_RELEASE="${RGV_RELEASE:-"${CTITLE}<<title>>$OFF"}"
+RGV_RELEASE_W_ARTIST="${RGV_RELEASE_W_ARTIST:-"${CTITLE}<<title>>$OFF — ${CARTIST}<<artist>>$OFF"}"
+RGV_YEAR="${RGV_YEAR:-"${CYEAR}(<<year>>)${OFF}"}"
+
+# Types
 FORMAT_TYPE_ALBUM="${FORMAT_TYPE_ALBUM:-"LP 💽"}"
 FORMAT_TYPE_EP="${FORMAT_TYPE_EP:-"EP 📀"}"
 FORMAT_TYPE_SINGLE="${FORMAT_TYPE_SINGLE:-"SI 🎶"}"
 FORMAT_TYPE_BROADCAST="${FORMAT_TYPE_BROADCAST:-"BR 📻"}"
 FORMAT_TYPE_OTHER="${FORMAT_TYPE_OTHER:-"OT ❔"}"
 FORMAT_TYPE_HAS_SECONDARY="${FORMAT_TYPE_HAS_SECONDARY:-"%s☼"}"
-FORMAT_TYPE_SECONDARY="${FORMAT_TYPE_SECONDARY:-"${COLOR_TYPE_SECONDARY}[☼: %s]$COLOR_RESET"}"
+FORMAT_TYPE_SECONDARY="${FORMAT_TYPE_SECONDARY:-"${CNOTE}[☼: %s]$OFF"}"
 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"}"
@@ -40,27 +46,25 @@ FORMAT_TYPE_SECONDARY_MIXTAPE="${FORMAT_TYPE_SECONDARY_MIXTAPE:-"📼 mixtape"}"
 FORMAT_TYPE_SECONDARY_DEMO="${FORMAT_TYPE_SECONDARY_DEMO:-"🧪 demo"}"
 FORMAT_TYPE_SECONDARY_FIELDREC="${FORMAT_TYPE_SECONDARY_FIELDREC:-"🌿 field recording"}"

-# Prompts
-SEARCH_PROMPT=${SEARCH_PROMPT:-"🔎 〉"}
-ARTIST_PROMPT="${ARTIST_PROMPT:-"🎤 ${COLOR_ARTIST}%s$COLOR_RESET 〉"}"
-FULL_PROMPT="${FULL_PROMPT:-"🎤 ${COLOR_ARTIST}%s$COLOR_RESET » ${COLOR_RELEASE_TITLE}%s$COLOR_RESET 〉"}"
-
 # Artist Preview
-FORMAT_DATE="${FORMAT_DATE:-"%s"}"
-FORMAT_PLACE="${FORMAT_PLACE:-"%s"}"
-FORMAT_DATEPLACE="${FORMAT_DATEPLACE:-"%s, %s"}"
-FORMAT_LIFESPAN_BORN="${FORMAT_LIFESPAN_BORN:-"🍼 Born: %s"}"
-FORMAT_LIFESPAN_DIED="${FORMAT_LIFESPAN_DIED:-"🕯️ Died: %s"}"
+APV_FORMAT="${APV_FORMAT:-"\n\n${CDESC}%s${OFF}\n\n${CLIFE}%s${OFF}"}"
+APV_DATE="${APV_DATE:-"%s"}"
+APV_PLACE="${APV_PLACE:-"%s"}"
+APV_DATEPLACE="${APV_DATEPLACE:-"$APV_DATE, $APV_PLACE"}"
+APV_BORN="${APV_BORN:-"🍼 Born: %s"}"
+APV_DIED="${APV_DIED:-"🕯️ Died: %s"}"
+
+# Status
+FORMAT_STATUS_OFFICIAL="${FORMAT_STATUS_OFFICIAL:-"🟢 official"}"
+FORMAT_STATUS_PROMO="${FORMAT_STATUS_PROMO:-"📣 promo"}"
+FORMAT_STATUS_BOOTLEG="${FORMAT_STATUS_BOOTLEG:-"💣 bootleg"}"
+FORMAT_STATUS_PSEUDO="${FORMAT_STATUS_PSEUDO:-"🌀 pseudo"}"
+FORMAT_STATUS_WITHDRAWN="${FORMAT_STATUS_WITHDRAWN:-"🔙 withdrawn"}"
+FORMAT_STATUS_EXPUNGED="${FORMAT_STATUS_EXPUNGED:-"🧹 expunged"}"
+FORMAT_STATUS_CANCELLED="${FORMAT_STATUS_CANCELLED:-"❌ cancelled"}"

 # Release view
-RELEASE_OFFICIAL="${RELEASE_OFFICIAL:-"🟢 official"}"
-RELEASE_PROMOTION="${RELEASE_PROMOTION:-"📣 promo"}"
-RELEASE_BOOTLEG="${RELEASE_BOOTLEG:-"💣 bootleg"}"
-RELEASE_PSEUDO="${RELEASE_PSEUDO:-"🌀 pseudo"}"
-RELEASE_WITHDRAWN="${RELEASE_WITHDRAWN:-"🔙 withdrawn"}"
-RELEASE_EXPUNGED="${RELEASE_EXPUNGED:-"🧹 expunged"}"
-RELEASE_CANCELLED="${RELEASE_CANCELLED:-"❌ cancelled"}"
-RELEASE_FORMAT="${COLOR_TYPE_SECONDARY}<<status>>$COLOR_RESET\t${COLOR_RELEASE_YEAR}<<year>>$COLOR_RESET\t${COLOR_NOTE}<<tracks>> tx / <<media>>$COLOR_RESET\t${COLOR_ARTIST}<<label>>$COLOR_RESET"
-RELEASE_TITLE_ARTIST="${FAINT}${COLOR_RELEASE_TITLE}<<title>>$COLOR_RESET — ${FAINT}${COLOR_ARTIST}<<artist>>$COLOR_RESET"
-RELEASE_TITLE="${FAINT}${COLOR_RELEASE_TITLE}<<title>>$COLOR_RESET"
-RELEASE_ARTIST="${FAINT}by ${COLOR_ARTIST}<<artist>>$COLOR_RESET"
+RV_FORMAT="<<status>>\t${CXXX}<<tracks>> tracks\t<<media>>${OFF}\t${CYEAR}<<year>>\t<<country>>${OFF}\t${CARTIST}<<label>>$OFF"
+RV_TITLE_ARTIST="${FAINT}${CTITLE}<<title>>$OFF — ${FAINT}${CARTIST}<<artist>>$OFF"
+RV_TITLE="${FAINT}${CTITLE}<<title>>$OFF"
+RV_ARTIST="${FAINT}by ${CARTIST}<<artist>>$OFF"