removed batcat dependency
This commit is contained in:
@@ -129,12 +129,12 @@ if [ "${1:-}" = "--internal-list-releases" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${1:-}" = "--help" ]; then
|
if [ "${1:-}" = "--help" ]; then
|
||||||
$CAT <<EOF
|
cat <<EOF
|
||||||
Usage: \`$0\` [ \`--help\` | \`--show-artist\` \`<mbid>\` ]
|
Usage: $0 [ --help | --show-artist <mbid> ]
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
\`--help\`: Show this help and exit.
|
--help: Show this help and exit.
|
||||||
\`--show-artist\` \`<mbid>\`: Show releaes of the artist given by the MusicBrainz ID \`<mbid>\`.
|
--show-artist <mbid>: Show releaes of the artist given by the MusicBrainz ID <mbid>.
|
||||||
EOF
|
EOF
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
@@ -5,6 +5,7 @@ __preview_artist() {
|
|||||||
if [ ! "$desc" ]; then
|
if [ ! "$desc" ]; then
|
||||||
desc=$(mb_artist_discogs "$1" | $JQ -r '.profile' | sed 's/\[a=\([^]]*\)\]/\1/g')
|
desc=$(mb_artist_discogs "$1" | $JQ -r '.profile' | sed 's/\[a=\([^]]*\)\]/\1/g')
|
||||||
fi
|
fi
|
||||||
|
[ "$desc" ] && desc="$(printf "$FORMAT_DESCRIPTION" "$desc")"
|
||||||
if [ "$(mb_artist "$1" | $JQ -r '.type')" = "Person" ]; then
|
if [ "$(mb_artist "$1" | $JQ -r '.type')" = "Person" ]; then
|
||||||
# Show birth place and death place of person
|
# Show birth place and death place of person
|
||||||
lsb=$(mb_artist "$1" | $JQ -r '."life-span".begin // ""' | head -c 4)
|
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")"
|
[ "$begin" ] && begin="$(printf "$FORMAT_LIFESPAN_BORN" "$begin")"
|
||||||
[ "$end" ] && end="$(printf "$FORMAT_LIFESPAN_DIED" "$end")"
|
[ "$end" ] && end="$(printf "$FORMAT_LIFESPAN_DIED" "$end")"
|
||||||
fi
|
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
|
||||||
}
|
}
|
||||||
|
@@ -41,8 +41,10 @@ ARTIST_PROMPT="${ARTIST_PROMPT:-"🎤 ${COLOR_ARTIST}%s$COLOR_RESET 〉"}"
|
|||||||
#TFMT="${TFMT:-"🎵 ${TRACK_COLOR}%s${OFF}"}"
|
#TFMT="${TFMT:-"🎵 ${TRACK_COLOR}%s${OFF}"}"
|
||||||
|
|
||||||
# Artist Preview
|
# Artist Preview
|
||||||
|
COLOR_DESCRIPTION="\033[38;5;189m"
|
||||||
FORMAT_DATE="${FORMAT_DATE:-"%s"}"
|
FORMAT_DATE="${FORMAT_DATE:-"%s"}"
|
||||||
FORMAT_PLACE="${FORMAT_PLACE:-"📍 %s"}"
|
FORMAT_PLACE="${FORMAT_PLACE:-"📍 %s"}"
|
||||||
FORMAT_DATEPLACE="${FORMAT_DATEPLACE:-"%s, 📍 %s"}"
|
FORMAT_DATEPLACE="${FORMAT_DATEPLACE:-"%s, 📍 %s"}"
|
||||||
FORMAT_LIFESPAN_BORN="${FORMAT_LIFESPAN_BORN:-"🍼 Born: %s"}"
|
FORMAT_LIFESPAN_BORN="${FORMAT_LIFESPAN_BORN:-"🍼 Born: %s"}"
|
||||||
FORMAT_LIFESPAN_DIED="${FORMAT_LIFESPAN_DIED:-"🕯️ Died: %s"}"
|
FORMAT_LIFESPAN_DIED="${FORMAT_LIFESPAN_DIED:-"🕯️ Died: %s"}"
|
||||||
|
FORMAT_DESCRIPTION="${FORMAT_DESCRIPTION:-"${COLOR_DESCRIPTION}%s$COLOR_RESET"}"
|
||||||
|
@@ -6,15 +6,6 @@ else
|
|||||||
fi
|
fi
|
||||||
export FZF
|
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
|
if command -v "curl" >/dev/null; then
|
||||||
CURL="curl --silent"
|
CURL="curl --silent"
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user