removed batcat dependency

This commit is contained in:
2025-07-25 09:05:32 +02:00
parent 7b83b55f69
commit 5bc17bccc9
4 changed files with 8 additions and 14 deletions

View File

@@ -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
}

View File

@@ -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"}"

View File

@@ -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