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

music: use unlimited buffering in loader

Browse source
This commit is contained in:
Alexander Capehart 2024-11-27 15:18:55 -07:00
parent d52e301751
commit 1b295934e0
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/oxycblt/auxio/music/stack/Indexer.kt
View file

@ -21,6 +21,7 @@ package org.oxycblt.auxio.music.stack
import android.net.Uri import android.net.Uri
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.buffer import kotlinx.coroutines.flow.buffer
@ -65,8 +66,8 @@ constructor(private val explorer: Explorer, private val interpreter: Interpreter
start = { onProgress(IndexingProgress.Songs(0, 0)) }, start = { onProgress(IndexingProgress.Songs(0, 0)) },
end = { onProgress(IndexingProgress.Indeterminate) }) end = { onProgress(IndexingProgress.Indeterminate) })
.flowOn(Dispatchers.IO) .flowOn(Dispatchers.IO)
.buffer() .buffer(Channel.UNLIMITED)
val playlistFiles = files.playlists.flowOn(Dispatchers.IO).buffer() val playlistFiles = files.playlists.flowOn(Dispatchers.IO).buffer(Channel.UNLIMITED)
interpreter.interpret(audioFiles, playlistFiles, interpretation) interpreter.interpret(audioFiles, playlistFiles, interpretation)
} }

7
app/src/main/java/org/oxycblt/auxio/music/stack/explore/Explorer.kt
View file

@ -69,7 +69,7 @@ constructor(
onProgress(IndexingProgress.Songs(loaded, explored)) onProgress(IndexingProgress.Songs(loaded, explored))
} }
.flowOn(Dispatchers.IO) .flowOn(Dispatchers.IO)
.buffer() .buffer(Channel.UNLIMITED)
// val cacheResults = tagCache.read(deviceFiles).flowOn(Dispatchers.IO).buffer() // val cacheResults = tagCache.read(deviceFiles).flowOn(Dispatchers.IO).buffer()
// val (handle, uncachedDeviceFiles, cachedAudioFiles) = tagRead.results() // val (handle, uncachedDeviceFiles, cachedAudioFiles) = tagRead.results()
@ -89,7 +89,7 @@ constructor(
/** Temporarily split a flow into 8 parallel threads and then */ /** Temporarily split a flow into 8 parallel threads and then */
private fun <T, R> Flow<T>.stretch(n: Int, creator: (Flow<T>) -> Flow<R>): Flow<R> { private fun <T, R> Flow<T>.stretch(n: Int, creator: (Flow<T>) -> Flow<R>): Flow<R> {
val posChannels = Array(n) { Channel<T>(Channel.BUFFERED) } val posChannels = Array(n) { Channel<T>(Channel.UNLIMITED) }
val divert: Flow<R> = flow { val divert: Flow<R> = flow {
withIndex().collect { withIndex().collect {
val index = it.index % n val index = it.index % n
@ -99,7 +99,8 @@ constructor(
channel.close() channel.close()
} }
} }
val handle = posChannels.map { creator(it.receiveAsFlow()).buffer() }.asFlow() val handle =
posChannels.map { creator(it.receiveAsFlow()).buffer(Channel.UNLIMITED) }.asFlow()
return merge(divert, handle.flattenMerge()) return merge(divert, handle.flattenMerge())
} }
} }

9
app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt
View file

@ -20,6 +20,7 @@ package org.oxycblt.auxio.music.stack.interpret
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.asFlow
import kotlinx.coroutines.flow.buffer import kotlinx.coroutines.flow.buffer
@ -59,10 +60,14 @@ class InterpreterImpl @Inject constructor(private val preparer: Preparer) : Inte
interpretation: Interpretation interpretation: Interpretation
): MutableLibrary { ): MutableLibrary {
val preSongs = val preSongs =
preparer.prepare(audioFiles, interpretation).flowOn(Dispatchers.Main).buffer() preparer
.prepare(audioFiles, interpretation)
.flowOn(Dispatchers.Main)
.buffer(Channel.UNLIMITED)
val genreLinker = GenreLinker() val genreLinker = GenreLinker()
val genreLinkedSongs = genreLinker.register(preSongs).flowOn(Dispatchers.Main).buffer() val genreLinkedSongs =
genreLinker.register(preSongs).flowOn(Dispatchers.Main).buffer(Channel.UNLIMITED)
val artistLinker = ArtistLinker() val artistLinker = ArtistLinker()
val artistLinkedSongs = val artistLinkedSongs =