Skip to content

refactor: improve bookmarks performance and reliability #6385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2024
Merged

refactor: improve bookmarks performance and reliability #6385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/java/com/github/libretube/db/dao/PlaylistBookmarkDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ interface PlaylistBookmarkDao {
@Query("SELECT * FROM playlistBookmark")
suspend fun getAll(): List<PlaylistBookmark>

@Query("SELECT * FROM playlistBookmark WHERE playlistId = :playlistId LIMIT 1")
suspend fun findById(playlistId: String): PlaylistBookmark?

@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insert(bookmark: PlaylistBookmark)

Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import com.github.libretube.extensions.ceilHalf
import com.github.libretube.extensions.dpToPx
import com.github.libretube.helpers.NavBarHelper
import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.helpers.ProxyHelper
import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter
import com.github.libretube.ui.adapters.PlaylistsAdapter
import com.github.libretube.ui.base.DynamicLayoutManagerFragment
Expand Down Expand Up @@ -140,7 +141,9 @@ class LibraryFragment : DynamicLayoutManagerFragment() {
private fun initBookmarks() {
lifecycleScope.launch {
val bookmarks = withContext(Dispatchers.IO) {
DatabaseHolder.Database.playlistBookmarkDao().getAll()
DatabaseHolder.Database.playlistBookmarkDao().getAll().map {
it.copy(thumbnailUrl = ProxyHelper.rewriteUrl(it.thumbnailUrl))
}
}

val binding = _binding ?: return@launch
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ class PlaylistFragment : DynamicLayoutManagerFragment() {
if (!isBookmarked) return
withContext(Dispatchers.IO) {
// update the playlist thumbnail and title if bookmarked
val playlistBookmark = DatabaseHolder.Database.playlistBookmarkDao().getAll()
.firstOrNull { it.playlistId == playlistId } ?: return@withContext
val playlistBookmark = DatabaseHolder.Database.playlistBookmarkDao().findById(playlistId)
?: return@withContext
if (playlistBookmark.thumbnailUrl != playlist.thumbnailUrl ||
playlistBookmark.playlistName != playlist.name ||
playlistBookmark.videos != playlist.videos
Expand Down