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

Merge pull request #3154 from Isira-Seneviratne/Improve_WatchPositionDao

Browse Source 
Improve WatchPositionDao.
This commit is contained in:
Bnyro 2023-02-22 10:11:46 +01:00 committed by GitHub
commit d2e2d806b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/github/libretube/db/dao/WatchPositionDao.kt
View File

@ -1,7 +1,6 @@
package com.github.libretube.db.dao package com.github.libretube.db.dao
import androidx.room.Dao import androidx.room.Dao
import androidx.room.Delete
import androidx.room.Insert import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
@ -16,13 +15,7 @@ interface WatchPositionDao {
suspend fun findById(videoId: String): WatchPosition? suspend fun findById(videoId: String): WatchPosition?
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertAll(vararg watchPositions: WatchPosition) suspend fun insertAll(watchPositions: List<WatchPosition>)
@Delete
suspend fun delete(watchPosition: WatchPosition)
@Query("DELETE FROM watchHistoryItem WHERE videoId = :videoId")
suspend fun deleteById(videoId: String)
@Query("DELETE FROM watchPosition") @Query("DELETE FROM watchPosition")
suspend fun deleteAll() suspend fun deleteAll()

4
app/src/main/java/com/github/libretube/helpers/BackupHelper.kt
View File

@ -48,9 +48,7 @@ object BackupHelper {
Database.watchHistoryDao().insertAll(backupFile.watchHistory.orEmpty()) Database.watchHistoryDao().insertAll(backupFile.watchHistory.orEmpty())
Database.searchHistoryDao().insertAll(backupFile.searchHistory.orEmpty()) Database.searchHistoryDao().insertAll(backupFile.searchHistory.orEmpty())
Database.watchPositionDao().insertAll( Database.watchPositionDao().insertAll(backupFile.watchPositions.orEmpty())
*backupFile.watchPositions.orEmpty().toTypedArray()
)
Database.localSubscriptionDao().insertAll(backupFile.localSubscriptions.orEmpty()) Database.localSubscriptionDao().insertAll(backupFile.localSubscriptions.orEmpty())
Database.customInstanceDao().insertAll(backupFile.customInstances.orEmpty()) Database.customInstanceDao().insertAll(backupFile.customInstances.orEmpty())
Database.playlistBookmarkDao().insertAll( Database.playlistBookmarkDao().insertAll(

2
app/src/main/java/com/github/libretube/services/BackgroundMode.kt
View File

@ -155,7 +155,7 @@ class BackgroundMode : LifecycleService() {
this.streams ?: return@let this.streams ?: return@let
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
Database.watchPositionDao().insertAll(watchPosition) Database.watchPositionDao().insertAll(listOf(watchPosition))
} }
} }
handler.postDelayed(this::updateWatchPosition, 500) handler.postDelayed(this::updateWatchPosition, 500)

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

@ -609,7 +609,7 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
if (!PlayerHelper.watchPositionsVideo) return if (!PlayerHelper.watchPositionsVideo) return
val watchPosition = WatchPosition(videoId!!, exoPlayer.currentPosition) val watchPosition = WatchPosition(videoId!!, exoPlayer.currentPosition)
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
Database.watchPositionDao().insertAll(watchPosition) Database.watchPositionDao().insertAll(listOf(watchPosition))
} }
} }

2
app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt
View File

@ -101,7 +101,7 @@ class VideoOptionsBottomSheet(
getString(R.string.mark_as_watched) -> { getString(R.string.mark_as_watched) -> {
val watchPosition = WatchPosition(videoId, Long.MAX_VALUE) val watchPosition = WatchPosition(videoId, Long.MAX_VALUE)
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
DatabaseHolder.Database.watchPositionDao().insertAll(watchPosition) DatabaseHolder.Database.watchPositionDao().insertAll(listOf(watchPosition))
} }
if (PreferenceHelper.getBoolean(PreferenceKeys.HIDE_WATCHED_FROM_FEED, false)) { if (PreferenceHelper.getBoolean(PreferenceKeys.HIDE_WATCHED_FROM_FEED, false)) {
// get the host fragment containing the current fragment // get the host fragment containing the current fragment