Working radio

Author: devgianlu

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

@@ -17,7 +17,9 @@ public final class TrackId implements SpotifyId {
     private final String hexId;
 
     private TrackId(@NotNull String hex) {
-        this.hexId = hex;
+        if (hex.length() == 32) this.hexId = hex;
+        else if (hex.length() == 34 && hex.startsWith("00")) this.hexId = hex.substring(2);
+        else throw new IllegalArgumentException("Illegal track id: " + hex);
     }
 
     @NotNull

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

@@ -218,9 +218,9 @@ public void finishedLoading(@NotNull TrackHandler handler, boolean play) {
     }
 
     @Override
-    public void loadingError(@NotNull TrackHandler handler, @NotNull Exception ex) {
+    public void loadingError(@NotNull TrackHandler handler, @NotNull TrackId id, @NotNull Exception ex) {
         if (handler == trackHandler) {
-            LOGGER.fatal("Failed loading track!", ex);
+            LOGGER.fatal(String.format("Failed loading track, gid: %s", Utils.bytesToHex(id.getGid())), ex);
             state.setStatus(Spirc.PlayStatus.kPlayStatusStop);
             stateUpdated();
         } else if (handler == preloadTrackHandler) {

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

@@ -71,6 +71,7 @@ private void getNextPage() throws IOException {
         for (JsonElement elm : tracks) {
             JsonObject track = elm.getAsJsonObject();
             state.addTrack(Spirc.TrackRef.newBuilder()
+                    .setUri(track.get("uri").getAsString())
                     .setGid(ByteString.copyFrom(TrackId.fromUri(track.get("uri").getAsString()).getGid()))
                     .build());
         }

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

@@ -42,7 +42,7 @@ private void load(@NotNull TrackId id, boolean play, int pos) throws IOException
         StreamFeeder.LoadedStream stream = feeder.load(id, new StreamFeeder.VorbisOnlyAudioQuality(conf.preferredQuality()));
         track = stream.track;
 
-        LOGGER.info(String.format("Loading track, name: '%s', artists: '%s'", track.getName(), Utils.toString(track.getArtistList())));
+        LOGGER.info(String.format("Loaded track, name: '%s', artists: '%s', gid: %s", track.getName(), Utils.toString(track.getArtistList()), Utils.bytesToHex(id.getGid())));
 
         try {
             if (playerRunner != null) playerRunner.stop();
@@ -57,7 +57,7 @@ private void load(@NotNull TrackId id, boolean play, int pos) throws IOException
             if (play) playerRunner.play();
         } catch (PlayerRunner.PlayerException ex) {
             LOGGER.fatal("Failed starting playback!", ex);
-            listener.loadingError(this, ex);
+            listener.loadingError(this, id, ex);
         }
     }
 
@@ -128,7 +128,7 @@ public enum Command {
     public interface Listener {
         void finishedLoading(@NotNull TrackHandler handler, boolean play);
 
-        void loadingError(@NotNull TrackHandler handler, @NotNull Exception ex);
+        void loadingError(@NotNull TrackHandler handler, @NotNull TrackId track, @NotNull Exception ex);
 
         void endOfTrack(@NotNull TrackHandler handler);
 
@@ -145,10 +145,12 @@ public void run() {
                     CommandBundle cmd = commands.take();
                     switch (cmd.cmd) {
                         case Load:
+                            TrackId id = (TrackId) cmd.args[0];
+
                             try {
-                                load((TrackId) cmd.args[0], (Boolean) cmd.args[1], (Integer) cmd.args[2]);
+                                load(id, (Boolean) cmd.args[1], (Integer) cmd.args[2]);
                             } catch (IOException | MercuryClient.MercuryException ex) {
-                                listener.loadingError(TrackHandler.this, ex);
+                                listener.loadingError(TrackHandler.this, id, ex);
                             }
                             break;
                         case Play: