Compare commits
2 Commits
f3c58ca859
...
744dca7c1d
Author | SHA1 | Date | |
---|---|---|---|
744dca7c1d | |||
c2c85260bf |
@@ -11,6 +11,7 @@ BEGIN { OFS="\t" }
|
|||||||
sectype = $3
|
sectype = $3
|
||||||
year = substr($4, 1, 4) + 0
|
year = substr($4, 1, 4) + 0
|
||||||
title = $5
|
title = $5
|
||||||
|
artist = $6
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case "Single": line_type=format_single; break
|
case "Single": line_type=format_single; break
|
||||||
case "Album": line_type=format_album; break
|
case "Album": line_type=format_album; break
|
||||||
@@ -44,6 +45,7 @@ BEGIN { OFS="\t" }
|
|||||||
line_sectype = sprintf(format_secondary, line_sectype)
|
line_sectype = sprintf(format_secondary, line_sectype)
|
||||||
}
|
}
|
||||||
sub("<<title>>", title, line_release)
|
sub("<<title>>", title, line_release)
|
||||||
|
sub("<<artist>>", artist, line_release)
|
||||||
line_year = year ? format_year : ""
|
line_year = year ? format_year : ""
|
||||||
sub("<<year>>", year, line_year)
|
sub("<<year>>", year, line_year)
|
||||||
sort = year ? year : 0
|
sort = year ? year : 0
|
||||||
|
@@ -54,6 +54,7 @@ if [ "${1:-}" = "--internal-search" ]; then
|
|||||||
# Save current pid
|
# Save current pid
|
||||||
echo "$$" >"$PIDFILE"
|
echo "$$" >"$PIDFILE"
|
||||||
touch "$LOCKFILE"
|
touch "$LOCKFILE"
|
||||||
|
sleep 1
|
||||||
__api_mb_search_artists "$2" |
|
__api_mb_search_artists "$2" |
|
||||||
$JQ -r '.artists[] | [
|
$JQ -r '.artists[] | [
|
||||||
.id,
|
.id,
|
||||||
@@ -90,7 +91,8 @@ if [ "${1:-}" = "--internal-list-releases" ]; then
|
|||||||
."primary-type",
|
."primary-type",
|
||||||
(."secondary-types"|join(";")),
|
(."secondary-types"|join(";")),
|
||||||
."first-release-date",
|
."first-release-date",
|
||||||
.title
|
.title,
|
||||||
|
(."artist-credit" | map(([.name, .joinphrase]|join(""))) | join(""))
|
||||||
] | join("\t")' |
|
] | join("\t")' |
|
||||||
awk \
|
awk \
|
||||||
-F "\t" \
|
-F "\t" \
|
||||||
|
@@ -17,6 +17,7 @@ __api_mb_browse_release_groups() {
|
|||||||
$CURL \
|
$CURL \
|
||||||
--get \
|
--get \
|
||||||
--data fmt=json \
|
--data fmt=json \
|
||||||
|
--data inc=artist-credits \
|
||||||
--data limit="$MB_BROWSE_STEPS" \
|
--data limit="$MB_BROWSE_STEPS" \
|
||||||
--data offset="${2:-0}" \
|
--data offset="${2:-0}" \
|
||||||
--data-urlencode artist="$1" \
|
--data-urlencode artist="$1" \
|
||||||
|
@@ -40,7 +40,7 @@ mb_artist_wikidata() {
|
|||||||
map(select(.type=="wikidata")) |
|
map(select(.type=="wikidata")) |
|
||||||
.[0].url.resource' |
|
.[0].url.resource' |
|
||||||
awk -F "/" '{print $NF}')
|
awk -F "/" '{print $NF}')
|
||||||
[ ! "$wikidataid" ] || [ "$wikidataid" != "null" ] || return
|
[ ! "$wikidataid" ] && return || [ "$wikidataid" = "null" ] && return
|
||||||
__api_wikidata_get_sitelinks "$wikidataid" | cache_put_artist_wikidata "$1"
|
__api_wikidata_get_sitelinks "$wikidataid" | cache_put_artist_wikidata "$1"
|
||||||
cache_get_artist_wikidata "$1"
|
cache_get_artist_wikidata "$1"
|
||||||
fi
|
fi
|
||||||
|
@@ -4,11 +4,11 @@ COLOR_RESET="\033[m"
|
|||||||
FORMAT_PERSON="${FORMAT_PERSON:-👤 $COLOR_ARTIST<<name>>$COLOR_RESET}"
|
FORMAT_PERSON="${FORMAT_PERSON:-👤 $COLOR_ARTIST<<name>>$COLOR_RESET}"
|
||||||
FORMAT_GROUP="${FORMAT_GROUP:-👥 $COLOR_ARTIST<<name>>$COLOR_RESET}"
|
FORMAT_GROUP="${FORMAT_GROUP:-👥 $COLOR_ARTIST<<name>>$COLOR_RESET}"
|
||||||
FORMAT_DISAMBIGUATION="${FORMAT_DISAMBIGUATION:-$COLOR_DISAMBIGUATION(<<disambiguation>>)$COLOR_RESET}"
|
FORMAT_DISAMBIGUATION="${FORMAT_DISAMBIGUATION:-$COLOR_DISAMBIGUATION(<<disambiguation>>)$COLOR_RESET}"
|
||||||
COLOR_TYPE="\033[38;5;177m"
|
|
||||||
COLOR_TYPE_SECONDARY="\033[38;5;242m"
|
COLOR_TYPE_SECONDARY="\033[38;5;242m"
|
||||||
COLOR_RELEASE_TITLE="\033[38;5;229m"
|
COLOR_RELEASE_TITLE="\033[38;5;229m"
|
||||||
|
COLOR_RELEASE_ARTIST="\033[38;5;219m"
|
||||||
COLOR_RELEASE_YEAR="\033[38;5;179m"
|
COLOR_RELEASE_YEAR="\033[38;5;179m"
|
||||||
FORMAT_RELEASE="${FORMAT_RELEASE:-"${COLOR_RELEASE_TITLE}<<title>>$COLOR_RESET"}"
|
FORMAT_RELEASE="${FORMAT_RELEASE:-"${COLOR_RELEASE_TITLE}<<title>>$COLOR_RESET — ${COLOR_RELEASE_ARTIST}<<artist>>$COLOR_RESET"}"
|
||||||
FORMAT_YEAR="${FORMAT_YEAR:-"${COLOR_RELEASE_YEAR}(<<year>>)${COLOR_RESET}"}"
|
FORMAT_YEAR="${FORMAT_YEAR:-"${COLOR_RELEASE_YEAR}(<<year>>)${COLOR_RESET}"}"
|
||||||
FORMAT_TYPE_ALBUM="${FORMAT_TYPE_ALBUM:-"LP 💽"}"
|
FORMAT_TYPE_ALBUM="${FORMAT_TYPE_ALBUM:-"LP 💽"}"
|
||||||
FORMAT_TYPE_EP="${FORMAT_TYPE_EP:-"EP 📀"}"
|
FORMAT_TYPE_EP="${FORMAT_TYPE_EP:-"EP 📀"}"
|
||||||
|
Reference in New Issue
Block a user