MohmedIbrahim/cloudstream
1
0
Fork 0
forked from recloudstream/cloudstream
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert

Browse source
This commit is contained in:
Arjix 2021-10-03 00:12:07 +03:00 committed by GitHub
parent 72a2ff930c
commit ac3526faa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
app/src/main/java/com/lagradost/cloudstream3/network/Requests.kt
View file

@ -16,63 +16,6 @@ private val DEFAULT_COOKIES: Map<String, String> = mapOf()
private val DEFAULT_REFERER: String? = null private val DEFAULT_REFERER: String? = null
// lowercase to avoid conflicts
class response(response: Response) {
companion object {
private var responseText: String? = null
private var responseBody: ResponseBody? = null
}
public val rawResponse: Response = response
val text: String
get() {
if (responseText != null) return responseText!!
if (responseBody == null) responseBody = rawResponse.body
responseText = responseBody.toString()
return responseText!!
}
val body: ResponseBody
get() {
if (responseBody == null) responseBody = rawResponse.body
return responseBody!!
}
val url: String
get() {
return rawResponse.request.url.toString()
}
val cookies: Map<String, String>
get() {
val cookieList =
rawResponse.headers.filter { it.first.equals("set-cookie", ignoreCase = true) }.getOrNull(0)?.second?.split(";")
return cookieList?.associate {
val split = it.split("=")
(split.getOrNull(0)?.trim() ?: "") to (split.getOrNull(1)?.trim() ?: "")
}?.filter { it.key.isNotBlank() && it.value.isNotBlank() } ?: mapOf()
}
val headers: Headers
get() {
return rawResponse.headers
}
val ok: Boolean
get() {
return rawResponse.isSuccessful
}
val status: Int
get() {
return rawResponse.code
}
}
/** WARNING! CAN ONLY BE READ ONCE */ /** WARNING! CAN ONLY BE READ ONCE */
val Response.text: String val Response.text: String
get() { get() {
@ -147,7 +90,7 @@ fun get(
cacheTime: Int = DEFAULT_TIME, cacheTime: Int = DEFAULT_TIME,
cacheUnit: TimeUnit = DEFAULT_TIME_UNIT, cacheUnit: TimeUnit = DEFAULT_TIME_UNIT,
timeout: Long = 0L timeout: Long = 0L
): response { ): Response {
val client = OkHttpClient().newBuilder() val client = OkHttpClient().newBuilder()
.followRedirects(allowRedirects) .followRedirects(allowRedirects)
.followSslRedirects(allowRedirects) .followSslRedirects(allowRedirects)
@ -155,7 +98,7 @@ fun get(
.build() .build()
val request = getRequestCreator(url, headers, referer, params, cookies, cacheTime, cacheUnit) val request = getRequestCreator(url, headers, referer, params, cookies, cacheTime, cacheUnit)
return response(client.newCall(request).execute()) return client.newCall(request).execute()
} }
@ -170,14 +113,14 @@ fun post(
cacheTime: Int = DEFAULT_TIME, cacheTime: Int = DEFAULT_TIME,
cacheUnit: TimeUnit = DEFAULT_TIME_UNIT, cacheUnit: TimeUnit = DEFAULT_TIME_UNIT,
timeout: Long = 0L timeout: Long = 0L
): response { ): Response {
val client = OkHttpClient().newBuilder() val client = OkHttpClient().newBuilder()
.followRedirects(allowRedirects) .followRedirects(allowRedirects)
.followSslRedirects(allowRedirects) .followSslRedirects(allowRedirects)
.callTimeout(timeout, TimeUnit.SECONDS) .callTimeout(timeout, TimeUnit.SECONDS)
.build() .build()
val request = postRequestCreator(url, headers, referer, params, cookies, data, cacheTime, cacheUnit) val request = postRequestCreator(url, headers, referer, params, cookies, data, cacheTime, cacheUnit)
return response(client.newCall(request).execute()) return client.newCall(request).execute()
} }