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

musikr: cleanup

Browse source
This commit is contained in:
Alexander Capehart 2025-01-21 09:30:42 -07:00
parent 3eac245aea
commit 3a12c4dc25
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
musikr/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt
View file

@ -54,7 +54,7 @@ private class ExtractStepImpl(
override fun extract(nodes: Flow<Explored.New>): Flow<Extracted> { override fun extract(nodes: Flow<Explored.New>): Flow<Extracted> {
val newSongs = nodes.filterIsInstance<NewSong>() val newSongs = nodes.filterIsInstance<NewSong>()
val handles: Flow<ExtractedInternal.Pre> = val handles =
newSongs newSongs
.tryMap { .tryMap {
val handle = metadataExtractor.open(it.file) val handle = metadataExtractor.open(it.file)
@ -63,7 +63,7 @@ private class ExtractStepImpl(
.flowOn(Dispatchers.IO) .flowOn(Dispatchers.IO)
.buffer(Channel.UNLIMITED) .buffer(Channel.UNLIMITED)
val extracted: Flow<ExtractedInternal.Post> = val extracted =
handles handles
.tryMap { item -> .tryMap { item ->
when (item) { when (item) {
@ -88,11 +88,11 @@ private class ExtractStepImpl(
} }
} }
val validSongs = validDiversion.right val success = validDiversion.right
val invalidSongs = validDiversion.left val failed = validDiversion.left
val parsed = val parsed =
validSongs success
.tryMap { item -> .tryMap { item ->
val tags = tagParser.parse(item.song.file, item.metadata) val tags = tagParser.parse(item.song.file, item.metadata)
val cover = item.metadata.cover?.let { storedCovers.write(it) } val cover = item.metadata.cover?.let { storedCovers.write(it) }
@ -114,9 +114,9 @@ private class ExtractStepImpl(
.buffer(Channel.UNLIMITED) .buffer(Channel.UNLIMITED)
} }
val invalid = invalidSongs.map { InvalidSong } val invalidSongs = failed.map { InvalidSong }
return merge(validDiversion.manager, writeDistribution.manager, *writtenSongs, invalid) return merge(validDiversion.manager, writeDistribution.manager, *writtenSongs, invalidSongs)
} }
private sealed interface ExtractedInternal { private sealed interface ExtractedInternal {