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

Merge pull request #4613 from Bnyro/master

Browse Source 
feat: respect sort order and filters when playing channel group
This commit is contained in:
Bnyro 2023-08-24 21:57:49 +02:00 committed by GitHub
commit ba5c5893b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
View File

@ -180,7 +180,11 @@ class SubscriptionsFragment : Fragment() {
}
private fun playByGroup(groupIndex: Int) {
val streams = viewModel.videoFeed.value.orEmpty().filterByGroup(groupIndex)
val streams = viewModel.videoFeed.value.orEmpty()
.filterByGroup(groupIndex)
.filterByStatusAndWatchPosition()
.sortedBySelectedOrder()
if (streams.isEmpty()) return
PlayingQueue.clear()
@ -245,47 +249,48 @@ class SubscriptionsFragment : Fragment() {
}
}
private fun List<StreamItem>.filterByStatusAndWatchPosition(): List<StreamItem> {
val streamItems = this.filter {
val isLive = (it.duration ?: -1L) < 0L
when (selectedFilter) {
0 -> true
1 -> !it.isShort && !isLive
2 -> it.isShort
3 -> isLive
else -> throw IllegalArgumentException()
}
}
if (!PreferenceHelper.getBoolean(
PreferenceKeys.HIDE_WATCHED_FROM_FEED,
false
)
) return streamItems
return runBlocking { DatabaseHelper.filterUnwatched(streamItems) }
}
private fun List<StreamItem>.sortedBySelectedOrder() = when (selectedSortOrder) {
0 -> this
1 -> this.reversed()
2 -> this.sortedBy { it.views }.reversed()
3 -> this.sortedBy { it.views }
4 -> this.sortedBy { it.uploaderName }
5 -> this.sortedBy { it.uploaderName }.reversed()
else -> this
}
private fun showFeed() {
val videoFeed = viewModel.videoFeed.value ?: return
binding.subRefresh.isRefreshing = false
val feed = videoFeed
.filterByGroup(selectedFilterGroup)
.filter {
// apply the selected filter
val isLive = (it.duration ?: -1L) < 0L
when (selectedFilter) {
0 -> true
1 -> !it.isShort && !isLive
2 -> it.isShort
3 -> isLive
else -> throw IllegalArgumentException()
}
}.let { streams ->
.filterByStatusAndWatchPosition()
if (!PreferenceHelper.getBoolean(
PreferenceKeys.HIDE_WATCHED_FROM_FEED,
false
)
) {
streams
} else {
runBlocking {
DatabaseHelper.filterUnwatched(streams)
}
}
}
// sort the feed
val sortedFeed = when (selectedSortOrder) {
0 -> feed
1 -> feed.reversed()
2 -> feed.sortedBy { it.views }.reversed()
3 -> feed.sortedBy { it.views }
4 -> feed.sortedBy { it.uploaderName }
5 -> feed.sortedBy { it.uploaderName }.reversed()
else -> feed
}.toMutableList()
val sortedFeed = feed
.sortedBySelectedOrder()
.toMutableList()
// add an "all caught up item"
if (selectedSortOrder == 0) {