kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 00:10:32 +05:30
Code Issues Projects Releases Wiki Activity

Don't create a new HTTP client for each head request

Browse Source
This commit is contained in:
Bnyro 2023-06-30 10:20:09 +02:00
parent aa537455b8
commit ada94e0bb4
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/api/obj/Streams.kt
View File

@ -62,7 +62,7 @@ data class Streams(
fileName = "${name}_$subCode.srt",
path = Paths.get(""),
url = subtitles.find {
it.code == subtitleCode
it.code == subCode
}?.url?.let { ProxyHelper.unwrapUrl(it) },
),
)

23
app/src/main/java/com/github/libretube/helpers/ProxyHelper.kt
View File

@ -1,13 +1,15 @@
package com.github.libretube.helpers
import com.github.libretube.api.CronetHelper
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.constants.PreferenceKeys
import java.net.HttpURLConnection
import java.net.URL
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.OkHttpClient
import okhttp3.Request
object ProxyHelper {
fun fetchProxyUrl() {
@ -33,15 +35,16 @@ object ProxyHelper {
/**
* Detect whether the proxy should be used or not for a given stream URL based on user preferences
*/
fun unwrapStreamUrl(url: String): String {
suspend fun unwrapStreamUrl(url: String): String {
return if (shouldDisableProxy(url)) unwrapUrl(url) else url
}
fun shouldDisableProxy(url: String) = when {
suspend fun shouldDisableProxy(url: String) = when {
!PreferenceHelper.getBoolean(PreferenceKeys.DISABLE_VIDEO_IMAGE_PROXY, false) -> false
PreferenceHelper.getBoolean(PreferenceKeys.FALLBACK_PIPED_PROXY, true) -> isUrlUsable(
unwrapUrl(url)
)
else -> true
}
@ -64,11 +67,13 @@ object ProxyHelper {
/**
* Parse the Piped url to a YouTube url (or not) based on preferences
*/
private fun isUrlUsable(url: String): Boolean {
val client = OkHttpClient.Builder().build()
val request = Request.Builder().url(url).method("HEAD", null).build()
return runCatching {
client.newCall(request).execute().code == 200
private suspend fun isUrlUsable(url: String): Boolean = withContext(Dispatchers.IO) {
return@withContext runCatching {
val connection = CronetHelper.cronetEngine.openConnection(URL(url)) as HttpURLConnection
connection.requestMethod = "HEAD"
val isSuccess = connection.responseCode == 200
connection.disconnect()
return@runCatching isSuccess
}.getOrDefault(false)
}
}