From 440210931b32460b6bdd8bd370a3d43a8f164f86 Mon Sep 17 00:00:00 2001 From: shabinder Date: Tue, 4 May 2021 16:25:44 +0530 Subject: [PATCH] Youtube Mp3 Link Fetching Fixed for Native --- .../src/commonMain/kotlin/com/shabinder/common/di/DI.kt | 2 ++ .../commonMain/kotlin/com/shabinder/common/di/utils/Utils.kt | 1 - .../kotlin/com/shabinder/common/di/youtubeMp3/Yt1sMp3.kt | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/DI.kt b/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/DI.kt index 74ff0b76..49f8e5b1 100644 --- a/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/DI.kt +++ b/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/DI.kt @@ -75,6 +75,8 @@ fun createHttpClient(enableNetworkLogs: Boolean = false) = HttpClient { install(JsonFeature) { serializer = KotlinxSerializer() } + // WorkAround for Freezing + // Use httpClient.getData / httpClient.postData Extensions /*install(JsonFeature) { serializer = KotlinxSerializer( Json { diff --git a/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/utils/Utils.kt b/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/utils/Utils.kt index 18ba7fea..88fcc775 100644 --- a/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/utils/Utils.kt +++ b/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/utils/Utils.kt @@ -49,7 +49,6 @@ suspend inline fun HttpClient.postData( ): T { val response = post { url.takeFrom(urlString) - header(HttpHeaders.ContentType, ContentType.Application.Json) block() } val jsonBody = response.readText() diff --git a/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/youtubeMp3/Yt1sMp3.kt b/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/youtubeMp3/Yt1sMp3.kt index c4be4f59..b7b4817b 100644 --- a/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/youtubeMp3/Yt1sMp3.kt +++ b/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/youtubeMp3/Yt1sMp3.kt @@ -45,7 +45,7 @@ interface Yt1sMp3 { * Body Form= q:yt video link ,vt:format=mp3 * */ private suspend fun getKey(videoID: String): String { - val response: JsonObject? = httpClient.postData("${corsApi}https://yt1s.com/api/ajaxSearch/index") { + val response: JsonObject? = httpClient.post("${corsApi}https://yt1s.com/api/ajaxSearch/index") { body = FormDataContent( Parameters.build { append("q", "https://www.youtube.com/watch?v=$videoID") @@ -57,7 +57,7 @@ interface Yt1sMp3 { } private suspend fun getConvertedMp3Link(videoID: String, key: String): JsonObject? { - return httpClient.postData("${corsApi}https://yt1s.com/api/ajaxConvert/convert") { + return httpClient.post("${corsApi}https://yt1s.com/api/ajaxConvert/convert") { body = FormDataContent( Parameters.build { append("vid", videoID)