This commit is contained in:
vfsfitvnm
2022-10-13 19:48:27 +02:00
parent 7ed138ea51
commit 92141f4f49
4 changed files with 99 additions and 88 deletions

View File

@@ -16,7 +16,7 @@ object ArtistSaver : Saver<Artist, List<Any?>> {
override fun restore(value: List<Any?>): Artist = Artist( override fun restore(value: List<Any?>): Artist = Artist(
id = value[0] as String, id = value[0] as String,
name = value[1] as String, name = value[1] as String?,
thumbnailUrl = value[2] as String?, thumbnailUrl = value[2] as String?,
info = value[3] as String?, info = value[3] as String?,
timestamp = value[4] as Long?, timestamp = value[4] as Long?,

View File

@@ -83,7 +83,7 @@ val DetailedSong.asMediaItem: MediaItem
fun String?.thumbnail(size: Int): String? { fun String?.thumbnail(size: Int): String? {
return when { return when {
this?.startsWith("https://lh3.googleusercontent.com") == true -> "$this-w$size-h$size" this?.startsWith("https://lh3.googleusercontent.com") == true -> "$this-w$size-h$size"
this?.startsWith("https://yt3.ggpht.com") == true -> "$this-s$size" this?.startsWith("https://yt3.ggpht.com") == true -> "$this-w$size-h$size-s$size"
else -> this else -> this
} }
} }

View File

@@ -1,6 +1,8 @@
package it.vfsfitvnm.youtubemusic.models package it.vfsfitvnm.youtubemusic.models
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonNames
@Serializable @Serializable
data class BrowseResponse( data class BrowseResponse(
@@ -15,7 +17,8 @@ data class BrowseResponse(
) )
@Serializable @Serializable
data class Header( data class Header @OptIn(ExperimentalSerializationApi::class) constructor(
@JsonNames("musicVisualHeaderRenderer")
val musicImmersiveHeaderRenderer: MusicImmersiveHeaderRenderer?, val musicImmersiveHeaderRenderer: MusicImmersiveHeaderRenderer?,
val musicDetailHeaderRenderer: MusicDetailHeaderRenderer?, val musicDetailHeaderRenderer: MusicDetailHeaderRenderer?,
) { ) {
@@ -33,6 +36,7 @@ data class BrowseResponse(
val playButton: PlayButton?, val playButton: PlayButton?,
val startRadioButton: StartRadioButton?, val startRadioButton: StartRadioButton?,
val thumbnail: ThumbnailRenderer?, val thumbnail: ThumbnailRenderer?,
val foregroundThumbnail: ThumbnailRenderer?,
val title: Runs? val title: Runs?
) { ) {
@Serializable @Serializable

View File

@@ -13,12 +13,15 @@ import it.vfsfitvnm.youtubemusic.utils.findSectionByTitle
import it.vfsfitvnm.youtubemusic.utils.from import it.vfsfitvnm.youtubemusic.utils.from
import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable
suspend fun Innertube.artistPage(body: BrowseBody): Result<Innertube.ArtistPage>? = runCatchingNonCancellable { suspend fun Innertube.artistPage(body: BrowseBody): Result<Innertube.ArtistPage>? =
runCatchingNonCancellable {
val response = client.post(browse) { val response = client.post(browse) {
setBody(body) setBody(body)
mask("contents,header") mask("contents,header")
}.body<BrowseResponse>() }.body<BrowseResponse>()
println(response)
fun findSectionByTitle(text: String): SectionListRenderer.Content? { fun findSectionByTitle(text: String): SectionListRenderer.Content? {
return response return response
.contents .contents
@@ -47,10 +50,14 @@ suspend fun Innertube.artistPage(body: BrowseBody): Result<Innertube.ArtistPage>
?.description ?.description
?.text ?.text
?.substringBeforeLast("\n\nFrom Wikipedia"), ?.substringBeforeLast("\n\nFrom Wikipedia"),
thumbnail = response thumbnail = (response
.header .header
?.musicImmersiveHeaderRenderer ?.musicImmersiveHeaderRenderer
?.thumbnail ?.foregroundThumbnail
?: response
.header
?.musicImmersiveHeaderRenderer
?.thumbnail)
?.musicThumbnailRenderer ?.musicThumbnailRenderer
?.thumbnail ?.thumbnail
?.thumbnails ?.thumbnails
@@ -99,4 +106,4 @@ suspend fun Innertube.artistPage(body: BrowseBody): Result<Innertube.ArtistPage>
?.navigationEndpoint ?.navigationEndpoint
?.browseEndpoint, ?.browseEndpoint,
) )
} }