Skip to content

New feature to allow multiple artists in spotify #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M3rcena wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New feature to allow multiple artists in spotify #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 42 additions & 5 deletions main/src/main/java/com/github/topi314/lavasrc/spotify/SpotifySourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,13 +313,23 @@ private AudioSearchResult getAutocomplete(String query, Set<AudioSearchResult.Ty

var albums = new ArrayList<AudioPlaylist>();
for (var album : json.get("albums").get("items").values()) {
var albumArtists = album.get("artists").values();
var albumAuthor = albumArtists.stream()
.map(artist -> artist.get("name").safeText())
.filter(name -> name != null && !name.isEmpty())
.collect(Collectors.joining(", "));

if (albumAuthor.isEmpty()) {
albumAuthor = "Unknown";
}

albums.add(new SpotifyAudioPlaylist(
album.get("name").safeText(),
Collections.emptyList(),
ExtendedAudioPlaylist.Type.ALBUM,
album.get("external_urls").get("spotify").text(),
album.get("images").index(0).get("url").text(),
album.get("artists").index(0).get("name").text(),
albumAuthor,
(int) album.get("total_tracks").asLong(0)
));
}
Expand Down Expand Up @@ -457,7 +467,17 @@ public AudioItem getAlbum(String id, boolean preview) throws IOException {
return AudioReference.NO_TRACK;
}

return new SpotifyAudioPlaylist(json.get("name").safeText(), tracks, ExtendedAudioPlaylist.Type.ALBUM, json.get("external_urls").get("spotify").text(), json.get("images").index(0).get("url").text(), json.get("artists").index(0).get("name").text(), (int) json.get("total_tracks").asLong(0));
var albumArtists = json.get("artists").values();
var albumAuthor = albumArtists.stream()
.map(artist -> artist.get("name").safeText())
.filter(name -> name != null && !name.isEmpty())
.collect(Collectors.joining(", "));

if (albumAuthor.isEmpty()) {
albumAuthor = "Unknown";
}

return new SpotifyAudioPlaylist(json.get("name").safeText(), tracks, ExtendedAudioPlaylist.Type.ALBUM, json.get("external_urls").get("spotify").text(), json.get("images").index(0).get("url").text(), albumAuthor, (int) json.get("total_tracks").asLong(0));

}

Expand Down Expand Up @@ -545,10 +565,27 @@ private List<AudioTrack> parseTrackItems(JsonBrowser json, boolean preview) {
}

private AudioTrack parseTrack(JsonBrowser json, boolean preview) {
var artists = json.get("artists").values();
var author = artists.stream()
.map(artist -> artist.get("name").safeText())
.filter(name -> name != null && !name.isEmpty())
.collect(Collectors.joining(", "));

if (author.isEmpty()) {
author = "Unknown";
}

var firstArtist = artists.isEmpty() ? null : artists.get(0);
var artistUrl = firstArtist != null && !firstArtist.get("external_urls").isNull() ? firstArtist.get("external_urls").get("spotify").text() : null;
String artistArtworkUrl = null;
if (firstArtist != null && !firstArtist.get("images").isNull() && !firstArtist.get("images").values().isEmpty()) {
artistArtworkUrl = firstArtist.get("images").index(0).get("url").text();
}

return new SpotifyAudioTrack(
new AudioTrackInfo(
json.get("name").safeText(),
json.get("artists").index(0).get("name").safeText().isEmpty() ? "Unknown" : json.get("artists").index(0).get("name").safeText(),
author,
preview ? PREVIEW_LENGTH : json.get("duration_ms").asLong(0),
json.get("id").text() != null ? json.get("id").text() : "local",
false,
Expand All @@ -558,8 +595,8 @@ private AudioTrack parseTrack(JsonBrowser json, boolean preview) {
),
json.get("album").get("name").text(),
json.get("album").get("external_urls").get("spotify").text(),
json.get("artists").index(0).get("external_urls").get("spotify").text(),
json.get("artists").index(0).get("images").index(0).get("url").text(),
artistUrl,
artistArtworkUrl,
json.get("preview_url").text(),
preview,
this
Expand Down