Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

music: prevent deadlock on no-op refreshes

Browse source 
Fix a regression where the loading process will never stop on a no-op
refresh operation.

This was an oversight made in the redocumentation of the loading
process.
This commit is contained in:
Alexander Capehart 2023-06-24 17:30:56 -06:00
parent 29162820ae
commit 2adb34dffe
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
View file

@ -468,7 +468,7 @@ constructor(
// Note that DeviceLibrary might still actually be doing work (specifically parent // Note that DeviceLibrary might still actually be doing work (specifically parent
// processing), so we don't check if it's deadlocked. // processing), so we don't check if it's deadlocked.
check(!mediaStoreJob.isActive) { "MediaStore discovery is deadlocked" } check(!mediaStoreJob.isActive) { "MediaStore discovery is deadlocked" }
check(!tagJob.isActive) { "Tag extraction is deadlocked" } check(!tagJob.isActive) { "Tag extraction is deadlocked" }
// Deliberately done after the involved initialization step to make it less likely // Deliberately done after the involved initialization step to make it less likely
// that the short-circuit occurs so quickly as to break the UI. // that the short-circuit occurs so quickly as to break the UI.
@ -519,6 +519,12 @@ constructor(
logD("Starting UserLibrary creation") logD("Starting UserLibrary creation")
val userLibrary = userLibraryFactory.create(rawPlaylists, deviceLibrary) val userLibrary = userLibraryFactory.create(rawPlaylists, deviceLibrary)
// Loading process is functionally done, indicate such
logD(
"Successfully indexed music library [device=$deviceLibrary " +
"user=$userLibrary time=${System.currentTimeMillis() - start}]")
emitIndexingCompletion(null)
val deviceLibraryChanged: Boolean val deviceLibraryChanged: Boolean
val userLibraryChanged: Boolean val userLibraryChanged: Boolean
// We want to make sure that all reads and writes are synchronized due to the sheer // We want to make sure that all reads and writes are synchronized due to the sheer
@ -538,11 +544,6 @@ constructor(
this.userLibrary = userLibrary this.userLibrary = userLibrary
} }
// We are finally done. Indicate that loading is no longer occurring, and dispatch the
// results of the loading process to consumers.
logD("Successfully indexed music library [device=$deviceLibrary " +
"user=$userLibrary time=${System.currentTimeMillis() - start}]")
emitIndexingCompletion(null)
// Consumers expect their updates to be on the main thread (notably PlaybackService), // Consumers expect their updates to be on the main thread (notably PlaybackService),
// so switch to it. // so switch to it.
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {