fix(playlist): usage of new youtube api format for playlists/albums. …

…Credits to LlinksRechts @ vfsfitvnm#1654.
Sublimeful · Jul 15, 2024 · d7b33ed · d7b33ed
1 parent e6bdd6c
commit d7b33ed
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 11 deletions.
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt
@@ -67,7 +67,7 @@ fun AlbumScreen(browseId: String) {
             .collect { (currentAlbum, tabIndex) ->
                 album = currentAlbum
 
-                if (albumPage == null && (currentAlbum?.timestamp == null || tabIndex == 1)) {
+                if (albumPage == null && (currentAlbum?.timestamp == null || currentAlbum.title == null || tabIndex == 1)) {
                     withContext(Dispatchers.IO) {
                         Innertube.albumPage(BrowseBody(browseId = browseId))
                             ?.onSuccess { currentAlbumPage ->

diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/BrowseResponse.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/BrowseResponse.kt
@@ -13,6 +13,7 @@ data class BrowseResponse(
     @Serializable
     data class Contents(
         val singleColumnBrowseResultsRenderer: Tabs?,
+        val twoColumnBrowseResultsRenderer: TwoColResults?,
         val sectionListRenderer: SectionListRenderer?,
     )
 

diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicShelfRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicShelfRenderer.kt
@@ -7,7 +7,9 @@ data class MusicShelfRenderer(
     val bottomEndpoint: NavigationEndpoint?,
     val contents: List<Content>?,
     val continuations: List<Continuation>?,
-    val title: Runs?
+    val title: Runs?,
+    val thumbnail: ThumbnailRenderer?,
+    val subtitle: Runs?
 ) {
     @Serializable
     data class Content(
@@ -23,7 +25,7 @@ data class MusicShelfRenderer(
                 ?: emptyList()) to
                     (musicResponsiveListItemRenderer
                         ?.flexColumns
-                        ?.lastOrNull()
+                        ?.getOrNull(1)
                         ?.musicResponsiveListItemFlexColumnRenderer
                         ?.text
                         ?.splitBySeparator()

diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SectionListRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SectionListRenderer.kt
@@ -16,6 +16,8 @@ data class SectionListRenderer(
         val musicCarouselShelfRenderer: MusicCarouselShelfRenderer?,
         @JsonNames("musicPlaylistShelfRenderer")
         val musicShelfRenderer: MusicShelfRenderer?,
+        val musicResponsiveHeaderRenderer: MusicShelfRenderer?,
+        val musicPlaylistShelfRenderer: MusicShelfRenderer?,
         val gridRenderer: GridRenderer?,
         val musicDescriptionShelfRenderer: MusicDescriptionShelfRenderer?,
     ) {

diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/TwoColResults.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/TwoColResults.kt
@@ -0,0 +1,14 @@
+package it.vfsfitvnm.innertube.models
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TwoColResults(
+    val secondaryContents: SecondaryContents?,
+    val tabs: List<Tabs.Tab>?
+) {
+    @Serializable
+    data class SecondaryContents(
+        val sectionListRenderer: SectionListRenderer?
+    )
+}
diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/ItemsPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/ItemsPage.kt
@@ -37,7 +37,7 @@ suspend fun <T : Innertube.Item> Innertube.itemsPage(
 
     itemsPageFromMusicShelRendererOrGridRenderer(
         musicShelfRenderer = sectionListRendererContent
-            ?.musicShelfRenderer,
+            ?.musicPlaylistShelfRenderer,
         gridRenderer = sectionListRendererContent
             ?.gridRenderer,
         fromMusicResponsiveListItemRenderer = fromMusicResponsiveListItemRenderer,

diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/PlaylistPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/PlaylistPage.kt
@@ -16,26 +16,31 @@ import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable
 suspend fun Innertube.playlistPage(body: BrowseBody) = runCatchingNonCancellable {
     val response = client.post(browse) {
         setBody(body)
-        mask("contents.singleColumnBrowseResultsRenderer.tabs.tabRenderer.content.sectionListRenderer.contents(musicPlaylistShelfRenderer(continuations,contents.$musicResponsiveListItemRendererMask),musicCarouselShelfRenderer.contents.$musicTwoRowItemRendererMask),header.musicDetailHeaderRenderer(title,subtitle,thumbnail),microformat")
+        mask("contents.twoColumnBrowseResultsRenderer(tabs.tabRenderer.content.sectionListRenderer.contents.musicResponsiveHeaderRenderer(title,subtitle,thumbnail),secondaryContents.sectionListRenderer.contents(musicPlaylistShelfRenderer(continuations,contents.$musicResponsiveListItemRendererMask),musicCarouselShelfRenderer.contents.$musicTwoRowItemRendererMask)),microformat")
     }.body<BrowseResponse>()
 
     val musicDetailHeaderRenderer = response
-        .header
-        ?.musicDetailHeaderRenderer
-
-    val sectionListRendererContents = response
         .contents
-        ?.singleColumnBrowseResultsRenderer
+        ?.twoColumnBrowseResultsRenderer
         ?.tabs
         ?.firstOrNull()
         ?.tabRenderer
         ?.content
         ?.sectionListRenderer
         ?.contents
+        ?.firstOrNull()
+        ?.musicResponsiveHeaderRenderer
+
+    val sectionListRendererContents = response
+        .contents
+        ?.twoColumnBrowseResultsRenderer
+        ?.secondaryContents
+        ?.sectionListRenderer
+        ?.contents
 
     val musicShelfRenderer = sectionListRendererContents
         ?.firstOrNull()
-        ?.musicShelfRenderer
+        ?.musicPlaylistShelfRenderer
 
     val musicCarouselShelfRenderer = sectionListRendererContents
         ?.getOrNull(1)