fix: response bodies weren't closed

flixclusiveorg · Feb 5, 2024 · 97a468b · 97a468b
1 parent f5301b2
commit 97a468b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/FlixHQ.kt b/provider/flixhq/src/main/kotlin/com/flixclusive/provider/flixhq/FlixHQ.kt
@@ -55,7 +55,7 @@ class FlixHQ(client: OkHttpClient) : Provider(client) {
             )
         ).execute()
 
-        response.body?.charStream().asString()?.let { data ->
+        response.body?.string()?.let { data ->
             val doc = Jsoup.parse(data)
             val navSelector = "div.pre-pagination:nth-child(3) > nav:nth-child(1) > ul:nth-child(1)"
             searchResult = searchResult.copy(
@@ -93,7 +93,7 @@ class FlixHQ(client: OkHttpClient) : Provider(client) {
         )
 
         val response = client.newCall(GET(filmIdToUse)).execute()
-        val data = response.body?.charStream().asString()
+        val data = response.body?.string()
 
         if (data != null) {
             val doc = Jsoup.parse(data)
@@ -143,7 +143,7 @@ class FlixHQ(client: OkHttpClient) : Provider(client) {
         if (tvCacheData.seasons == null || !isSameId) {
             val responseSeasons =
                 client.newCall(GET(ajaxReqUrl(filmIdToUse, "tv", true))).execute()
-            val dataSeasons = responseSeasons.body?.charStream().asString()
+            val dataSeasons = responseSeasons.body?.string()
                 ?: throw Exception("Failed to fetch season data from provider")
 
             val seasonsDoc = Jsoup.parse(dataSeasons)
@@ -209,7 +209,7 @@ class FlixHQ(client: OkHttpClient) : Provider(client) {
             }
 
         val response = client.newCall(GET(fetchServerUrl)).execute()
-        val data = response.body?.charStream().asString()
+        val data = response.body?.string()
 
         if (data != null) {
             val doc = Jsoup.parse(data)

diff --git a/provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/LookMovie.kt b/provider/lookmovie/src/main/kotlin/com/flixclusive/provider/lookmovie/LookMovie.kt
@@ -4,7 +4,6 @@ import com.flixclusive.core.util.coroutines.asyncCalls
 import com.flixclusive.core.util.film.FilmType
 import com.flixclusive.core.util.json.fromJson
 import com.flixclusive.core.util.network.GET
-import com.flixclusive.core.util.network.asString
 import com.flixclusive.model.provider.SourceLink
 import com.flixclusive.model.provider.Subtitle
 import com.flixclusive.model.provider.SubtitleSource
@@ -37,8 +36,7 @@ class LookMovie(client: OkHttpClient) : Provider(client) {
 
         val data = client.newCall(uri).execute()
             .body
-            ?.charStream()
-            ?.asString()
+            ?.string()
             ?: throw Exception("Error searching on LookMovie")
 
         return fromJson<LookMovieSearchResponse>(data).toSearchResponse()
@@ -75,8 +73,7 @@ class LookMovie(client: OkHttpClient) : Provider(client) {
             )
         ).execute()
             .body
-            ?.charStream()
-            ?.asString()
+            ?.string()
             ?: throw Exception("Error getting $mediaIdToUse data from LookMovie")
 
         val data = fromJson<LookMovieMediaDetail>(response)
@@ -110,8 +107,7 @@ class LookMovie(client: OkHttpClient) : Provider(client) {
             )
         ).execute()
             .body
-            ?.charStream()
-            ?.asString()
+            ?.string()
             ?: throw Exception("Error getting $mediaId from LookMovie")
 
         return fromJson<LookMovieMediaDetail>(data)

diff --git a/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/SuperStream.kt b/provider/superstream/src/main/kotlin/com/flixclusive/provider/superstream/SuperStream.kt
@@ -6,7 +6,6 @@ import com.flixclusive.core.util.film.FilmType
 import com.flixclusive.core.util.json.fromJson
 import com.flixclusive.core.util.network.CryptographyUtil.base64Encode
 import com.flixclusive.core.util.network.POST
-import com.flixclusive.core.util.network.asString
 import com.flixclusive.model.provider.SourceLink
 import com.flixclusive.model.provider.Subtitle
 import com.flixclusive.model.provider.SubtitleSource
@@ -93,8 +92,7 @@ class SuperStream(
 
         val responseBody = response
             .body
-            ?.charStream()
-            ?.asString()
+            ?.string()
             ?: throw Exception(errorMessage + " [${response.code} - ${response.message}]")
 
         if(