Feature: delegate track in json

main/build.gradle

@@ -5,9 +5,11 @@ plugins {
 archivesBaseName = "lavasrc"
 
 dependencies {
-    compileOnly "com.github.walkyst:lavaplayer-fork:1.3.98.4"
+    implementation 'org.jetbrains:annotations:24.0.0'
+    compileOnly "com.github.walkyst:lavaplayer-fork:ef075855da"
     implementation "org.jsoup:jsoup:1.14.3"
     implementation "commons-io:commons-io:2.6"
+    compileOnly "org.slf4j:slf4j-api:1.7.25"
 }
 
 publishing {

main/src/main/java/com/github/topisenpai/lavasrc/ExtendedAudioPlaylist.java

@@ -0,0 +1,38 @@
+package com.github.topisenpai.lavasrc;
+
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.BasicAudioPlaylist;
+
+import java.util.List;
+
+public class ExtendedAudioPlaylist extends BasicAudioPlaylist {
+	private final String type;
+	private final String identifier;
+	private final String artworkURL;
+	private final String author;
+
+	public ExtendedAudioPlaylist(String name, List<AudioTrack> tracks, String type, String identifier, String artworkURL, String author) {
+		super(name, tracks, null, false);
+		this.type = type;
+		this.identifier = identifier;
+		this.artworkURL = artworkURL;
+		this.author = author;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public String getIdentifier() {
+		return this.identifier;
+	}
+
+	public String getArtworkURL() {
+		return this.artworkURL;
+	}
+
+	public String getAuthor() {
+		return this.author;
+	}
+
+}

main/src/main/java/com/github/topisenpai/lavasrc/applemusic/AppleMusicAudioPlaylist.java

@@ -0,0 +1,14 @@
+package com.github.topisenpai.lavasrc.applemusic;
+
+import com.github.topisenpai.lavasrc.ExtendedAudioPlaylist;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+
+import java.util.List;
+
+public class AppleMusicAudioPlaylist extends ExtendedAudioPlaylist {
+
+	public AppleMusicAudioPlaylist(String name, List<AudioTrack> tracks, String type, String identifier, String artworkURL, String author) {
+		super(name, tracks, type, identifier, artworkURL, author);
+	}
+
+}

main/src/main/java/com/github/topisenpai/lavasrc/applemusic/AppleMusicAudioTrack.java

@@ -6,13 +6,13 @@
 
 public class AppleMusicAudioTrack extends MirroringAudioTrack {
 
-	public AppleMusicAudioTrack(AudioTrackInfo trackInfo, String isrc, String artworkURL, AppleMusicSourceManager sourceManager) {
-		super(trackInfo, isrc, artworkURL, sourceManager);
+	public AppleMusicAudioTrack(AudioTrackInfo trackInfo, AppleMusicSourceManager sourceManager) {
+		super(trackInfo, sourceManager);
 	}
 
 	@Override
 	protected AudioTrack makeShallowClone() {
-		return new AppleMusicAudioTrack(this.trackInfo, this.isrc, this.artworkURL, (AppleMusicSourceManager) this.sourceManager);
+		return new AppleMusicAudioTrack(this.trackInfo, (AppleMusicSourceManager) this.sourceManager);
 	}
 
 }

main/src/main/java/com/github/topisenpai/lavasrc/applemusic/AppleMusicSourceManager.java

@@ -4,7 +4,6 @@
 import com.github.topisenpai.lavasrc.mirror.MirroringAudioSourceManager;
 import com.github.topisenpai.lavasrc.mirror.MirroringAudioTrackResolver;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
@@ -23,6 +22,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -83,12 +83,17 @@ public String getSourceName() {
 	}
 
 	@Override
-	public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
-		return new AppleMusicAudioTrack(trackInfo,
-				DataFormatTools.readNullableText(input),
-				DataFormatTools.readNullableText(input),
-				this
-		);
+	public boolean isTrackEncodable(AudioTrack track) {
+		return true;
+	}
+
+	@Override
+	public void encodeTrack(AudioTrack track, DataOutput output) {
+	}
+
+	@Override
+	public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
+		return new AppleMusicAudioTrack(trackInfo, this);
 	}
 
 	@Override
@@ -210,7 +215,9 @@ public AudioItem getAlbum(String id, String countryCode) throws IOException {
 			return AudioReference.NO_TRACK;
 		}
 
-		return new BasicAudioPlaylist(json.get("data").index(0).get("attributes").get("name").text(), tracks, null, false);
+		var artworkUrl = this.parseArtworkUrl(json.get("data").index(0).get("attributes").get("artwork"));
+		var author = json.get("data").index(0).get("attributes").get("artistName").text();
+		return new AppleMusicAudioPlaylist(json.get("data").index(0).get("attributes").get("name").text(), tracks, "album", id, artworkUrl, author);
 	}
 
 	public AudioItem getPlaylist(String id, String countryCode) throws IOException {
@@ -235,15 +242,22 @@ public AudioItem getPlaylist(String id, String countryCode) throws IOException {
 			return AudioReference.NO_TRACK;
 		}
 
-		return new BasicAudioPlaylist(json.get("data").index(0).get("attributes").get("name").text(), tracks, null, false);
+		var artworkUrl = this.parseArtworkUrl(json.get("data").index(0).get("attributes").get("artwork"));
+		var author = json.get("data").index(0).get("attributes").get("curatorName").text();
+		return new AppleMusicAudioPlaylist(json.get("data").index(0).get("attributes").get("name").text(), tracks, "playlist", id, artworkUrl, author);
 	}
 
 	public AudioItem getArtist(String id, String countryCode) throws IOException {
 		var json = this.getJson(API_BASE + "catalog/" + countryCode + "/artists/" + id + "/view/top-songs");
 		if (json == null || json.get("data").values().isEmpty()) {
 			return AudioReference.NO_TRACK;
 		}
-		return new BasicAudioPlaylist(json.get("data").index(0).get("attributes").get("artistName").text() + "'s Top Tracks", parseTracks(json), null, false);
+
+		var jsonArtist = this.getJson(API_BASE + "catalog/" + countryCode + "/artists/" + id);
+
+		var artworkUrl = this.parseArtworkUrl(jsonArtist.get("data").index(0).get("attributes").get("artwork"));
+		var author = jsonArtist.get("data").index(0).get("attributes").get("name").text();
+		return new AppleMusicAudioPlaylist(author + "'s Top Tracks", parseTracks(json), "artist", id, artworkUrl, author);
 	}
 
 	public AudioItem getSong(String id, String countryCode) throws IOException {
@@ -264,22 +278,25 @@ private List<AudioTrack> parseTracks(JsonBrowser json) {
 
 	private AudioTrack parseTrack(JsonBrowser json) {
 		var attributes = json.get("attributes");
-		var artwork = attributes.get("artwork");
 		return new AppleMusicAudioTrack(
 				new AudioTrackInfo(
 						attributes.get("name").text(),
 						attributes.get("artistName").text(),
 						attributes.get("durationInMillis").asLong(0),
 						json.get("id").text(),
 						false,
-						attributes.get("url").text()
+						attributes.get("url").text(),
+						this.parseArtworkUrl(attributes.get("artwork")),
+						attributes.get("isrc").text()
 				),
-				attributes.get("isrc").text(),
-				artwork.get("url").text().replace("{w}", artwork.get("width").text()).replace("{h}", artwork.get("height").text()),
 				this
 		);
 	}
 
+	private String parseArtworkUrl(JsonBrowser json) {
+		return json.get("url").text().replace("{w}", json.get("width").text()).replace("{h}", json.get("height").text());
+	}
+
 	@Override
 	public void shutdown() {
 		try {

main/src/main/java/com/github/topisenpai/lavasrc/deezer/DeezerAudioPlaylist.java

@@ -0,0 +1,14 @@
+package com.github.topisenpai.lavasrc.deezer;
+
+import com.github.topisenpai.lavasrc.ExtendedAudioPlaylist;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+
+import java.util.List;
+
+public class DeezerAudioPlaylist extends ExtendedAudioPlaylist {
+
+	public DeezerAudioPlaylist(String name, List<AudioTrack> tracks, String type, String identifier, String artworkURL, String author) {
+		super(name, tracks, type, identifier, artworkURL, author);
+	}
+
+}

main/src/main/java/com/github/topisenpai/lavasrc/deezer/DeezerAudioSourceManager.java

@@ -2,7 +2,6 @@
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
@@ -130,15 +129,17 @@ private List<AudioTrack> parseTracks(JsonBrowser json) {
 
 	private AudioTrack parseTrack(JsonBrowser json) {
 		var id = json.get("id").text();
-		return new DeezerAudioTrack(new AudioTrackInfo(
-				json.get("title").text(),
-				json.get("artist").get("name").text(),
-				json.get("duration").as(Long.class) * 1000,
-				id,
-				false,
-				"https://deezer.com/track/" + id),
-				json.get("isrc").text(),
-				json.get("album").get("cover_xl").text(),
+		return new DeezerAudioTrack(
+				new AudioTrackInfo(
+						json.get("title").text(),
+						json.get("artist").get("name").text(),
+						json.get("duration").as(Long.class) * 1000,
+						id,
+						false,
+						"https://deezer.com/track/" + id,
+						json.get("album").get("cover_xl").text(),
+						json.get("isrc").text()
+				),
 				this
 		);
 	}
@@ -166,7 +167,10 @@ private AudioItem getAlbum(String id) throws IOException {
 		if (json == null || json.get("tracks").get("data").values().isEmpty()) {
 			return AudioReference.NO_TRACK;
 		}
-		return new BasicAudioPlaylist(json.get("title").text(), this.parseTracks(json.get("tracks")), null, false);
+
+		var artworkUrl = json.get("cover_xl").text();
+		var author = json.get("contributors").values().get(0).get("name").text();
+		return new DeezerAudioPlaylist(json.get("title").text(), this.parseTracks(json.get("tracks")), "album", id, artworkUrl, author);
 	}
 
 	private AudioItem getTrack(String id) throws IOException {
@@ -182,15 +186,21 @@ private AudioItem getPlaylist(String id) throws IOException {
 		if (json == null || json.get("tracks").get("data").values().isEmpty()) {
 			return AudioReference.NO_TRACK;
 		}
-		return new BasicAudioPlaylist(json.get("title").text(), this.parseTracks(json.get("tracks")), null, false);
+
+		var artworkUrl = json.get("picture_xl").text();
+		var author = json.get("creator").get("name").text();
+		return new DeezerAudioPlaylist(json.get("title").text(), this.parseTracks(json.get("tracks")), "playlist", id, artworkUrl, author);
 	}
 
 	private AudioItem getArtist(String id) throws IOException {
 		var json = this.getJson(PUBLIC_API_BASE + "/artist/" + id + "/top?limit=50");
 		if (json == null || json.get("data").values().isEmpty()) {
 			return AudioReference.NO_TRACK;
 		}
-		return new BasicAudioPlaylist(json.get("data").index(0).get("artist").get("name").text() + "'s Top Tracks", this.parseTracks(json), null, false);
+
+		var artworkUrl = json.get("data").index(0).get("contributors").get("picture_xl").text();
+		var author = json.get("data").index(0).get("contributors").get("name").text();
+		return new DeezerAudioPlaylist(author + "'s Top Tracks", this.parseTracks(json), "artist", id, artworkUrl, author);
 	}
 
 	@Override
@@ -199,19 +209,12 @@ public boolean isTrackEncodable(AudioTrack track) {
 	}
 
 	@Override
-	public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
-		var deezerAudioTrack = ((DeezerAudioTrack) track);
-		DataFormatTools.writeNullableText(output, deezerAudioTrack.getISRC());
-		DataFormatTools.writeNullableText(output, deezerAudioTrack.getArtworkURL());
+	public void encodeTrack(AudioTrack track, DataOutput output) {
 	}
 
 	@Override
-	public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
-		return new DeezerAudioTrack(trackInfo,
-				DataFormatTools.readNullableText(input),
-				DataFormatTools.readNullableText(input),
-				this
-		);
+	public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
+		return new DeezerAudioTrack(trackInfo, this);
 	}
 
 	@Override

main/src/main/java/com/github/topisenpai/lavasrc/deezer/DeezerAudioTrack.java

@@ -22,25 +22,13 @@
 
 public class DeezerAudioTrack extends DelegatedAudioTrack {
 
-	private final String isrc;
-	private final String artworkURL;
 	private final DeezerAudioSourceManager sourceManager;
 
-	public DeezerAudioTrack(AudioTrackInfo trackInfo, String isrc, String artworkURL, DeezerAudioSourceManager sourceManager) {
+	public DeezerAudioTrack(AudioTrackInfo trackInfo, DeezerAudioSourceManager sourceManager) {
 		super(trackInfo);
-		this.isrc = isrc;
-		this.artworkURL = artworkURL;
 		this.sourceManager = sourceManager;
 	}
 
-	public String getISRC() {
-		return this.isrc;
-	}
-
-	public String getArtworkURL() {
-		return this.artworkURL;
-	}
-
 	private URI getTrackMediaURI() throws IOException, URISyntaxException {
 		var getSessionID = new HttpPost(DeezerAudioSourceManager.PRIVATE_API_BASE + "?method=deezer.ping&input=3&api_version=1.0&api_token=");
 		var json = HttpClientTools.fetchResponseAsJson(this.sourceManager.getHttpInterface(), getSessionID);
@@ -101,7 +89,7 @@ public void process(LocalAudioTrackExecutor executor) throws Exception {
 
 	@Override
 	protected AudioTrack makeShallowClone() {
-		return new DeezerAudioTrack(this.trackInfo, this.isrc, this.artworkURL, this.sourceManager);
+		return new DeezerAudioTrack(this.trackInfo, this.sourceManager);
 	}
 
 	@Override

main/src/main/java/com/github/topisenpai/lavasrc/deezer/DeezerPersistentHttpStream.java

@@ -2,6 +2,7 @@
 
 import com.sedmelluq.discord.lavaplayer.tools.io.ByteBufferInputStream;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
+import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
 import org.apache.http.HttpResponse;
 
 import javax.crypto.BadPaddingException;