From a70d0cd5fe838778fce10d323c8fad1ee0c29372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=84min=20Baumeler?= Date: Thu, 24 Jul 2025 11:39:48 +0200 Subject: [PATCH] improved artist view --- src/main.sh | 3 ++- src/sh/preview.sh | 2 +- src/sh/theme.sh | 12 ++++++------ src/sh/tools.sh | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main.sh b/src/main.sh index 1f50e6a..161bc05 100755 --- a/src/main.sh +++ b/src/main.sh @@ -192,9 +192,10 @@ while true; do --info-command="echo \"Search music artist\"" \ --accept-nth="{1}" \ --with-nth="{2}" \ - --preview-window="wrap" \ + --preview-window="right,25%,border-left,wrap,<30(hidden)" \ --preview="$0 --internal-preview-artist {1}" \ --bind="ctrl-d:half-page-down,ctrl-u:half-page-up" \ + --bind="down:preview-half-page-down,up:preview-half-page-up" \ --bind="change:execute-silent($0 --internal-search \$FZF_QUERY &)+reload($0 --internal-reload)" ) [ "$sel" ] && set -- "--show-artist" "$sel" diff --git a/src/sh/preview.sh b/src/sh/preview.sh index 9fbec72..ab7406a 100644 --- a/src/sh/preview.sh +++ b/src/sh/preview.sh @@ -5,5 +5,5 @@ __preview_artist() { if [ ! "$desc" ]; then desc=$(mb_artist_discogs "$1" | $JQ -r '.profile' | sed 's/\[a=\([^]]*\)\]/\1/g') fi - echo "$desc" | fold -s -w "$FZF_PREVIEW_COLUMNS" | $CAT + printf "\n\n%s" "$desc" | tr -d '\r' | fold -s -w "$((FZF_PREVIEW_COLUMNS - 4))" | awk '{print " "$0" "}' | $CAT } diff --git a/src/sh/theme.sh b/src/sh/theme.sh index aa591db..aed195a 100644 --- a/src/sh/theme.sh +++ b/src/sh/theme.sh @@ -1,15 +1,15 @@ -COLOR_ARTIST="\033[38;5;227m" -COLOR_DISAMBIGUATION="\033[38;5;110m" +FAINT="\033[2m" +COLOR_ARTIST="\033[38;5;209m" +COLOR_DISAMBIGUATION="$FAINT\033[38;5;172m" COLOR_RESET="\033[m" -FORMAT_PERSON="${FORMAT_PERSON:-👤 $COLOR_ARTIST<>$COLOR_RESET}" -FORMAT_GROUP="${FORMAT_GROUP:-👥 $COLOR_ARTIST<>$COLOR_RESET}" +FORMAT_PERSON="${FORMAT_PERSON:-🧑‍🎤 $COLOR_ARTIST<>$COLOR_RESET}" +FORMAT_GROUP="${FORMAT_GROUP:-🧑‍🤝‍🧑 $COLOR_ARTIST<>$COLOR_RESET}" FORMAT_DISAMBIGUATION="${FORMAT_DISAMBIGUATION:-$COLOR_DISAMBIGUATION(<>)$COLOR_RESET}" 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}<>$COLOR_RESET"}" -FORMAT_RELEASE_W_ARTIST="${FORMAT_RELEASE_W_ARTIST:-"${COLOR_RELEASE_TITLE}<<title>>$COLOR_RESET — ${COLOR_RELEASE_ARTIST}<<artist>>$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}"}" FORMAT_TYPE_ALBUM="${FORMAT_TYPE_ALBUM:-"LP 💽"}" FORMAT_TYPE_EP="${FORMAT_TYPE_EP:-"EP 📀"}" diff --git a/src/sh/tools.sh b/src/sh/tools.sh index dc81c57..a12052d 100644 --- a/src/sh/tools.sh +++ b/src/sh/tools.sh @@ -11,7 +11,7 @@ if command -v "bat" >/dev/null; then elif command -v "batcat" >/dev/null; then CAT="batcat" fi -CAT=${CAT:+$CAT --color=always --style=plain --language=md} +CAT=${CAT:+$CAT --color=always -pp --language=md} CAT=${CAT:-cat} export CAT