WIP: innertube: register playback stuff

* Adhere to pause listen history for remote content
DD3Boh · Jan 10, 2025 · b2e3444 · b2e3444
1 parent 3d94855
commit b2e3444
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 27 deletions.
diff --git a/app/src/main/java/com/dd3boh/outertune/playback/DownloadUtil.kt b/app/src/main/java/com/dd3boh/outertune/playback/DownloadUtil.kt
@@ -77,7 +77,6 @@ class DownloadUtil @Inject constructor(
                 playedFormat = playedFormat,
                 audioQuality = audioQuality,
                 connectivityManager = connectivityManager,
-                registerPlayback = false,
             )
         }.getOrThrow()
         val format = playbackData.format

diff --git a/app/src/main/java/com/dd3boh/outertune/playback/MusicService.kt b/app/src/main/java/com/dd3boh/outertune/playback/MusicService.kt
@@ -452,26 +452,19 @@ class MusicService : MediaLibraryService(),
 
         if (playbackUrl == null) {
             playbackUrl = if (playbackData?.playbackTracking?.videostatsPlaybackUrl?.baseUrl == null)
-                YTPlayerUtils.playerResponseForMetadata(mediaId, registerPlayback = false).getOrNull()?.playbackTracking
+                YTPlayerUtils.playerResponseForMetadata(mediaId).getOrNull()?.playbackTracking
                     ?.videostatsPlaybackUrl?.baseUrl!!
             else
                 playbackData.playbackTracking?.videostatsPlaybackUrl?.baseUrl
         }
 
-        playbackUrl?.let {
-            try { YouTube.registerPlayback(queuePlaylistId, playbackUrl) }
-            catch (exception: UnknownHostException) {
-                reportException(exception)
-            }
-        }
-
         val song = database.song(mediaId).first()
         val mediaMetadata = withContext(Dispatchers.Main) {
             player.findNextMediaItemById(mediaId)?.metadata
         } ?: return
         val duration = song?.song?.duration?.takeIf { it != -1 }
             ?: mediaMetadata.duration.takeIf { it != -1 }
-            ?: (playbackData?.videoDetails ?: YTPlayerUtils.playerResponseForMetadata(mediaId, registerPlayback = false).getOrNull()?.videoDetails)?.lengthSeconds?.toInt()
+            ?: (playbackData?.videoDetails ?: YTPlayerUtils.playerResponseForMetadata(mediaId).getOrNull()?.videoDetails)?.lengthSeconds?.toInt()
             ?: -1
         database.query {
             if (song == null) insert(mediaMetadata.copy(duration = duration))
@@ -696,7 +689,6 @@ class MusicService : MediaLibraryService(),
                     playedFormat = playedFormat,
                     audioQuality = audioQuality,
                     connectivityManager = connectivityManager,
-                    registerPlayback = false,
                 )
             }.getOrElse { throwable ->
                 when (throwable) {
@@ -822,6 +814,19 @@ class MusicService : MediaLibraryService(),
                 } catch (_: SQLException) {
                 }
             }
+
+            // TODO: support playlist id
+            if (mediaItem.metadata?.isLocal != true) {
+                CoroutineScope(Dispatchers.IO).launch {
+                    val playerResponse = YTPlayerUtils.playerResponseForMetadata(mediaItem.mediaId, null).getOrNull()
+                    if (playerResponse?.playabilityStatus?.status == "OK") {
+                        YouTube.registerPlayback(
+                            playlistId = null,
+                            playbackTracking = playerResponse.playbackTracking?.videostatsPlaybackUrl?.baseUrl!!
+                        )
+                    }
+                }
+            }
         }
     }
 

