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

music: reformat

Browse source
This commit is contained in:
Alexander Capehart 2024-08-28 09:21:23 -06:00
parent 66c31f4318
commit e23ac33b85
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/oxycblt/auxio/music/service/MusicBrowser.kt
View file

@ -133,8 +133,7 @@ constructor(
if (query.isEmpty()) { if (query.isEmpty()) {
return mutableListOf() return mutableListOf()
} }
val deviceLibrary = val deviceLibrary = musicRepository.deviceLibrary ?: return mutableListOf()
musicRepository.deviceLibrary ?: return mutableListOf()
val userLibrary = musicRepository.userLibrary ?: return mutableListOf() val userLibrary = musicRepository.userLibrary ?: return mutableListOf()
val items = val items =
SearchEngine.Items( SearchEngine.Items(

19
app/src/main/java/org/oxycblt/auxio/music/service/MusicServiceFragment.kt
View file

@ -18,11 +18,9 @@
package org.oxycblt.auxio.music.service package org.oxycblt.auxio.music.service
import android.content.Context
import android.support.v4.media.MediaBrowserCompat.MediaItem import android.support.v4.media.MediaBrowserCompat.MediaItem
import androidx.media.MediaBrowserServiceCompat import androidx.media.MediaBrowserServiceCompat.Result
import androidx.media.MediaBrowserServiceCompat.BrowserRoot import androidx.media.MediaBrowserServiceCompat.BrowserRoot
import dagger.hilt.android.qualifiers.ApplicationContext
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -30,11 +28,7 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.oxycblt.auxio.ForegroundListener import org.oxycblt.auxio.ForegroundListener
import org.oxycblt.auxio.ForegroundServiceNotification import org.oxycblt.auxio.ForegroundServiceNotification
import org.oxycblt.auxio.R
import org.oxycblt.auxio.music.IndexingState
import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicRepository
import org.oxycblt.auxio.music.MusicSettings
import org.oxycblt.auxio.search.SearchEngine
import org.oxycblt.auxio.util.logD import org.oxycblt.auxio.util.logD
import org.oxycblt.auxio.util.logW import org.oxycblt.auxio.util.logW
@ -72,7 +66,6 @@ constructor(
} }
} }
fun start() { fun start() {
if (musicRepository.indexingState == null) { if (musicRepository.indexingState == null) {
musicRepository.requestIndex(true) musicRepository.requestIndex(true)
@ -85,18 +78,18 @@ constructor(
fun getRoot() = BrowserRoot(Category.ROOT.id, null) fun getRoot() = BrowserRoot(Category.ROOT.id, null)
fun getItem(mediaId: String, result: MediaBrowserServiceCompat.Result<MediaItem>) = fun getItem(mediaId: String, result: Result<MediaItem>) =
result.dispatch { musicBrowser.getItem(mediaId) } result.dispatch { musicBrowser.getItem(mediaId) }
fun getChildren( fun getChildren(
mediaId: String, mediaId: String,
result: MediaBrowserServiceCompat.Result<MutableList<MediaItem>> result: Result<MutableList<MediaItem>>
) = result.dispatch { musicBrowser.getChildren(mediaId)?.toMutableList() } ) = result.dispatch { musicBrowser.getChildren(mediaId)?.toMutableList() }
fun search(query: String, result: MediaBrowserServiceCompat.Result<MutableList<MediaItem>>) = fun search(query: String, result: Result<MutableList<MediaItem>>) =
result.dispatchAsync { musicBrowser.search(query) } result.dispatchAsync { musicBrowser.search(query) }
private fun <T> MediaBrowserServiceCompat.Result<T>.dispatch(body: () -> T?) { private fun <T> Result<T>.dispatch(body: () -> T?) {
try { try {
val result = body() val result = body()
if (result == null) { if (result == null) {
@ -109,7 +102,7 @@ constructor(
} }
} }
private fun <T> MediaBrowserServiceCompat.Result<T>.dispatchAsync(body: suspend () -> T?) { private fun <T> Result<T>.dispatchAsync(body: suspend () -> T?) {
dispatchScope.launch { dispatchScope.launch {
try { try {
detach() detach()