Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-11-26 02:24:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Saavn Internal Error Bug fix

Browse Source
This commit is contained in:
Shabinder Singh 2021-05-29 02:54:55 +05:30
parent 4e539bbaae
commit 48e4c04973
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/saavn/JioSaavnRequests.kt
View File

@ -13,6 +13,7 @@ import io.github.shabinder.utils.getJsonArray
import io.github.shabinder.utils.getJsonObject import io.github.shabinder.utils.getJsonObject
import io.github.shabinder.utils.getString import io.github.shabinder.utils.getString
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.features.ServerResponseException
import io.ktor.client.request.get import io.ktor.client.request.get
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonArray
@ -52,17 +53,21 @@ interface JioSaavnRequests {
val searchURL = search_base_url + query val searchURL = search_base_url + query
val results = mutableListOf<SaavnSearchResult>() val results = mutableListOf<SaavnSearchResult>()
(globalJson.parseToJsonElement(httpClient.get(searchURL)) as JsonObject).getJsonObject("songs").getJsonArray("data")?.forEach { try {
(it as? JsonObject)?.formatData()?.let { jsonObject -> (globalJson.parseToJsonElement(httpClient.get(searchURL)) as JsonObject).getJsonObject("songs").getJsonArray("data")?.forEach {
results.add(globalJson.decodeFromJsonElement(SaavnSearchResult.serializer(), jsonObject)) (it as? JsonObject)?.formatData()?.let { jsonObject ->
results.add(globalJson.decodeFromJsonElement(SaavnSearchResult.serializer(), jsonObject))
}
} }
} }catch (e: ServerResponseException) {}
return results return results
} }
suspend fun getLyrics(ID: String): String? { suspend fun getLyrics(ID: String): String? {
return (Json.parseToJsonElement(httpClient.get(lyrics_base_url + ID)) as JsonObject) return try {
.getString("lyrics") (Json.parseToJsonElement(httpClient.get(lyrics_base_url + ID)) as JsonObject)
.getString("lyrics")
}catch (e:Exception) { null }
} }
suspend fun getSong( suspend fun getSong(
@ -74,6 +79,7 @@ interface JioSaavnRequests {
.formatData(fetchLyrics) .formatData(fetchLyrics)
return globalJson.decodeFromJsonElement(SaavnSong.serializer(), data) return globalJson.decodeFromJsonElement(SaavnSong.serializer(), data)
} }
suspend fun getSongFromID( suspend fun getSongFromID(
ID: String, ID: String,
fetchLyrics: Boolean = false fetchLyrics: Boolean = false