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 #4414 from Bnyro/master

Browse Source 
feat: option to add whole playlist to current queue
This commit is contained in:
Bnyro 2023-08-09 12:34:49 +02:00 committed by GitHub
commit 398fedace2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt
View File

@ -15,6 +15,7 @@ import com.github.libretube.ui.dialogs.DeletePlaylistDialog
import com.github.libretube.ui.dialogs.PlaylistDescriptionDialog import com.github.libretube.ui.dialogs.PlaylistDescriptionDialog
import com.github.libretube.ui.dialogs.RenamePlaylistDialog import com.github.libretube.ui.dialogs.RenamePlaylistDialog
import com.github.libretube.ui.dialogs.ShareDialog import com.github.libretube.ui.dialogs.ShareDialog
import com.github.libretube.util.PlayingQueue
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -31,7 +32,8 @@ class PlaylistOptionsBottomSheet(
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
// options for the dialog // options for the dialog
val optionsList = mutableListOf( val optionsList = mutableListOf(
getString(R.string.playOnBackground) getString(R.string.playOnBackground),
getString(R.string.add_to_queue)
) )
val isBookmarked = runBlocking(Dispatchers.IO) { val isBookmarked = runBlocking(Dispatchers.IO) {
@ -67,6 +69,9 @@ class PlaylistOptionsBottomSheet(
) )
} }
} }
getString(R.string.add_to_queue) -> {
PlayingQueue.insertPlaylist(playlistId, null)
}
// Clone the playlist to the users Piped account // Clone the playlist to the users Piped account
getString(R.string.clonePlaylist) -> { getString(R.string.clonePlaylist) -> {
val context = requireContext() val context = requireContext()

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

@ -88,7 +88,21 @@ object PlayingQueue {
fun move(from: Int, to: Int) = queue.move(from, to) fun move(from: Int, to: Int) = queue.move(from, to)
private fun addToQueueAsync(streams: List<StreamItem>, currentStreamItem: StreamItem? = null) { /**
* Adds a list of videos to the current queue while updating the position of the current stream
* @param isMainList: whether the videos are part of the list, that initially has been used to
* start the queue, either from a channel or playlist. If it's false, the current stream won't
* be touched, since it's an independent list.
*/
private fun addToQueueAsync(
streams: List<StreamItem>,
currentStreamItem: StreamItem? = null,
isMainList: Boolean = true
) {
if (!isMainList) {
add(*streams.toTypedArray())
return
}
val currentStream = currentStreamItem ?: this.currentStream val currentStream = currentStreamItem ?: this.currentStream
// if the stream already got added to the queue earlier, although it's not yet // if the stream already got added to the queue earlier, although it's not yet
// been found in the playlist, remove it and re-add it later // been found in the playlist, remove it and re-add it later
@ -109,25 +123,26 @@ object PlayingQueue {
} }
} }
private fun fetchMoreFromPlaylist(playlistId: String, nextPage: String?) { private fun fetchMoreFromPlaylist(playlistId: String, nextPage: String?, isMainList: Boolean) {
var playlistNextPage = nextPage var playlistNextPage = nextPage
scope.launch(Dispatchers.IO) { scope.launch(Dispatchers.IO) {
while (playlistNextPage != null) { while (playlistNextPage != null) {
RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage!!).run { RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage!!).run {
addToQueueAsync(relatedStreams) addToQueueAsync(relatedStreams, isMainList = isMainList)
playlistNextPage = this.nextpage playlistNextPage = this.nextpage
} }
} }
} }
} }
fun insertPlaylist(playlistId: String, newCurrentStream: StreamItem) { fun insertPlaylist(playlistId: String, newCurrentStream: StreamItem?) {
scope.launch(Dispatchers.IO) { scope.launch(Dispatchers.IO) {
runCatching { runCatching {
val playlist = PlaylistsHelper.getPlaylist(playlistId) val playlist = PlaylistsHelper.getPlaylist(playlistId)
addToQueueAsync(playlist.relatedStreams, newCurrentStream) val isMainList = newCurrentStream != null
addToQueueAsync(playlist.relatedStreams, newCurrentStream, isMainList)
if (playlist.nextpage == null) return@launch if (playlist.nextpage == null) return@launch
fetchMoreFromPlaylist(playlistId, playlist.nextpage) fetchMoreFromPlaylist(playlistId, playlist.nextpage, isMainList)
} }
} }
} }