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

fix: background shuffle mode doesn't builder a proper queue

Browse Source
This commit is contained in:
Bnyro 2025-04-01 10:55:04 +02:00
parent 763f90f226
commit bf07874ef9
No known key found for this signature in database
5 changed files with 12 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/AndroidManifest.xml
View File

@ -434,30 +434,6 @@
</service>
<service
android:name=".services.VideoOnlinePlayerService"
android:enabled="true"
android:exported="false"
android:foregroundServiceType="mediaPlayback">
<intent-filter>
<action android:name="androidx.media3.session.MediaSessionService"/>
</intent-filter>
</service>
<service
android:name=".services.VideoOfflinePlayerService"
android:enabled="true"
android:exported="false"
android:foregroundServiceType="mediaPlayback">
<intent-filter>
<action android:name="androidx.media3.session.MediaSessionService"/>
</intent-filter>
</service>
<service
android:name=".services.OnClearFromRecentService"
android:enabled="true"

3
app/src/main/java/com/github/libretube/db/dao/DownloadDao.kt
View File

@ -26,9 +26,6 @@ interface DownloadDao {
@Query("SELECT EXISTS (SELECT * FROM download WHERE videoId = :videoId)")
suspend fun exists(videoId: String): Boolean
@Query("SELECT videoId FROM downloadItem WHERE type = :fileType ORDER BY RANDOM() LIMIT 1")
suspend fun getRandomVideoIdByFileType(fileType: FileType): String?
@Query("SELECT * FROM downloaditem WHERE id = :id")
suspend fun findDownloadItemById(id: Int): DownloadItem?

27
app/src/main/java/com/github/libretube/helpers/BackgroundHelper.kt
View File

@ -1,12 +1,10 @@
package com.github.libretube.helpers
import android.app.ActivityManager
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.annotation.OptIn
import androidx.core.content.getSystemService
import androidx.core.os.bundleOf
import androidx.fragment.app.commit
import androidx.media3.common.util.UnstableApi
@ -38,19 +36,17 @@ object BackgroundHelper {
playlistId: String? = null,
channelId: String? = null,
keepQueue: Boolean = false,
keepVideoPlayerAlive: Boolean = false
) {
// close the previous video player if open
if (!keepVideoPlayerAlive) {
val fragmentManager =
ContextHelper.unwrapActivity<MainActivity>(context).supportFragmentManager
fragmentManager.fragments.firstOrNull { it is PlayerFragment }?.let {
fragmentManager.commit { remove(it) }
}
val fragmentManager =
ContextHelper.unwrapActivity<MainActivity>(context).supportFragmentManager
fragmentManager.fragments.firstOrNull { it is PlayerFragment }?.let {
fragmentManager.commit { remove(it) }
}
val playerData = PlayerData(videoId, playlistId, channelId, keepQueue, position)
stopBackgroundPlay(context)
startMediaService(
context,
OnlinePlayerService::class.java,
@ -71,18 +67,6 @@ object BackgroundHelper {
}
}
/**
* Check if the [OnlinePlayerService] service is currently running.
*/
fun isBackgroundServiceRunning(
context: Context,
serviceClass: Class<*> = OnlinePlayerService::class.java
): Boolean {
@Suppress("DEPRECATION")
return context.getSystemService<ActivityManager>()!!.getRunningServices(Int.MAX_VALUE)
.any { serviceClass.name == it.service.className }
}
/**
* Start the offline background player
*
@ -106,6 +90,7 @@ object BackgroundHelper {
IntentData.audioOnly to true
)
stopBackgroundPlay(context)
startMediaService(context, OfflinePlayerService::class.java, arguments)
}

8
app/src/main/java/com/github/libretube/services/OfflinePlayerService.kt
View File

@ -75,10 +75,12 @@ open class OfflinePlayerService : AbstractPlayerService() {
noInternetService = args.getBoolean(IntentData.noInternet, false)
isAudioOnlyPlayer = args.getBoolean(IntentData.audioOnly, false)
PlayingQueue.clear()
val videoId = if (shuffle) {
runBlocking(Dispatchers.IO) {
Database.downloadDao().getRandomVideoIdByFileType(FileType.AUDIO)
}
Database.downloadDao().getAll().filterByTab(downloadTab).randomOrNull()
}?.download?.videoId
} else {
args.getString(IntentData.videoId)
} ?: return
@ -89,7 +91,6 @@ open class OfflinePlayerService : AbstractPlayerService() {
setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, isAudioOnlyPlayer)
}
PlayingQueue.clear()
fillQueue()
}
@ -203,6 +204,7 @@ open class OfflinePlayerService : AbstractPlayerService() {
Database.downloadDao().getAll()
}
.filterByTab(downloadTab)
.filter { it.download.videoId != videoId }
.toMutableList()
if (shuffle) downloads.shuffle()

3
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -1481,8 +1481,7 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
}
private fun shouldStartPiP(): Boolean {
return shouldUsePip() && ::playerController.isInitialized && playerController.isPlaying &&
!BackgroundHelper.isBackgroundServiceRunning(requireContext())
return shouldUsePip() && ::playerController.isInitialized && playerController.isPlaying
}
/**