fix apple music album loading

topi314 · Dec 17, 2023 · f05b1fe · f05b1fe
1 parent 8913f5e
commit f05b1fe
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/main/src/main/java/com/github/topi314/lavasrc/applemusic/AppleMusicSourceManager.java b/main/src/main/java/com/github/topi314/lavasrc/applemusic/AppleMusicSourceManager.java
@@ -331,11 +331,11 @@ public AudioItem getAlbum(String id, String countryCode, boolean preview) throws
 			page = this.getJson(API_BASE + "catalog/" + countryCode + "/albums/" + id + "/tracks?limit=" + MAX_PAGE_ITEMS + "&offset=" + offset);
 			offset += MAX_PAGE_ITEMS;
 
-			page.values().forEach(tracksRaw::add);
+			page.get("data").values().forEach(tracksRaw::add);
 		}
 		while (page.get("next").text() != null && ++pages < albumPageLimit);
 
-		var tracks = parseTracks(tracksRaw, preview);
+		var tracks = parseTrackList(tracksRaw, preview);
 		if (tracks.isEmpty()) {
 			return AudioReference.NO_TRACK;
 		}
@@ -363,9 +363,7 @@ public AudioItem getPlaylist(String id, String countryCode, boolean preview) thr
 		}
 		while (page.get("next").text() != null && ++pages < playlistPageLimit);
 
-		var dataRaw = JsonBrowser.newMap();
-		dataRaw.put("data", tracksRaw);
-		var tracks = parseTracks(dataRaw, preview);
+		var tracks = parseTrackList(tracksRaw, preview);
 		if (tracks.isEmpty()) {
 			return AudioReference.NO_TRACK;
 		}
@@ -421,6 +419,12 @@ private List<AudioTrack> parseTracks(JsonBrowser json, boolean preview, Map<Stri
 		return tracks;
 	}
 
+	private List<AudioTrack> parseTrackList(JsonBrowser json, boolean preview) throws IOException {
+		var jsonData = JsonBrowser.newMap();
+		jsonData.put("data", json);
+		return parseTracks(jsonData, preview);
+	}
+
 	private List<AudioTrack> parseTracks(JsonBrowser json, boolean preview) throws IOException {
 		var ids = json.get("data").values().stream().map(this::parseArtistId).filter(Predicate.not(Objects::isNull)).collect(Collectors.toList());
 		return parseTracks(json, preview, getArtistCover(ids));