Skip to content

Commit

Permalink
add album name. artist artwork url & preview url to track & play prev…
Browse files Browse the repository at this point in the history 
…iew url

Co-authored-by: Michael Rittmeister <dr@schlau.bi>
  • Loading branch information
@topi314 @DRSchlaubi
topi314 and DRSchlaubi committed Jul 10, 2023
1 parent 922fa91 commit 3cf9a8c
Show file tree
Hide file tree
Showing 13 changed files with 375 additions and 153 deletions.
2 changes: 1 addition & 1 deletion main/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ java {
}

dependencies {
compileOnly "com.github.walkyst:lavaplayer-fork:17c75f5"
compileOnly "com.github.topi314:lavaplayer-fork:8ca9418be9"
implementation "org.jsoup:jsoup:1.14.3"
implementation "commons-io:commons-io:2.6"
compileOnly "org.slf4j:slf4j-api:1.7.25"
Expand Down
8 changes: 4 additions & 4 deletions main/src/main/java/com/github/topi314/lavasrc/ExtendedAudioPlaylist.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
import java.util.List;

public class ExtendedAudioPlaylist extends BasicAudioPlaylist {
private final String type;
private final String url;
private final String artworkURL;
private final String author;
protected final String type;
protected final String url;
protected final String artworkURL;
protected final String author;

public ExtendedAudioPlaylist(String name, List<AudioTrack> tracks, String type, String url, String artworkURL, String author) {
super(name, tracks, null, false);
Expand Down
52 changes: 52 additions & 0 deletions main/src/main/java/com/github/topi314/lavasrc/ExtendedAudioSourceManager.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.github.topi314.lavasrc;

import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;

import java.io.DataInput;
import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.IOException;

public abstract class ExtendedAudioSourceManager implements AudioSourceManager {

@Override
public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
var extendedTrack = (ExtendedAudioTrack) track;
DataFormatTools.writeNullableText(output, extendedTrack.getAlbumName());
DataFormatTools.writeNullableText(output, extendedTrack.getArtistArtworkUrl());
DataFormatTools.writeNullableText(output, extendedTrack.getPreviewUrl());
}

@Override
public boolean isTrackEncodable(AudioTrack track) {
return true;
}

protected ExtendedAudioTrackInfo decodeTrack(DataInput input) throws IOException {
String albumName = null;
String artistArtworkUrl = null;
String previewUrl = null;
// Check if the input has more than 8 bytes available, which would indicate that the preview field is present.
// This is done to avoid breaking backwards compatibility with tracks that were saved before the preview field was added.
if (((DataInputStream) input).available() > Long.BYTES) {
albumName = DataFormatTools.readNullableText(input);
artistArtworkUrl = DataFormatTools.readNullableText(input);
previewUrl = DataFormatTools.readNullableText(input);
}
return new ExtendedAudioTrackInfo(albumName, artistArtworkUrl, previewUrl);
}

protected static class ExtendedAudioTrackInfo {
public final String albumName;
public final String artistArtworkUrl;
public final String previewUrl;

public ExtendedAudioTrackInfo(String albumName, String artistArtworkUrl, String previewUrl) {
this.albumName = albumName;
this.artistArtworkUrl = artistArtworkUrl;
this.previewUrl = previewUrl;
}
}
}
31 changes: 31 additions & 0 deletions main/src/main/java/com/github/topi314/lavasrc/ExtendedAudioTrack.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.github.topi314.lavasrc;

import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;

public abstract class ExtendedAudioTrack extends DelegatedAudioTrack {

protected final String albumName;
protected final String artistArtworkUrl;
protected final String previewUrl;

public ExtendedAudioTrack(AudioTrackInfo trackInfo, String albumName, String artistArtworkUrl, String previewUrl) {
super(trackInfo);
this.albumName = albumName;
this.artistArtworkUrl = artistArtworkUrl;
this.previewUrl = previewUrl;
}

public String getAlbumName() {
return this.albumName;
}

public String getArtistArtworkUrl() {
return this.artistArtworkUrl;
}

public String getPreviewUrl() {
return this.previewUrl;
}

}
15 changes: 14 additions & 1 deletion main/src/main/java/com/github/topi314/lavasrc/applemusic/AppleMusicAudioTrack.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
package com.github.topi314.lavasrc.applemusic;

import com.github.topi314.lavasrc.mirror.MirroringAudioSourceManager;
import com.github.topi314.lavasrc.mirror.MirroringAudioTrack;
import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegAudioTrack;
import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;

public class AppleMusicAudioTrack extends MirroringAudioTrack {

public AppleMusicAudioTrack(AudioTrackInfo trackInfo, AppleMusicSourceManager sourceManager) {
super(trackInfo, sourceManager);
super(trackInfo, null, null, null, sourceManager);
}

public AppleMusicAudioTrack(AudioTrackInfo trackInfo, String albumName, String artistArtworkUrl, String previewUrl, MirroringAudioSourceManager sourceManager) {
super(trackInfo, albumName, artistArtworkUrl, previewUrl, sourceManager);
}

@Override
protected InternalAudioTrack createAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream stream) {
return new MpegAudioTrack(trackInfo, stream);
}

@Override
Expand Down
115 changes: 66 additions & 49 deletions main/src/main/java/com/github/topi314/lavasrc/applemusic/AppleMusicSourceManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,20 @@
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.*;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

public class AppleMusicSourceManager extends MirroringAudioSourceManager implements HttpConfigurable {
public class AppleMusicSourceManager extends MirroringAudioSourceManager {

public static final Pattern URL_PATTERN = Pattern.compile("(https?://)?(www\\.)?music\\.apple\\.com/(?<countrycode>[a-zA-Z]{2}/)?(?<type>album|playlist|artist|song)(/[a-zA-Z\\d\\-]+)?/(?<identifier>[a-zA-Z\\d\\-.]+)(\\?i=(?<identifier2>\\d+))?");
public static final Pattern TOKEN_SCRIPT_PATTERN = Pattern.compile("const \\w{2}=\"(?<token>(ey[\\w-]+)\\.([\\w-]+)\\.([\\w-]+))\"");
public static final String SEARCH_PREFIX = "amsearch:";
public static final String PREVIEW_PREFIX = "amprev:";
public static final int MAX_PAGE_ITEMS = 300;
public static final String API_BASE = "https://api.music.apple.com/v1/";
private static final Logger log = LoggerFactory.getLogger(AppleMusicSourceManager.class);
private final HttpInterfaceManager httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
private final String countryCode;
private int playlistPageLimit;
private int albumPageLimit;
Expand Down Expand Up @@ -94,12 +92,19 @@ public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {

@Override
public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {
var identifier = reference.identifier;
var preview = reference.identifier.startsWith(PREVIEW_PREFIX);

return loadItem(preview ? identifier.substring(PREVIEW_PREFIX.length()) : identifier, preview);
}

public AudioItem loadItem(String identifier, boolean preview) {
try {
if (reference.identifier.startsWith(SEARCH_PREFIX)) {
return this.getSearch(reference.identifier.substring(SEARCH_PREFIX.length()).trim());
if (identifier.startsWith(SEARCH_PREFIX)) {
return this.getSearch(identifier.substring(SEARCH_PREFIX.length()).trim(), preview);
}

var matcher = URL_PATTERN.matcher(reference.identifier);
var matcher = URL_PATTERN.matcher(identifier);
if (!matcher.find()) {
return null;
}
Expand All @@ -108,20 +113,20 @@ public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference)
var id = matcher.group("identifier");
switch (matcher.group("type")) {
case "song":
return this.getSong(id, countryCode);
return this.getSong(id, countryCode, preview);

case "album":
var id2 = matcher.group("identifier2");
if (id2 == null || id2.isEmpty()) {
return this.getAlbum(id, countryCode);
return this.getAlbum(id, countryCode, preview);
}
return this.getSong(id2, countryCode);
return this.getSong(id2, countryCode, preview);

case "playlist":
return this.getPlaylist(id, countryCode);
return this.getPlaylist(id, countryCode, preview);

case "artist":
return this.getArtist(id, countryCode);
return this.getArtist(id, countryCode, preview);
}
} catch (IOException e) {
throw new RuntimeException(e);
Expand Down Expand Up @@ -181,32 +186,47 @@ public JsonBrowser getJson(String uri) throws IOException {
return HttpClientTools.fetchResponseAsJson(this.httpInterfaceManager.getInterface(), request);
}

public AudioItem getSearch(String query) throws IOException {
var json = this.getJson(API_BASE + "catalog/" + countryCode + "/search?term=" + URLEncoder.encode(query, StandardCharsets.UTF_8) + "&limit=" + 25);
public Map<String, String> getArtistCover(List<String> ids) throws IOException {
var json = getJson(API_BASE + "catalog/" + countryCode + "/artists?ids=" + String.join(",", ids));
var data = json.get("data");

var output = new HashMap<String, String>(ids.size());
for (var i = 0; i < ids.size(); i++) {
var artist = data.index(i);
var artwork = artist.get("attributes").get("artwork");
output.put(artist.get("id").text(), parseArtworkUrl(artwork));
}

return output;
}

public AudioItem getSearch(String query, boolean preview) throws IOException {
var json = this.getJson(API_BASE + "catalog/" + countryCode + "/search?term=" + URLEncoder.encode(query, StandardCharsets.UTF_8) + "&limit=" + 25 + "&extend=artistUrl");
if (json == null || json.get("results").get("songs").get("data").values().isEmpty()) {
return AudioReference.NO_TRACK;
}
return new BasicAudioPlaylist("Apple Music Search: " + query, this.parseTracks(json.get("results").get("songs")), null, true);
return new BasicAudioPlaylist("Apple Music Search: " + query, this.parseTracks(json.get("results").get("songs"), preview), null, true);
}

public AudioItem getAlbum(String id, String countryCode) throws IOException {
var json = this.getJson(API_BASE + "catalog/" + countryCode + "/albums/" + id);
public AudioItem getAlbum(String id, String countryCode, boolean preview) throws IOException {
var json = this.getJson(API_BASE + "catalog/" + countryCode + "/albums/" + id + "&extend=artistUrl");
if (json == null) {
return AudioReference.NO_TRACK;
}

var tracks = new ArrayList<AudioTrack>();
var tracksRaw = JsonBrowser.newList();
JsonBrowser page;
var offset = 0;
var pages = 0;
do {
page = this.getJson(API_BASE + "catalog/" + countryCode + "/albums/" + id + "/tracks?limit=" + MAX_PAGE_ITEMS + "&offset=" + offset);
offset += MAX_PAGE_ITEMS;

tracks.addAll(this.parseTracks(page));
page.values().forEach(tracksRaw::add);
}
while (page.get("next").text() != null && ++pages < albumPageLimit);

var tracks = parseTracks(tracksRaw, preview);
if (tracks.isEmpty()) {
return AudioReference.NO_TRACK;
}
Expand All @@ -216,24 +236,25 @@ public AudioItem getAlbum(String id, String countryCode) throws IOException {
return new AppleMusicAudioPlaylist(json.get("data").index(0).get("attributes").get("name").text(), tracks, "album", json.get("data").index(0).get("attributes").get("url").text(), artworkUrl, author);
}

public AudioItem getPlaylist(String id, String countryCode) throws IOException {
var json = this.getJson(API_BASE + "catalog/" + countryCode + "/playlists/" + id);
public AudioItem getPlaylist(String id, String countryCode, boolean preview) throws IOException {
var json = this.getJson(API_BASE + "catalog/" + countryCode + "/playlists/" + id + "&extend=artistUrl");
if (json == null) {
return AudioReference.NO_TRACK;
}

var tracks = new ArrayList<AudioTrack>();
var tracksRaw = JsonBrowser.newList();
JsonBrowser page;
var offset = 0;
var pages = 0;
do {
page = this.getJson(API_BASE + "catalog/" + countryCode + "/playlists/" + id + "/tracks?limit=" + MAX_PAGE_ITEMS + "&offset=" + offset);
offset += MAX_PAGE_ITEMS;

tracks.addAll(parseTracks(page));
page.values().forEach(tracksRaw::add);
}
while (page.get("next").text() != null && ++pages < playlistPageLimit);

var tracks = parseTracks(tracksRaw, preview);
if (tracks.isEmpty()) {
return AudioReference.NO_TRACK;
}
Expand All @@ -243,7 +264,7 @@ public AudioItem getPlaylist(String id, String countryCode) throws IOException {
return new AppleMusicAudioPlaylist(json.get("data").index(0).get("attributes").get("name").text(), tracks, "playlist", json.get("data").index(0).get("attributes").get("url").text(), artworkUrl, author);
}

public AudioItem getArtist(String id, String countryCode) throws IOException {
public AudioItem getArtist(String id, String countryCode, boolean preview) 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;
Expand All @@ -253,26 +274,33 @@ public AudioItem getArtist(String id, String countryCode) throws IOException {

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", json.get("data").index(0).get("attributes").get("url").text(), artworkUrl, author);
var artistArtwork = Map.of(jsonArtist.get("id").text(), artworkUrl);
return new AppleMusicAudioPlaylist(author + "'s Top Tracks", parseTracks(json, preview, artistArtwork), "artist", json.get("data").index(0).get("attributes").get("url").text(), artworkUrl, author);
}

public AudioItem getSong(String id, String countryCode) throws IOException {
public AudioItem getSong(String id, String countryCode, boolean preview) throws IOException {
var json = this.getJson(API_BASE + "catalog/" + countryCode + "/songs/" + id);
if (json == null) {
return AudioReference.NO_TRACK;
}
return parseTrack(json.get("data").index(0));
var artistArtwork = getArtistCover(List.of(parseArtistId(json))).values().iterator().next();
return parseTrack(json.get("data").index(0), preview, artistArtwork);
}

private List<AudioTrack> parseTracks(JsonBrowser json) {
private List<AudioTrack> parseTracks(JsonBrowser json, boolean preview, Map<String, String> artistArtwork) {
var tracks = new ArrayList<AudioTrack>();
for (var value : json.get("data").values()) {
tracks.add(this.parseTrack(value));
tracks.add(this.parseTrack(value, preview, artistArtwork.get(parseArtistId(value))));
}
return tracks;
}

private AudioTrack parseTrack(JsonBrowser json) {
private List<AudioTrack> parseTracks(JsonBrowser json, boolean preview) throws IOException {
var ids = json.get("data").values().stream().map(this::parseArtistId).collect(Collectors.toList());
return parseTracks(json, preview, getArtistCover(ids));
}

private AudioTrack parseTrack(JsonBrowser json, boolean preview, String artistArtwork) {
var attributes = json.get("attributes");
return new AppleMusicAudioTrack(
new AudioTrackInfo(
Expand All @@ -285,6 +313,9 @@ private AudioTrack parseTrack(JsonBrowser json) {
this.parseArtworkUrl(attributes.get("artwork")),
attributes.get("isrc").text()
),
attributes.get("albumName").text(),
artistArtwork,
preview ? attributes.get("previews").index(0).get("hlsUrl").text() : null,
this
);
}
Expand All @@ -293,23 +324,9 @@ 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 {
this.httpInterfaceManager.close();
} catch (IOException e) {
log.error("Failed to close HTTP interface manager", e);
}
}

@Override
public void configureRequests(Function<RequestConfig, RequestConfig> configurator) {
this.httpInterfaceManager.configureRequests(configurator);
}

@Override
public void configureBuilder(Consumer<HttpClientBuilder> configurator) {
this.httpInterfaceManager.configureBuilder(configurator);
private String parseArtistId(JsonBrowser json) {
var url = json.get("data").index(0).get("attributes").get("artistUrl").text();
return url.substring(url.lastIndexOf('/'));
}

}
Loading

0 comments on commit 3cf9a8c

Please sign in to comment.