kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 06:40:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #4290 from FireMasterK/dearrow-sort

Browse Source 
Sort videoIds before performing DeArrow fetch
This commit is contained in:
Bnyro 2023-07-22 22:25:15 +02:00 committed by GitHub
commit 1d554b9809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/github/libretube/util/DeArrowUtil.kt
View File

@ -32,7 +32,11 @@ object DeArrowUtil {
suspend fun deArrowStreamItems(streamItems: List<StreamItem>): List<StreamItem> { suspend fun deArrowStreamItems(streamItems: List<StreamItem>): List<StreamItem> {
if (!PreferenceHelper.getBoolean(PreferenceKeys.DEARROW, false)) return streamItems if (!PreferenceHelper.getBoolean(PreferenceKeys.DEARROW, false)) return streamItems
val videoIds = streamItems.mapNotNull { it.url?.toID() }.joinToString(",") val videoIds = streamItems.mapNotNull { it.url?.toID() }
.sorted()
.toSet()
.joinToString(",")
val response = try { val response = try {
RetrofitInstance.api.getDeArrowContent(videoIds) RetrofitInstance.api.getDeArrowContent(videoIds)
} catch (e: Exception) { } catch (e: Exception) {
@ -55,7 +59,11 @@ object DeArrowUtil {
if (!PreferenceHelper.getBoolean(PreferenceKeys.DEARROW, false)) return contentItems if (!PreferenceHelper.getBoolean(PreferenceKeys.DEARROW, false)) return contentItems
val videoIds = contentItems.filter { it.type == "stream" } val videoIds = contentItems.filter { it.type == "stream" }
.joinToString(",") { it.url.toID() } .map { it.url.toID() }
.sorted()
.toSet()
.joinToString(",")
if (videoIds.isEmpty()) return contentItems if (videoIds.isEmpty()) return contentItems
val response = try { val response = try {