Additional logging to debug #277

Author: devgianlu

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

@@ -222,6 +222,8 @@ private void panicState(@Nullable PlaybackMetrics.Reason reason) {
      * @param play      Whether the playback should start immediately
      */
     private void loadSession(@NotNull String sessionId, boolean play, boolean withSkip) {
+        LOGGER.debug("Loading session, id: {}, play: {}", sessionId, play);
+
         TransitionInfo trans = TransitionInfo.contextChange(state, withSkip);
 
         if (playerSession != null) {
@@ -248,6 +250,7 @@ private void loadSession(@NotNull String sessionId, boolean play, boolean withSk
     private void loadTrack(boolean play, @NotNull TransitionInfo trans) {
         endMetrics(playerSession.currentPlaybackId(), trans.endedReason, playerSession.currentMetrics(), trans.endedWhen);
 
+        LOGGER.debug("Loading track, id: {}, session: {}, playback: {}, play: {}", state.getCurrentPlayable(), playerSession.sessionId(), playerSession.currentPlaybackId(), play);
         String playbackId = playerSession.play(state.getCurrentPlayableOrThrow(), state.getPosition(), trans.startedReason);
         state.setPlaybackId(playbackId);
         session.eventService().sendEvent(new NewPlaybackIdEvent(state.getSessionId(), playbackId));

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

@@ -346,7 +346,7 @@ private synchronized void enrichWithMetadata(@NotNull Metadata.Track track) {
         if (track.hasPopularity()) builder.putMetadata("popularity", String.valueOf(track.getPopularity()));
         if (track.hasExplicit()) builder.putMetadata("is_explicit", String.valueOf(track.getExplicit()));
         if (track.hasHasLyrics()) builder.putMetadata("has_lyrics", String.valueOf(track.getHasLyrics()));
-        if (track.hasName()) builder.putMetadata("title", String.valueOf(track.getName()));
+        if (track.hasName()) builder.putMetadata("title", track.getName());
         if (track.hasDiscNumber()) builder.putMetadata("album_disc_number", String.valueOf(track.getDiscNumber()));
 
         for (int i = 0; i < track.getArtistCount(); i++) {
@@ -405,7 +405,7 @@ private synchronized void enrichWithMetadata(@NotNull Metadata.Episode episode)
 
         ProvidedTrack.Builder builder = state.getTrackBuilder();
         if (episode.hasExplicit()) builder.putMetadata("is_explicit", String.valueOf(episode.getExplicit()));
-        if (episode.hasName()) builder.putMetadata("title", String.valueOf(episode.getName()));
+        if (episode.hasName()) builder.putMetadata("title", episode.getName());
 
         if (episode.hasShow()) {
             Metadata.Show show = episode.getShow();
@@ -1055,6 +1055,7 @@ synchronized void initializeFrom(@NotNull TrackFinder finder, @Nullable ContextT
                     List<ContextTrack> newTracks = pages.currentPage();
                     int index = finder.find(newTracks);
                     if (index == -1) {
+                        LOGGER.trace("Did not find track, going to next page, finder: {}", finder);
                         tracks.addAll(newTracks);
                         continue;
                     }
@@ -1063,6 +1064,7 @@ synchronized void initializeFrom(@NotNull TrackFinder finder, @Nullable ContextT
                     tracks.addAll(newTracks);
 
                     setCurrentTrackIndex(index);
+                    LOGGER.trace("Initialized current track index to {}, finder: {}", index, finder);
                     break;
                 } else {
                     cannotLoadMore = true;

player/src/main/java/xyz/gianlu/librespot/player/playback/PlayerSession.java

@@ -335,6 +335,11 @@ public String currentPlaybackId() {
         else return queue.head().playbackId;
     }
 
+    @NotNull
+    public String sessionId() {
+        return sessionId;
+    }
+
     /**
      * Close the session by clearing the queue which will close all entries.
      */