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

Simplify playing queue logic (#3324)

Browse Source 
* Simplify playing queue logic
This commit is contained in:
Bnyro 2023-03-18 17:28:48 +01:00 committed by GitHub
parent e7ce4637ce
commit b78f98d813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/github/libretube/util/PlayingQueue.kt
View File

@ -46,19 +46,10 @@ object PlayingQueue {
)
}
fun getNext(): String? {
try {
return queue[currentIndex() + 1].url?.toID()
} catch (e: Exception) {
Log.e("queue ended", e.toString())
}
if (repeatQueue) return queue.firstOrNull()?.url?.toID()
return null
}
fun getNext(): String? = queue.getOrNull(currentIndex() + 1)?.url?.toID()
?: queue.firstOrNull()?.url?.toID()?.takeIf { repeatQueue }
fun getPrev(): String? {
return if (currentIndex() > 0) queue[currentIndex() - 1].url?.toID() else null
}
fun getPrev(): String? = queue.getOrNull(currentIndex() - 1)?.url?.toID()
fun hasPrev(): Boolean {
return currentIndex() > 0
@ -84,15 +75,9 @@ object PlayingQueue {
fun size() = queue.size
fun currentIndex(): Int {
return try {
queue.indexOf(
queue.first { it.url?.toID() == currentStream?.url?.toID() }
)
} catch (e: Exception) {
0
}
}
fun currentIndex(): Int = queue.indexOfFirst {
it.url?.toID() == currentStream?.url?.toID()
}.takeIf { it >= 0 } ?: 0
fun getCurrent(): StreamItem? = currentStream
@ -131,7 +116,7 @@ object PlayingQueue {
scope.launch {
try {
val playlist = PlaylistsHelper.getPlaylist(playlistId)
add(*playlist.relatedStreams.orEmpty().toTypedArray())
add(*playlist.relatedStreams.toTypedArray())
updateCurrent(newCurrentStream)
if (playlist.nextpage == null) return@launch
fetchMoreFromPlaylist(playlistId, playlist.nextpage)