diff --git a/src/main.sh b/src/main.sh index 6a5cbc2..ef3680e 100755 --- a/src/main.sh +++ b/src/main.sh @@ -129,12 +129,12 @@ if [ "${1:-}" = "--internal-list-releases" ]; then fi if [ "${1:-}" = "--help" ]; then - $CAT <\` ] + cat < ] Options: - \`--help\`: Show this help and exit. - \`--show-artist\` \`\`: Show releaes of the artist given by the MusicBrainz ID \`\`. + --help: Show this help and exit. + --show-artist : Show releaes of the artist given by the MusicBrainz ID . EOF exit 0 fi diff --git a/src/sh/preview.sh b/src/sh/preview.sh index 304263b..fad5445 100644 --- a/src/sh/preview.sh +++ b/src/sh/preview.sh @@ -5,6 +5,7 @@ __preview_artist() { if [ ! "$desc" ]; then desc=$(mb_artist_discogs "$1" | $JQ -r '.profile' | sed 's/\[a=\([^]]*\)\]/\1/g') fi + [ "$desc" ] && desc="$(printf "$FORMAT_DESCRIPTION" "$desc")" if [ "$(mb_artist "$1" | $JQ -r '.type')" = "Person" ]; then # Show birth place and death place of person lsb=$(mb_artist "$1" | $JQ -r '."life-span".begin // ""' | head -c 4) @@ -32,5 +33,5 @@ __preview_artist() { [ "$begin" ] && begin="$(printf "$FORMAT_LIFESPAN_BORN" "$begin")" [ "$end" ] && end="$(printf "$FORMAT_LIFESPAN_DIED" "$end")" fi - printf "\n\n%s\n\n%s\n%s" "$desc" "$begin" "$end" | tr -d '\r' | fold -s -w "$((FZF_PREVIEW_COLUMNS - 4))" | awk '{print " "$0" "}' | $CAT + printf "\n\n%s\n\n%s\n%s" "$desc" "$begin" "$end" | 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 bc6b473..0a1e6be 100644 --- a/src/sh/theme.sh +++ b/src/sh/theme.sh @@ -41,8 +41,10 @@ ARTIST_PROMPT="${ARTIST_PROMPT:-"🎤 ${COLOR_ARTIST}%s$COLOR_RESET 〉"}" #TFMT="${TFMT:-"🎵 ${TRACK_COLOR}%s${OFF}"}" # Artist Preview +COLOR_DESCRIPTION="\033[38;5;189m" 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"}" +FORMAT_DESCRIPTION="${FORMAT_DESCRIPTION:-"${COLOR_DESCRIPTION}%s$COLOR_RESET"}" diff --git a/src/sh/tools.sh b/src/sh/tools.sh index a12052d..d9b3f5b 100644 --- a/src/sh/tools.sh +++ b/src/sh/tools.sh @@ -6,15 +6,6 @@ else fi export FZF -if command -v "bat" >/dev/null; then - CAT="bat" -elif command -v "batcat" >/dev/null; then - CAT="batcat" -fi -CAT=${CAT:+$CAT --color=always -pp --language=md} -CAT=${CAT:-cat} -export CAT - if command -v "curl" >/dev/null; then CURL="curl --silent" else