@@ -16,11 +16,6 @@ OK      () { echo -e "\e[3;32m ${1:-OK} \e[0;m";     return 0; }

 WARNING () { echo -e "\e[3;33m ${1:-alerte} \e[0;m"; return 1; }

 ERROR   () { echo -e "\e[3;31m ${1:-erreur} \e[0;m"; return 1; }

-if ! test -d $medias; then

-    ERROR "$medias n'est pas un répertoire"

-    exit 1

-fi

-

 sql_request () {

     sqlite3 $DB <<< "$1"

 }

@@ -65,47 +60,21 @@ get_image () {

     fi

 }

-if test -n "$spotifyID" -a -n "$spotifySecret"; then

-    spotify_access_token=$(curl --silent \

-        --request POST \

-        --url https://accounts.spotify.com/api/token \

-        --header 'Content-Type: application/x-www-form-urlencoded' \

-        --header "Authorization: Basic $(base64 -w0 <<< $spotifyID:$spotifySecret | sed 's/K$/=/')" \

-        -d 'grant_type=client_credentials' | jq -r '.access_token // empty')

-    if test -z "$spotify_access_token"; then

-        ERROR "problème d'identifant Spotify"

-        echo ID: $spotifyID

-        exit 1

-    fi

-fi

-

-if declare -f pre_get_cover > /dev/null; then

-    pre_get_cover

-fi

-

-IFS=$'\n'

-for arg in $@; do

-    if [[ $arg =~ ^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}:/ ]]; then

-        from_CLI=1

-        albums[${#albums[@]}]="${arg%/}"

-    elif [[ $arg =~ ^/ ]]; then

-        from_CLI=1

-        albums[${#albums[@]}]=":${arg%/}"

-    elif [[ $arg =~ ^(force|retry)$ ]]; then

-        forcing_level=$arg

-    else

-        WARNING "incohérence sur $arg"

+get_spotify_access_token () {

+    if test -n "$spotifyID" -a -n "$spotifySecret"; then

+        spotify_access_token=$(curl --silent \

+            --request POST \

+            --url https://accounts.spotify.com/api/token \

+            --header 'Content-Type: application/x-www-form-urlencoded' \

+            --header "Authorization: Basic $(base64 -w0 <<< $spotifyID:$spotifySecret | sed 's/K$/=/')" \

+            -d 'grant_type=client_credentials' | jq -r '.access_token // empty')

+        if test -z "$spotify_access_token"; then

+            ERROR "problème d'identifant Spotify"

+            spotify_access_token_error=1

+            echo ID: $spotifyID

+        fi

     fi

-done

-if test -n "$from_CLI"; then

-    forcing_level=force

-fi

-

-if test ${#albums[@]} -eq 0; then

-    albums=($(sql_request 'select printf("%s:'${medias%/}'/%s/%s", mbz_album_id, artist, name)

-             from album where cover_art_path = ""

-             and name != "[Unknown Album]"'))

-fi

+}

 get_from_mbz () {

     curl -Ls $coverartarchive_api/${album%%:*} > $coverart

@@ -119,19 +88,18 @@ get_from_mbz () {

             get_image "$img" "${album%%:*}.${img##*.}"

         fi

     else

-        WARNING "${album%%:*} réponse inattendue de musicbrainz"

+        return 1

     fi

 }

 get_from_spotify () {

-    eval "$(sql_request 'select printf("artist=""%s"";album_name=""%s""", artist, name)

-                        from album

-                        where artist || "/" || name = "'${album#*:$medias/}'"')"

     if test -n "$album_name" -a -n "$artist"; then

         curl --request GET --silent \

             --header "Authorization: Bearer $spotify_access_token" \

             --header 'Content-Type: application/json' \

-            --url "https://api.spotify.com/v1/search?type=album&query=album:${album_name// /%20}${artist:+%20artist:${artist// /%20}}" > $coverart

+            --data 'type=album' \

+            --data "query==album:${_album_name}%20artist:${_artist}" \

+            --url "https://api.spotify.com/v1/search" > $coverart

         found_albums=$(jq -r '.albums .total // empty' $coverart)

         if test ${found_albums:-0} -gt 0; then

             img=$(jq --raw-output --arg artist "${artist^^}" --arg album "${album_name^^}" "

@@ -156,32 +124,99 @@ get_from_spotify () {

     fi

 }

+if ! test -d $medias; then

+    ERROR "$medias n'est pas un répertoire"

+    exit 1

+fi

+

+if declare -f pre_get_cover > /dev/null; then

+    pre_get_cover

+fi

+

+IFS=$'\n'

+for arg in $@; do

+    if [[ $arg =~ ^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}:/ ]]; then

+        from_CLI=1

+        albums[${#albums[@]}]="${arg%/}"

+    elif [[ $arg =~ ^/ ]]; then

+        from_CLI=1

+        albums[${#albums[@]}]=":${arg%/}"

+    elif [[ $arg =~ ^(force|retry)$ ]]; then

+        forcing_level=$arg

+    else

+        WARNING "incohérence sur $arg"

+    fi

+done

+if test -n "$from_CLI"; then

+    forcing_level=force

+fi

+

+if test ${#albums[@]} -eq 0; then

+    albums=($(sql_request 'select printf("%s:'${medias%/}'/%s/%s", mbz_album_id, artist, name)

+             from album where cover_art_path = ""

+             and name != "[Unknown Album]"'))

+fi

+

 for album in ${albums[@]}; do

+    mbz_related=0

     if ! test -d "${album#*:}"; then

         if test -n "$from_CLI"; then

             WARNING "${album#*:}: chemin inconnu"

         fi

         continue

     fi

-    if ! covered; then

-        echo -n "${album#*:} "

-        if test -n "${album%%:*}"; then

-            if get_from_mbz; then

-                OK

-            elif test -n "$spotify_access_token"; then

-                if get_from_spotify; then

-                    OK

-                else

-                    touch "${album#*:}/$no_cover_flag"

-                fi

-            fi

-        elif test -n "$spotify_access_token"; then

-            if get_from_spotify; then

-                OK

-            else

-                touch "${album#*:}/$no_cover_flag"

-            fi

+    if covered; then

+        continue

+    fi

+    echo -n "${album#*:} "

+    if test -n "${album%%:*}"; then

+        mbz_related=1

+        if get_from_mbz; then

+            OK

+            continue

+        fi

+    fi

+

+    eval "$(sql_request 'select printf("artist=""%s"";album_name=""%s""", artist, name)

+                        from album

+                        where artist || "/" || name = "'${album#*:$medias/}'"')"

+    eval $(php -r 'echo "_artist=".rawurlencode($argv[1]).";_album_name=".rawurlencode($argv[2]);' -- "$artist" "$album_name")

+

+    curl \

+        --request GET \

+        --user-agent "$mbz_agent" \

+        --silent --location \

+        --url "http://musicbrainz.org/ws/2/release/?fmt=json&query=release:$_album_name%20AND%20artist:$_artist" > $coverart

+

+    mbids=($(jq --raw-output --arg artist "${artist^^}" --arg album "${album_name^^}" '

+            .releases

+            | .[]

+            | select(.title | ascii_upcase == $album)

+            | select(."artist-credit" | .[].name | ascii_upcase == $artist)

+            | .id // empty' $coverart))

+

+    for mbid in ${mbids[@]}; do

+        album="$mbid:${album#*:}"

+        if get_from_mbz; then

+            OK

+            continue 2

         fi

+    done

+

+    if test -z "$spotify_access_token" -a -z "$spotify_access_token_error"; then

+        get_spotify_access_token

+    fi

+

+    if test -n "$spotify_access_token"; then

+        if get_from_spotify; then

+            OK

+        else

+            WARNING "pas trouvé (spotify)"

+            touch "${album#*:}/$no_cover_flag"

+        fi

+    else

+        WARNING "pas trouvé ($(( ${mbz_related:-0} + ${#mbids[@]} )) relations sur musicbrainz)"

+        touch "${album#*:}/$no_cover_flag"

     fi

 done