Fixed issue where gid where 17 (not 16) bytes long (closes #72)

Author: devgianlu

common/src/main/java/xyz/gianlu/librespot/common/Utils.java

@@ -202,22 +202,37 @@ public static String bytesToHex(@NotNull ByteString bytes) {
 
     @NotNull
     public static String bytesToHex(byte[] bytes) {
-        if (bytes == null) return "";
-        return bytesToHex(bytes, 0, bytes.length);
+        return bytesToHex(bytes, 0, bytes.length, false);
+    }
+
+    @NotNull
+    public static String bytesToHex(byte[] bytes, boolean trim) {
+        return bytesToHex(bytes, 0, bytes.length, trim);
     }
 
     @NotNull
-    public static String bytesToHex(byte[] bytes, int offset, int length) {
+    public static String bytesToHex(byte[] bytes, int offset, int length, boolean trim) {
         if (bytes == null) return "";
 
+        int newOffset = 0;
+        boolean trimming = trim;
         char[] hexChars = new char[length * 2];
         for (int j = offset; j < length; j++) {
             int v = bytes[j] & 0xFF;
+            if (trimming) {
+                if (v == 0) {
+                    newOffset = j  + 1;
+                    continue;
+                } else {
+                    trimming = false;
+                }
+            }
+
             hexChars[j * 2] = hexArray[v >>> 4];
             hexChars[j * 2 + 1] = hexArray[v & 0x0F];
         }
 
-        return new String(hexChars);
+        return new String(hexChars, newOffset * 2, hexChars.length - newOffset * 2);
     }
 
     @Contract("_, _, !null -> !null")

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

@@ -24,15 +24,15 @@ public static AlbumId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new AlbumId(Utils.bytesToHex(BASE62.decode(id.getBytes())));
+            return new AlbumId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
         } else {
             throw new IllegalArgumentException("Not a Spotify album ID: " + uri);
         }
     }
 
     @NotNull
     public static AlbumId fromBase62(@NotNull String base62) {
-        return new AlbumId(Utils.bytesToHex(BASE62.decode(base62.getBytes())));
+        return new AlbumId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
     }
 
     @NotNull

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

@@ -24,15 +24,15 @@ public static ArtistId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new ArtistId(Utils.bytesToHex(BASE62.decode(id.getBytes())));
+            return new ArtistId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
         } else {
             throw new IllegalArgumentException("Not a Spotify artist ID: " + uri);
         }
     }
 
     @NotNull
     public static ArtistId fromBase62(@NotNull String base62) {
-        return new ArtistId(Utils.bytesToHex(BASE62.decode(base62.getBytes())));
+        return new ArtistId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
     }
 
     @NotNull

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

@@ -25,7 +25,7 @@ public static EpisodeId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new EpisodeId(Utils.bytesToHex(BASE62.decode(id.getBytes())));
+            return new EpisodeId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
         } else {
             throw new IllegalArgumentException("Not a Spotify episode ID: " + uri);
         }
@@ -44,7 +44,7 @@ public static EpisodeId fromTrackRef(@NotNull Spirc.TrackRef ref) {
 
     @NotNull
     public static EpisodeId fromBase62(@NotNull String base62) {
-        return new EpisodeId(Utils.bytesToHex(BASE62.decode(base62.getBytes())));
+        return new EpisodeId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
     }
 
     @NotNull

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

@@ -24,15 +24,15 @@ public static ShowId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new ShowId(Utils.bytesToHex(BASE62.decode(id.getBytes())));
+            return new ShowId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
         } else {
             throw new IllegalArgumentException("Not a Spotify show ID: " + uri);
         }
     }
 
     @NotNull
     public static ShowId fromBase62(@NotNull String base62) {
-        return new ShowId(Utils.bytesToHex(BASE62.decode(base62.getBytes())));
+        return new ShowId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
     }
 
     @NotNull

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

@@ -17,25 +17,23 @@ public final class TrackId implements SpotifyId, PlayableId {
     private final String hexId;
 
     private TrackId(@NotNull String hex) {
-        if (hex.length() == 32) this.hexId = hex.toLowerCase();
-        else if (hex.length() == 34 && hex.startsWith("00")) this.hexId = hex.substring(2).toLowerCase();
-        else throw new IllegalArgumentException("Illegal track id: " + hex);
+        this.hexId = hex.toLowerCase();
     }
 
     @NotNull
     public static TrackId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new TrackId(Utils.bytesToHex(BASE62.decode(id.getBytes())));
+            return new TrackId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
         } else {
             throw new IllegalArgumentException("Not a Spotify track ID: " + uri);
         }
     }
 
     @NotNull
     public static TrackId fromBase62(@NotNull String base62) {
-        return new TrackId(Utils.bytesToHex(BASE62.decode(base62.getBytes())));
+        return new TrackId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
     }
 
     @NotNull