@@ -8,7 +8,6 @@ mbz_agent='getCover/0.1 (https://seb.lautre.net/git/seb/scripts)'

 test -e $0.conf && source $0.conf

-coverartarchive_api="https://coverartarchive.org/release"

 coverart=$(mktemp --dry-run /dev/shm/XXXXXXXX)

 sizes=(500 large small 250 1200)

@@ -47,11 +46,29 @@ covered () {

 }

 get_image () {

+    install_image () {

+        mv -f /dev/shm/$2 ${album#*:}/$cover_img.${2##*.} \

+        && OK \

+        || ERROR "échec en écriture"

+    }

+

     if curl -Ls $1 > /dev/shm/$2; then

         mime_type=$(file -bn --mime-type /dev/shm/$2)

         if [[ ${mime_type:-erreur} =~ ^image/ ]]; then

-            mv -f /dev/shm/$2 ${album#*:}/$cover_img.${2##*.} \

-            || ERROR "échec en écriture"

+            read -t 30 -p "${album%%:*} check ? "

+            rc=$?

+            if [[ "$rc$REPLY" =~ 0[OoYy] ]]; then

+                display /dev/shm/$2

+                read -p "on garde ? "

+                if [[ "$REPLY" =~ [OoYy] ]]; then

+                    install_image

+                else

+                    rm /dev/shm/$2

+                    WARNING "vignette rejetée"

+                fi

+            else

+                install_image

+            fi

         else

             WARNING "${album%%:*} type $mime_type"

         fi

@@ -60,31 +77,15 @@ get_image () {

     fi

 }

-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

-}

-

 get_from_mbz () {

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

+    curl -Ls https://coverartarchive.org/release${1:+-group}/${album%%:*} > $coverart

     if test $(file -bn --mime-type $coverart) = application/json; then

         unset img

         for size in ${sizes[@]}; do

             img=$(jq -r '.images | .[] | select(.front == true) | .thumbnails | ."'$size'"?' $coverart 2>/dev/null)

-            test -n "$img" && break

+            test "${img:-null}" != null && break

         done

-        if test -n "$img"; then

+        if test "${img:-null}" != null; then

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

         fi

     else

@@ -92,36 +93,14 @@ get_from_mbz () {

     fi

 }

-get_from_spotify () {

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

-        curl --request GET --silent \

-            --header "Authorization: Bearer $spotify_access_token" \

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

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

-                    .albums .items

-                    | .[]

-                    | select(.name | ascii_upcase == \$album)

-                    | select(.artists | .[].name | ascii_upcase == \$artist)

-                    | .images

-                    | .[]

-                    | select(.height == 300)

-                    | .url // empty" $coverart)

-            if test -n "$img"; then

-                get_image "$img" "${img##*/}.jpg"

-            else

-                WARNING "pas d'image trouvée sur spotify (artist: $artist; album: $album_name)"

-            fi

-        else

-            WARNING "aucun album trouvé sur spotify"

-        fi

-    else

-        ERROR "album: $album_name; artist: $artist"

-    fi

+mbz_api () {

+    curl \

+        --request ${3:-GET} \

+        --user-agent "$mbz_agent" \

+        --silent \

+        --location \

+        --url "http://musicbrainz.org/ws/2/$1/?fmt=json&query=$2"

+    sleep 2

 }

 if ! test -d $medias; then

@@ -141,12 +120,21 @@ for arg in $@; do

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

         from_CLI=1

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

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

+        from_CLI=1

+        albums[${#albums[@]}]=$(sql_request 'select mbz_album_id||":"||path

+                                             from media_file

+                                             where artist||"/"||album = "'$arg'"' \

+                                | sed -r 's|/[^/]+*$||' \

+                                | uniq \

+                                | tail -1)

     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

@@ -168,12 +156,37 @@ for album in ${albums[@]}; do

     if covered; then

         continue

     fi

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

+    echo "${album#*:}"

+

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

+        mbz_album_id=$(sql_request "select distinct mbz_album_id

+                                    from media_file

+                                    where path like '${album#*:}/%'")

+        album=${mbz_album_id}${album}

+    fi

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

         mbz_related=1

         if get_from_mbz; then

-            OK

             continue

+        else

+            mbz_api release reid:${album%%:*} > $coverart

+            rgid=$(jq --raw-output '.releases | .[] | ."release-group" .id // empty' $coverart)

+            album="${rgid:-null}:${album#*:}"

+            if get_from_mbz release-group; then

+                continue

+            fi

+

+            if test -n "$rgid"; then

+                mbz_api release-group rgid:$rgid > $coverart

+                mbz_album_ids=($(jq --raw-output '."release-groups" | .[].releases | .[].id // empty' $coverart))

+

+                for reid in ${mbz_album_ids[@]}; do

+                    album=$reid:${album#*:}

+                    if get_from_mbz; then

+                        continue 2

+                    fi

+                done

+            fi

         fi

     fi

@@ -182,11 +195,7 @@ for album in ${albums[@]}; do

                         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

+    mbz_api release "release:$_album_name%20AND%20artist:$_artist" > $coverart

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

             .releases

@@ -198,26 +207,12 @@ for album in ${albums[@]}; do

     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

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

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

 done

 rm -f $coverart