Fixed issue with image not being sent via metadata pipe (#182)

Author: devgianlu

core/src/main/java/xyz/gianlu/librespot/mercury/model/ImageId.java

@@ -3,6 +3,7 @@
 import com.spotify.connectstate.Player;
 import com.spotify.metadata.Metadata;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.gianlu.librespot.common.Utils;
 
 import java.util.regex.Matcher;
@@ -32,6 +33,17 @@ public static ImageId fromHex(@NotNull String hex) {
         return new ImageId(hex);
     }
 
+    @Nullable
+    public static ImageId biggestImage(@NotNull Metadata.ImageGroup group) {
+        Metadata.Image biggest = null;
+        for (Metadata.Image image : group.getImageList()) {
+            if (biggest == null || biggest.getSize().getNumber() < image.getSize().getNumber())
+                biggest = image;
+        }
+
+        return biggest == null ? null : fromHex(Utils.bytesToHex(biggest.getFileId()));
+    }
+
     public static void putAsMetadata(@NotNull Player.ProvidedTrack.Builder builder, @NotNull Metadata.ImageGroup group) {
         for (Metadata.Image image : group.getImageList()) {
             String key;
@@ -52,7 +64,7 @@ public static void putAsMetadata(@NotNull Player.ProvidedTrack.Builder builder,
                     continue;
             }
 
-            builder.putMetadata(key, ImageId.fromHex(Utils.bytesToHex(image.getFileId())).toSpotifyUri());
+            builder.putMetadata(key, fromHex(Utils.bytesToHex(image.getFileId())).toSpotifyUri());
         }
     }
 

core/src/main/java/xyz/gianlu/librespot/player/Player.java

@@ -9,6 +9,7 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
@@ -789,21 +790,37 @@ private class EventsDispatcher {
             }
         }
 
-        private void sendImage() {
-            PlayableId id = state.getCurrentPlayable();
-            if (id == null) return;
+        @Contract("null, null -> fail")
+        private void sendImage(@Nullable Metadata.Track track, @Nullable Metadata.Episode episode) {
+            Metadata.ImageGroup group = null;
+            if (track != null) {
+                if (track.hasAlbum() && track.getAlbum().hasCoverGroup())
+                    group = track.getAlbum().getCoverGroup();
+            } else if (episode != null) {
+                if (episode.hasCoverImage())
+                    group = episode.getCoverImage();
+            } else {
+                throw new IllegalStateException();
+            }
 
-            Map<String, String> metadata = state.metadataFor(id);
             ImageId image = null;
-            for (String key : ImageId.IMAGE_SIZES_URLS) {
-                if (metadata.containsKey(key)) {
-                    image = ImageId.fromUri(metadata.get(key));
-                    break;
+            if (group == null) {
+                PlayableId id = state.getCurrentPlayable();
+                if (id == null) return;
+
+                Map<String, String> metadata = state.metadataFor(id);
+                for (String key : ImageId.IMAGE_SIZES_URLS) {
+                    if (metadata.containsKey(key)) {
+                        image = ImageId.fromUri(metadata.get(key));
+                        break;
+                    }
                 }
+            } else {
+                image = ImageId.biggestImage(group);
             }
 
             if (image == null) {
-                LOGGER.warn("No image found in metadata: " + id);
+                LOGGER.warn("No image found in metadata.");
                 return;
             }
 
@@ -814,9 +831,9 @@ private void sendImage() {
                 if (resp.code() == 200 && (body = resp.body()) != null)
                     metadataPipe.safeSend(MetadataPipe.TYPE_SSNC, MetadataPipe.CODE_PICT, body.bytes());
                 else
-                    LOGGER.warn(String.format("Failed download image. {id: %s, code: %d}", image.hexId(), resp.code()));
+                    LOGGER.warn(String.format("Failed downloading image. {id: %s, code: %d}", image.hexId(), resp.code()));
             } catch (IOException ex) {
-                LOGGER.warn("Failed download image.", ex);
+                LOGGER.warn("Failed downloading image.", ex);
             }
         }
 
@@ -922,7 +939,7 @@ void metadataAvailable() {
                 metadataPipe.safeSend(MetadataPipe.TYPE_CORE, MetadataPipe.CODE_ASAR, artist);
 
                 sendProgress();
-                sendImage();
+                sendImage(track, episode);
             }
         }