Merge pull request #4024 from knighthat/master

throw correct error instead of UnknownException for almost every error
fast4x · Oct 16, 2024 · 566aa7f · 566aa7f
2 parents b5d1041 + a3863b2
commit 566aa7f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlayerService.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/service/PlayerService.kt
@@ -2039,7 +2039,6 @@ class PlayerService : InvincibleService(),
                             is SocketTimeoutException -> throw TimeoutException()
                             else -> throw UnknownException()
                         }
-
                     }
 
                     runBlocking(Dispatchers.IO) {

diff --git a/innertube/src/main/kotlin/it/fast4x/innertube/requests/Player.kt b/innertube/src/main/kotlin/it/fast4x/innertube/requests/Player.kt
@@ -21,50 +21,51 @@ suspend fun Innertube.player(body: PlayerBody) = runCatchingNonCancellable {
 
     println("mediaItem requests Player response $response")
 
-    if (response.playabilityStatus?.status == "OK") {
-        response
-    } else {
-        @Serializable
-        data class AudioStream(
-            val url: String,
-            val bitrate: Long
-        )
+    when( response.playabilityStatus?.status ) {
+        "OK", "LOGIN_REQUIRED", "UNPLAYABLE" -> response
+        else -> {
+            @Serializable
+            data class AudioStream(
+                val url: String,
+                val bitrate: Long
+            )
 
-        @Serializable
-        data class PipedResponse(
-            val audioStreams: List<AudioStream>
-        )
+            @Serializable
+            data class PipedResponse(
+                val audioStreams: List<AudioStream>
+            )
 
-        val safePlayerResponse = client.post(player) {
-            setBody(
-                body.copy(
-                    //context = Context.DefaultAgeRestrictionBypass.copy(
-                    context = Context.DefaultWeb.copy(
-                        thirdParty = Context.ThirdParty(
-                            embedUrl = "https://www.youtube.com/watch?v=${body.videoId}"
-                        )
-                    ),
+            val safePlayerResponse = client.post(player) {
+                setBody(
+                    body.copy(
+                        //context = Context.DefaultAgeRestrictionBypass.copy(
+                        context = Context.DefaultWeb.copy(
+                            thirdParty = Context.ThirdParty(
+                                embedUrl = "https://www.youtube.com/watch?v=${body.videoId}"
+                            )
+                        ),
+                    )
                 )
-            )
-            mask("playabilityStatus.status,playerConfig.audioConfig,streamingData.adaptiveFormats,videoDetails.videoId")
-        }.body<PlayerResponse>()
+                mask("playabilityStatus.status,playerConfig.audioConfig,streamingData.adaptiveFormats,videoDetails.videoId")
+            }.body<PlayerResponse>()
 
-        if (safePlayerResponse.playabilityStatus?.status != "OK") {
-            return@runCatchingNonCancellable response
-        }
+            if (safePlayerResponse.playabilityStatus?.status != "OK") {
+                return@runCatchingNonCancellable response
+            }
 
-        val audioStreams = client.get("https://watchapi.whatever.social/streams/${body.videoId}") {
-            contentType(ContentType.Application.Json)
-        }.body<PipedResponse>().audioStreams
+            val audioStreams = client.get("https://watchapi.whatever.social/streams/${body.videoId}") {
+                contentType(ContentType.Application.Json)
+            }.body<PipedResponse>().audioStreams
 
-        safePlayerResponse.copy(
-            streamingData = safePlayerResponse.streamingData?.copy(
-                adaptiveFormats = safePlayerResponse.streamingData.adaptiveFormats?.map { adaptiveFormat ->
-                    adaptiveFormat.copy(
-                        url = audioStreams.find { it.bitrate == adaptiveFormat.bitrate }?.url
-                    )
-                }
+            safePlayerResponse.copy(
+                streamingData = safePlayerResponse.streamingData?.copy(
+                    adaptiveFormats = safePlayerResponse.streamingData.adaptiveFormats?.map { adaptiveFormat ->
+                        adaptiveFormat.copy(
+                            url = audioStreams.find { it.bitrate == adaptiveFormat.bitrate }?.url
+                        )
+                    }
+                )
             )
-        )
+        }
     }
 }