From 6731d47b49b5c268dc195d2dd349c33c6ce4a8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=84min=20Baumeler?= Date: Wed, 23 Jul 2025 23:20:16 +0200 Subject: [PATCH] rg: artist only if credit differs --- src/awk/releasegroups.awk | 6 +++--- src/main.sh | 3 +++ src/sh/theme.sh | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/awk/releasegroups.awk b/src/awk/releasegroups.awk index 0b7494a..e707f65 100644 --- a/src/awk/releasegroups.awk +++ b/src/awk/releasegroups.awk @@ -3,7 +3,6 @@ BEGIN { OFS="\t" } { line_type="" line_sectype="" - line_release=format_release line_year="" gsub("&", "\\\\&") id = $1 @@ -11,7 +10,8 @@ BEGIN { OFS="\t" } sectype = $3 year = substr($4, 1, 4) + 0 title = $5 - artist = $6 + artistcredit = $6 + line_release = artist==artistcredit ? format_release : format_release_w_artist switch (type) { case "Single": line_type=format_single; break case "Album": line_type=format_album; break @@ -45,7 +45,7 @@ BEGIN { OFS="\t" } line_sectype = sprintf(format_secondary, line_sectype) } sub("<>", title, line_release) - sub("<<artist>>", artist, line_release) + sub("<<artist>>", artistcredit, line_release) line_year = year ? format_year : "" sub("<<year>>", year, line_year) sort = year ? year : 0 diff --git a/src/main.sh b/src/main.sh index bb0131b..1f50e6a 100755 --- a/src/main.sh +++ b/src/main.sh @@ -85,6 +85,7 @@ if [ "${1:-}" = "--internal-list-releases-fresh" ]; then fi if [ "${1:-}" = "--internal-list-releases" ]; then + name=$(mb_artist "$2" | $JQ -r '.name') mb_artist_releasegroups "$2" | $JQ -r '."release-groups"[] | [ .id, @@ -96,7 +97,9 @@ if [ "${1:-}" = "--internal-list-releases" ]; then ] | join("\t")' | 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_album="$FORMAT_TYPE_ALBUM" \ -v format_single="$FORMAT_TYPE_SINGLE" \ diff --git a/src/sh/theme.sh b/src/sh/theme.sh index 0af717b..aa591db 100644 --- a/src/sh/theme.sh +++ b/src/sh/theme.sh @@ -8,7 +8,8 @@ COLOR_TYPE_SECONDARY="\033[38;5;242m" COLOR_RELEASE_TITLE="\033[38;5;229m" COLOR_RELEASE_ARTIST="\033[38;5;219m" COLOR_RELEASE_YEAR="\033[38;5;179m" -FORMAT_RELEASE="${FORMAT_RELEASE:-"${COLOR_RELEASE_TITLE}<<title>>$COLOR_RESET — ${COLOR_RELEASE_ARTIST}<<artist>>$COLOR_RESET"}" +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_RELEASE_ARTIST}<<artist>>$COLOR_RESET"}" FORMAT_YEAR="${FORMAT_YEAR:-"${COLOR_RELEASE_YEAR}(<<year>>)${COLOR_RESET}"}" FORMAT_TYPE_ALBUM="${FORMAT_TYPE_ALBUM:-"LP 💽"}" FORMAT_TYPE_EP="${FORMAT_TYPE_EP:-"EP 📀"}"