beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #186

Browse source
This commit is contained in:
vfsfitvnm 2022-08-09 16:00:25 +02:00
parent 36a8f9623e
commit a26eebd806
3 changed files with 46 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubeRadio.kt
View file

@ -7,9 +7,9 @@ import kotlinx.coroutines.withContext
data class YouTubeRadio(
private val videoId: String? = null,
private val playlistId: String? = null,
private val playlistSetVideoId: String? = null,
private val parameters: String? = null
private var playlistId: String? = null,
private var playlistSetVideoId: String? = null,
private var parameters: String? = null
) {
private var nextContinuation: String? = null
@ -24,6 +24,10 @@ data class YouTubeRadio(
playlistSetVideoId = playlistSetVideoId,
continuation = nextContinuation
)?.getOrNull()?.let { nextResult ->
playlistId = nextResult.playlistId
parameters = nextResult.params
playlistSetVideoId = nextResult.playlistSetVideoId
mediaItems = nextResult.items?.map(YouTube.Item.Song::asMediaItem)
nextResult.continuation?.takeUnless { nextContinuation == nextResult.continuation }
}

24
youtube-music/src/main/kotlin/it/vfsfitvnm/youtubemusic/YouTube.kt
View file

@ -631,6 +631,9 @@ object YouTube {
.tabs
NextResult(
playlistId = playlistId,
playlistSetVideoId = playlistSetVideoId,
params = params,
continuation = (tabs
.getOrNull(0)
?.tabRenderer
@ -652,6 +655,23 @@ object YouTube {
?: body.continuationContents)
?.playlistPanelRenderer
?.contents
?.also {
// TODO: we should parse the MusicResponsiveListItemRenderer menu so we can
// avoid an extra network request
it.lastOrNull()
?.automixPreviewVideoRenderer
?.content
?.automixPlaylistVideoRenderer
?.navigationEndpoint
?.watchPlaylistEndpoint
?.let { endpoint ->
return next(
videoId = videoId,
playlistId = endpoint.playlistId,
params = endpoint.params
)
}
}
?.mapNotNull { it.playlistPanelVideoRenderer }
?.mapNotNull { renderer ->
Item.Song(
@ -706,6 +726,9 @@ object YouTube {
data class NextResult(
val continuation: String?,
val playlistId: String?,
val params: String? = null,
val playlistSetVideoId: String? = null,
val items: List<Item.Song>?,
val lyrics: Lyrics?,
val related: Related?,
@ -997,4 +1020,3 @@ object YouTube {
}
}
}

17
youtube-music/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/NextResponse.kt
View file

@ -26,7 +26,8 @@ data class NextResponse(
) {
@Serializable
data class Content(
val playlistPanelVideoRenderer: PlaylistPanelVideoRenderer?
val playlistPanelVideoRenderer: PlaylistPanelVideoRenderer?,
val automixPreviewVideoRenderer: AutomixPreviewVideoRenderer?,
) {
@Serializable
data class PlaylistPanelVideoRenderer(
@ -39,6 +40,20 @@ data class NextResponse(
val videoId: String,
val playlistSetVideoId: String?,
)
@Serializable
data class AutomixPreviewVideoRenderer(
val content: Content?
) {
@Serializable
data class Content(
val automixPlaylistVideoRenderer: AutomixPlaylistVideoRenderer?
) {
@Serializable
data class AutomixPlaylistVideoRenderer(
val navigationEndpoint: NavigationEndpoint
)
}
}
}
}
}