LavaSrc fix Yandex Music playlist and artist's track limit #155

llimonix · 2023-12-30T12:14:57Z

I checked on different playlists that caused errors, it works correctly

…eManager.java

topi314 · 2024-01-01T11:09:54Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

+					List<String> trackIds = playlistTracks.subList(i, endIndex);
+					var trackIdsStr = String.join("%2C", trackIds);


please properly url encode this instead of simply joining with %2C
You can also do this using a stream

topi314 · 2024-01-01T11:10:43Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

+				playlistTracks.add(track.get("id").text());
+
+				}
+			if (playlistTracks.size() != 0) {


please use early returns, avoid if else if possible

if (playlistTracks.size() == 0) { return AudioReference.NO_TRACK; }

you can also already return by checking the length of json.get("result").get("tracks").values()

topi314 · 2024-01-01T11:11:59Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

+
+				}
+			if (playlistTracks.size() != 0) {
+				int chunkSize = 300;


make this a constant

topi314

the lavaplayer api does not support returning playlists, albums or artists in search results, so it makes no sense to return them here

that being said, LavaSearch does support this so please implement this for LavaSearch instead if you want this feature
You can checkout Deezer, Spotify, YT or Apple Music for an example implementation

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

llimonix · 2024-01-02T16:58:14Z

I rolled back the solutions with the search for more than just tracks. Since I did not understand how to implement it correctly in order to transmit it in the correct format.

My solution works and searches for the best match for a text query. But as I understand it, you need to get a track list from the best result, if it is a playlist/album/artist, and pass it to return new BasicAudioPlaylist("Yandex Music Search: " + query, tracks, null, true);

But, alas. It is not yet clear how to do this

topi314

for the extended search functionality via LavaSearch you have to implement the AudioSearchManager interface in the YandexMusicSourceManager.
You can check this here for deezer as an example https://github.com/topi314/LavaSrc/blob/master/main/src/main/java/com/github/topi314/lavasrc/deezer/DeezerAudioSourceManager.java#L83

topi314 · 2024-01-03T00:31:25Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

+			for (int i = 0; i < playlistTracks.size(); i += 300) {
+				int endIndex = Math.min(i + 300, playlistTracks.size());


this is still not a constant

topi314 · 2024-01-03T00:31:50Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

+				String trackIdsStr = trackIds.stream()
+				.collect(Collectors.joining(","));


Suggested change

String trackIdsStr = trackIds.stream()

.collect(Collectors.joining(","));

String trackIdsStr = trackIds.stream().collect(Collectors.joining(","));

topi314 · 2024-01-03T00:32:06Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

 		var playlistTitle = json.get("result").get("kind").text().equals("3") ? "Liked songs" : json.get("result").get("title").text();
 		var coverUri = json.get("result").get("cover").get("uri").text();
 		var author = json.get("result").get("owner").get("name").text();
 		return new YandexMusicAudioPlaylist(playlistTitle, tracks, ExtendedAudioPlaylist.Type.PLAYLIST, json.get("result").get("url").text(), this.formatCoverUri(coverUri), author);
 	}
-
+	


Suggested change

topi314 · 2024-01-03T00:33:23Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

@@ -123,15 +123,15 @@ private AudioItem getAlbum(String id) throws IOException {

 	private AudioItem getTrack(String id) throws IOException {
 		var json = this.getJson(PUBLIC_API_BASE + "/tracks/" + id);
-		if (json.isNull() || json.get("result").values().get(0).get("available").text().equals("false")) {
+		if (json == null || json.isNull() || !json.get("error").isNull() || json.get("result").values().get(0).get("available").text().equals("false")) {


instead of returning AudioReference.NO_TRACK on error we should throw an exception

topi314 · 2024-01-03T00:34:00Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

-		var json = this.getJson(PUBLIC_API_BASE + "/artists/" + id + "/tracks?page-size=10");
-		if (json.isNull() || json.get("result").values().isEmpty()) {
+		var json = this.getJson(PUBLIC_API_BASE + "/artists/" + id + "/tracks?page_size=300");
+		if (json == null || json.isNull() || !json.get("error").isNull() || json.get("result").values().isEmpty()) {


topi314 · 2024-01-03T00:34:03Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java


 	private AudioItem getAlbum(String id) throws IOException {
 		var json = this.getJson(PUBLIC_API_BASE + "/albums/" + id + "/with-tracks");
-		if (json.isNull() || json.get("result").isNull()) {
+		if (json == null || json.isNull() || !json.get("error").isNull() || json.get("result").isNull()) {


topi314 · 2024-01-03T00:34:06Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

@@ -89,19 +90,18 @@ public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference)

 	private AudioItem getSearch(String query) throws IOException {
 		var json = this.getJson(PUBLIC_API_BASE + "/search?text=" + URLEncoder.encode(query, StandardCharsets.UTF_8) + "&type=track&page=0");
-		if (json.isNull() || json.get("result").get("tracks").isNull()) {
+		if (json == null || json.isNull() || !json.get("error").isNull() || json.get("result").get("tracks").isNull()) {


topi314 · 2024-01-03T00:34:14Z

main/src/main/java/com/github/topi314/lavasrc/yandexmusic/YandexMusicSourceManager.java

@@ -148,7 +148,7 @@ private AudioItem getArtist(String id) throws IOException {

 	private AudioItem getPlaylist(String userString, String id) throws IOException {
 		var json = this.getJson(PUBLIC_API_BASE + "/users/" + userString + "/playlists/" + id);
-		if (json.isNull() || json.get("result").isNull() || json.get("result").get("tracks").values().isEmpty()) {
+		if (json == null || json.isNull() || !json.get("error").isNull() || json.get("result").isNull() || json.get("result").get("tracks").values().isEmpty()) {


I didn't understand anything. I've only added json == null here and !json.get("error").isNull()

Since sometimes the response comes without json and json.isNull() returns an error

if you already check for an error response here !json.get("error").isNull() then you might as well throw an error when we get those.
silently returning no track on error would be kinda bad
before it would run into the code below and throw an error there since the other json props are missing, but this isnt the case anymore

Show an example of how to fix it

https://github.com/topi314/LavaSrc/blob/master/main/src/main/java/com/github/topi314/lavasrc/deezer/DeezerAudioTrack.java#L68

topi314 · 2024-02-17T19:06:22Z

do you still want this or can I close it?

llimonix · 2024-02-18T01:32:36Z

do you still want this or can I close it?

I understand that I have errors in the correctness of writing the code. I do not know how to fix them so that everything fits you.

I compiled everything for myself, there were no problems. I'm too lazy to think about how to fix it.

The error on your part has not been resolved, and playlists remain that simply do not work.

Close it

topi314 · 2024-02-18T14:39:20Z

the main issue is the error handling
you are returning no track found if there is an error in the response which is not good since we wouldnt know if an error happened
you can make a similar method to this in deezer to check for errors in responses which would throw an appropriate error https://github.com/topi314/LavaSrc/blob/master/main/src/main/java/com/github/topi314/lavasrc/deezer/DeezerAudioTrack.java#L68

llimonix · 2024-02-18T16:11:15Z

the main issue is the error handling you are returning no track found if there is an error in the response which is not good since we wouldnt know if an error happened you can make a similar method to this in deezer to check for errors in responses which would throw an appropriate error https://github.com/topi314/LavaSrc/blob/master/main/src/main/java/com/github/topi314/lavasrc/deezer/DeezerAudioTrack.java#L68

if I leave what was before my changes, will it be wrong too?

if (json.isNull() || json.get("result").isNull())
if (json.isNull() || json.get("result").isNull() || json.get("result").get("tracks").values().isEmpty())

And so on

topi314 · 2024-05-16T21:09:40Z

is this still relevant after #197?

llimonix added 4 commits December 30, 2023 15:03

Add files via upload

9b3effa

Add files via upload

3ebe1a1

Delete main/src/main/java/com/github/topi314/lavasrc/YandexMusicSourc…

a0bb45c

…eManager.java

Add files via upload

5ef4ffb

topi314 linked an issue Dec 30, 2023 that may be closed by this pull request

some playlists don't work #152

Closed

llimonix added 3 commits December 30, 2023 15:17

Update YandexMusicSourceManager.java

364cb78

Update YandexMusicSourceManager.java

4013c5a

Update YandexMusicSourceManager.java

6617f9e

topi314 requested changes Jan 1, 2024

View reviewed changes

llimonix added 2 commits January 1, 2024 19:25

Update YandexMusicSourceManager.java

d17c5b1

Merge branch 'master' into master

78aa049

llimonix requested a review from topi314 January 1, 2024 16:27

topi314 requested changes Jan 1, 2024

View reviewed changes

Update YandexMusicSourceManager.java

d13694e

llimonix requested a review from topi314 January 2, 2024 16:58

llimonix added 2 commits January 2, 2024 20:00

Update YandexMusicSourceManager.java

94b7364

Update YandexMusicSourceManager.java

259bd79

topi314 requested changes Jan 3, 2024

View reviewed changes

topi314 force-pushed the master branch from 8096d1a to 32ec01a Compare May 6, 2024 18:05

llimonix closed this May 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LavaSrc fix Yandex Music playlist and artist's track limit #155

LavaSrc fix Yandex Music playlist and artist's track limit #155

llimonix commented Dec 30, 2023

topi314 Jan 1, 2024

topi314 Jan 1, 2024

topi314 Jan 1, 2024

topi314 left a comment

llimonix commented Jan 2, 2024

topi314 left a comment

topi314 Jan 3, 2024

topi314 Jan 3, 2024

topi314 Jan 3, 2024

topi314 Jan 3, 2024

topi314 Jan 3, 2024

topi314 Jan 3, 2024

topi314 Jan 3, 2024

topi314 Jan 3, 2024

llimonix Jan 3, 2024

topi314 Jan 3, 2024

llimonix Jan 3, 2024

topi314 Jan 3, 2024

topi314 commented Feb 17, 2024

llimonix commented Feb 18, 2024

topi314 commented Feb 18, 2024

llimonix commented Feb 18, 2024

topi314 commented May 16, 2024

		List<String> trackIds = playlistTracks.subList(i, endIndex);
		var trackIdsStr = String.join("%2C", trackIds);

		for (int i = 0; i < playlistTracks.size(); i += 300) {
		int endIndex = Math.min(i + 300, playlistTracks.size());

		String trackIdsStr = trackIds.stream()
		.collect(Collectors.joining(","));

	String trackIdsStr = trackIds.stream()
	.collect(Collectors.joining(","));
	String trackIdsStr = trackIds.stream().collect(Collectors.joining(","));

LavaSrc fix Yandex Music playlist and artist's track limit #155

LavaSrc fix Yandex Music playlist and artist's track limit #155

Conversation

llimonix commented Dec 30, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

topi314 left a comment

Choose a reason for hiding this comment

llimonix commented Jan 2, 2024

topi314 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

topi314 commented Feb 17, 2024

llimonix commented Feb 18, 2024

topi314 commented Feb 18, 2024

llimonix commented Feb 18, 2024

topi314 commented May 16, 2024