Merge branch 'master' into dev

Author: devgianlu

CHANGELOG.md

@@ -34,6 +34,18 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Fixed starting playback from API (#254)
 
 
+## [1.5.2] - 17-11-2020
+### Added
+- Added `Player#waitReady()` method (d3149d3843e066986524e14369c5871c22629810)
+- Added pass through endpoints for official Spotify API (#255)
+- Store and check hash of first chunk of cache data (9ab9f43a91ebbce0e9a3a3c6f3c55a714c756525)
+
+### Fixed
+- Fixed `UnsupportedOperationException` when starting playback (#251)
+- Close cache files correctly (e953129ed5f0dc4e9931660bd216267557d6010a, #253)
+- Fixed starting playback from API (#254)
+
+
 ## [1.5.1] - 31-07-2020
 ### Fixed
 - Fixed issue with Zeroconf (#246)

lib/src/main/java/xyz/gianlu/librespot/common/ProtoUtils.java

@@ -292,14 +292,19 @@ public static void enrichTrack(@NotNull Player.ProvidedTrack.Builder subject, @N
     }
 
     @Nullable
-    @Contract("null -> null")
-    public static Player.ProvidedTrack toProvidedTrack(@Nullable ContextTrack track) {
+    @Contract("null, _ -> null")
+    public static Player.ProvidedTrack toProvidedTrack(@Nullable ContextTrack track, String contextUri) {
         if (track == null) return null;
 
         Player.ProvidedTrack.Builder builder = Player.ProvidedTrack.newBuilder();
         builder.setProvider("context");
-        if (track.hasUri() && !track.getUri().isEmpty()) builder.setUri(track.getUri());
         if (track.hasUid()) builder.setUid(track.getUid());
+        if (track.hasUri() && !track.getUri().isEmpty()) {
+            builder.setUri(track.getUri());
+        } else if (track.hasGid()) {
+            String uriPrefix = PlayableId.inferUriPrefix(contextUri);
+            builder.setUri(uriPrefix + new String(PlayableId.BASE62.encode(track.getGid().toByteArray(), 22)));
+        }
 
         try {
             builder.setAlbumUri(track.getMetadataOrThrow("album_uri"));

lib/src/main/java/xyz/gianlu/librespot/mercury/MercuryClient.java

@@ -347,8 +347,11 @@ void dispatch(@NotNull Response resp) {
     }
 
     public static class MercuryException extends Exception {
+        public final int code;
+
         private MercuryException(@NotNull Response response) {
             super(String.format("status: %d", response.statusCode));
+            this.code = response.statusCode;
         }
     }
 

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

@@ -54,10 +54,10 @@ public class Player implements Closeable, DeviceStateHandler.Listener, PlayerSes
     private final PlayerConfiguration conf;
     private final EventsDispatcher events;
     private final AudioSink sink;
+    private final Map<String, PlaybackMetrics> metrics = new HashMap<>(5);
     private StateWrapper state;
     private PlayerSession playerSession;
     private ScheduledFuture<?> releaseLineFuture = null;
-    private Map<String, PlaybackMetrics> metrics = new HashMap<>(5);
 
     public Player(@NotNull PlayerConfiguration conf, @NotNull Session session) {
         this.conf = conf;
@@ -207,7 +207,7 @@ private void panicState(@Nullable PlaybackMetrics.Reason reason) {
         state.updated();
 
         if (reason == null) {
-            metrics = null;
+            metrics.clear();
         } else if (playerSession != null) {
             endMetrics(playerSession.currentPlaybackId(), reason, playerSession.currentMetrics(), state.getPosition());
         }
@@ -501,14 +501,6 @@ private void loadAutoplay() {
             return;
         }
 
-        if (context.startsWith("spotify:search:")) {
-            LOGGER.info("Cannot load autoplay for search context: " + context);
-
-            state.setPosition(0);
-            state.setState(true, false, false);
-            state.updated();
-            return;
-        }
 
         String contextDesc = state.getContextMetadata("context_description");
 
@@ -540,8 +532,16 @@ private void loadAutoplay() {
                 state.updated();
             }
         } catch (IOException | MercuryClient.MercuryException ex) {
-            LOGGER.fatal("Failed loading autoplay station!", ex);
-            panicState(null);
+            if (ex instanceof MercuryClient.MercuryException && ((MercuryClient.MercuryException) ex).code == 400) {
+                LOGGER.info("Cannot load autoplay for search context: " + context);
+
+                state.setPosition(0);
+                state.setState(true, true, false);
+                state.updated();
+            } else {
+                LOGGER.fatal("Failed loading autoplay station!", ex);
+                panicState(null);
+            }
         } catch (AbsSpotifyContext.UnsupportedContextException ex) {
             LOGGER.fatal("Cannot play local tracks!", ex);
             panicState(null);

player/src/main/java/xyz/gianlu/librespot/player/StateWrapper.java

@@ -930,14 +930,14 @@ private void updatePrevNextTracks() {
 
             state.clearPrevTracks();
             for (int i = Math.max(0, index - MAX_PREV_TRACKS); i < index; i++)
-                state.addPrevTracks(ProtoUtils.toProvidedTrack(tracks.get(i)));
+                state.addPrevTracks(ProtoUtils.toProvidedTrack(tracks.get(i), getContextUri()));
 
             state.clearNextTracks();
             for (ContextTrack track : queue)
-                state.addNextTracks(ProtoUtils.toProvidedTrack(track));
+                state.addNextTracks(ProtoUtils.toProvidedTrack(track, getContextUri()));
 
             for (int i = index + 1; i < Math.min(tracks.size(), index + 1 + MAX_NEXT_TRACKS); i++)
-                state.addNextTracks(ProtoUtils.toProvidedTrack(tracks.get(i)));
+                state.addNextTracks(ProtoUtils.toProvidedTrack(tracks.get(i), getContextUri()));
         }
 
         void updateTrackDuration(int duration) {
@@ -976,8 +976,8 @@ private void updateLikeDislike() {
          * <b>This will also REMOVE a track from the queue if needed. Calling this twice will break the queue.</b>
          */
         private void updateState() {
-            if (isPlayingQueue) state.setTrack(ProtoUtils.toProvidedTrack(queue.remove()));
-            else state.setTrack(ProtoUtils.toProvidedTrack(tracks.get(getCurrentTrackIndex())));
+            if (isPlayingQueue) state.setTrack(ProtoUtils.toProvidedTrack(queue.remove(), getContextUri()));
+            else state.setTrack(ProtoUtils.toProvidedTrack(tracks.get(getCurrentTrackIndex()), getContextUri()));
 
             updateLikeDislike();
 
@@ -1116,7 +1116,7 @@ private void enrichCurrentTrack(@NotNull ContextTrack track) {
                 ContextTrack.Builder current = tracks.get(index).toBuilder();
                 ProtoUtils.enrichTrack(current, track);
                 tracks.set(index, current.build());
-                state.setTrack(ProtoUtils.toProvidedTrack(current.build()));
+                state.setTrack(ProtoUtils.toProvidedTrack(current.build(), getContextUri()));
             }
         }