diff --git a/app/src/main/java/com/dd3boh/outertune/utils/YTPlayerUtils.kt b/app/src/main/java/com/dd3boh/outertune/utils/YTPlayerUtils.kt
@@ -56,7 +56,6 @@ object YTPlayerUtils {
         playedFormat: FormatEntity?,
         audioQuality: AudioQuality,
         connectivityManager: ConnectivityManager,
-        registerPlayback: Boolean = false,
     ): Result<PlaybackData> = runCatching {
         /**
          * This is required for some clients to get working streams however
@@ -160,9 +159,8 @@ object YTPlayerUtils {
     suspend fun playerResponseForMetadata(
         videoId: String,
         playlistId: String? = null,
-        registerPlayback: Boolean = false
     ): Result<PlayerResponse> =
-        YouTube.player(videoId, playlistId, client = MAIN_CLIENT, registerPlayback = registerPlayback)
+        YouTube.player(videoId, playlistId, client = MAIN_CLIENT)
 
     private fun findFormat(
         playerResponse: PlayerResponse,
@@ -228,4 +226,55 @@ object YTPlayerUtils {
             }
             .getOrNull()
     }
+
+
+    /**
+     * OuterTune extras
+     */
+
+
+
+//
+//    /**
+//     * Add to remote playback history
+//     */
+//    fun registerPlayback(playlistId: String? = null, playbackTracking: String): Boolean {
+//        val cpn = (1..16).map {
+//            "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"[Random.Default.nextInt(
+//                0,
+//                64
+//            )]
+//        }.joinToString("")
+//
+//        val playbackUrl = playbackTracking.replace(
+//            "https://s.youtube.com",
+//            "https://music.youtube.com",
+//        )
+//
+
+////        try {
+//            val baseUrl = playbackUrl.toHttpUrlOrNull() ?: throw IllegalArgumentException("Invalid URL: $playbackUrl")
+//            val httpBuilder = baseUrl.newBuilder()
+//                .addQueryParameter("ver", "2")
+//                .addQueryParameter("c", "WEB_REMIX")
+//                .addQueryParameter("cpn", cpn)
+//
+//            if (playlistId != null) {
+//                httpBuilder.addQueryParameter("list", playlistId)
+//                httpBuilder.addQueryParameter("referrer", "https://music.youtube.com/playlist?list=$playlistId")
+//            }
+//
+//            val requestBuilder = okhttp3.Request.Builder()
+//                .head()
+//                .url(httpBuilder.build())
+//
+//            val response = httpClient.newCall(requestBuilder.build()).execute()
+//            return response.isSuccessful
+////        } catch (e: Exception) {
+////            reportException(e)
+////            throw Exception("weh", e)
+////        }
+//
+//        return false
+//    }
 }
diff --git a/innertube/src/main/java/com/zionhuang/innertube/InnerTube.kt b/innertube/src/main/java/com/zionhuang/innertube/InnerTube.kt
@@ -121,7 +121,6 @@ class InnerTube {
         videoId: String,
         playlistId: String?,
         signatureTimestamp: Int?,
-        registerPlayback: Boolean = false,
     ) = httpClient.post("player") {
         ytClient(client, setLogin = true)
         setBody(

diff --git a/innertube/src/main/java/com/zionhuang/innertube/YouTube.kt b/innertube/src/main/java/com/zionhuang/innertube/YouTube.kt
@@ -662,19 +662,8 @@ object YouTube {
         playlistId: String? = null,
         client: YouTubeClient,
         signatureTimestamp: Int? = null,
-        registerPlayback: Boolean = true
     ): Result<PlayerResponse> = runCatching {
-        val playerResponse =
-            innerTube.player(client, videoId, playlistId, signatureTimestamp, registerPlayback).body<PlayerResponse>()
-
-        if (playerResponse.playabilityStatus.status == "OK") {
-            if (registerPlayback)
-                registerPlayback(playlistId, playerResponse.playbackTracking?.videostatsPlaybackUrl?.baseUrl!!)
-
-            return@runCatching playerResponse
-        }
-
-        playerResponse
+        innerTube.player(client, videoId, playlistId, signatureTimestamp).body<PlayerResponse>()
     }
 
     suspend fun registerPlayback(playlistId: String? = null, playbackTracking: String) {