Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Android Auto plays the list on from a list song when an audio-source extension is on (its songs and name go to the player instead of the song alone and its radio), and the CLI's play with a context hands over the list's songs too and says how many
kota-zo4d0f880199fe
diff --git a/base/app/src/main/java/com/music/spotui/cli/CliReceiver.kt b/base/app/src/main/java/com/music/spotui/cli/CliReceiver.ktindex 5e947cf8..fc1f3f2d 100644--- a/base/app/src/main/java/com/music/spotui/cli/CliReceiver.kt+++ b/base/app/src/main/java/com/music/spotui/cli/CliReceiver.kt@@ -6,6 +6,9 @@ import android.content.Intentimport android.util.Logimport app.myspoti.extensions.ExtensionPackageimport app.myspoti.host.android.MyspotiRuntime+import com.music.spotui.data.api.Response+import com.music.spotui.data.entity.ContextPageModel+import com.music.spotui.di.Graphimport com.music.spotui.di.SongPlayerimport com.music.spotui.extensions.Extensionsimport com.music.spotui.extensions.Grants@@ -13,8 +16,10 @@ import kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.SupervisorJobimport kotlinx.coroutines.flow.MutableSharedFlow+import kotlinx.coroutines.flow.firstimport kotlinx.coroutines.launchimport kotlinx.coroutines.withContext+import kotlinx.coroutines.withTimeoutOrNullimport kotlinx.serialization.json.Jsonimport kotlinx.serialization.json.JsonArrayimport kotlinx.serialization.json.JsonElement@@ -194,7 +199,17 @@ class CliReceiver : BroadcastReceiver() {put("bytes", values.entries.sumOf { it.key.length + it.value.length })}}- is CliCommand.Play -> onMain { SongPlayer.playSong(c.uri, contextUri = c.context); JsonNull }+ is CliCommand.Play -> {+ // With a context, its songs too, as Android Auto and the phone give them: an audio-source+ // extension plays the list on from the song, under its name. `songs` says how many were read (0: none).+ val page = c.context?.let { pageOf(it) }+ val songs = page?.tracks?.takeIf { it.isNotEmpty() }+ onMain {+ page?.let { SongPlayer.registerContextName(it.uri, it.name) }+ SongPlayer.playSong(c.uri, contextUri = c.context, songs = songs)+ }+ if (c.context == null) JsonNull else buildJsonObject { put("songs", songs?.size ?: 0) }+ }CliCommand.Pause -> onMain { SongPlayer.pause(by = "cli"); JsonNull }CliCommand.Resume -> onMain { SongPlayer.play(by = "cli"); JsonNull }CliCommand.Next -> onMain { SongPlayer.next(); JsonNull }@@ -219,6 +234,20 @@ class CliReceiver : BroadcastReceiver() {return CliMask.knownSecrets(m?.settings.orEmpty(), Extensions.settingValues(id), Extensions.storageValues(id))}+ /** The playlist, album or Liked Songs [uri] as its first answer gives it; null when it cannot be read. */+ private suspend fun pageOf(uri: String): ContextPageModel? {+ val api = Graph.api+ val id = uri.substringAfterLast(':')+ val flow = when {+ uri.startsWith("spotify:album:") -> api.getAlbumPage(id)+ uri == "spotify:collection:tracks" -> api.getLikedPage()+ uri.startsWith("spotify:playlist:") -> api.getPlaylistPage(id)+ else -> return null+ }+ val first = runCatching { withTimeoutOrNull(READ_MS) { flow.first { it !is Response.Loading } } }.getOrNull()+ return (first as? Response.Success)?.data+ }+private suspend fun <T> onMain(block: () -> T): T = withContext(Dispatchers.Main) { block() }companion object {@@ -227,6 +256,9 @@ class CliReceiver : BroadcastReceiver() {/** The error of a command this build does not have (tools/myspoti-cli exits with 5 on it). */const val DISABLED = "disabled in this build"+ /** How long `play` waits for its context's songs (Android Auto's own wait), within the CLI's 40 s. */+ private const val READ_MS = 15_000L+/** Debug and beta builds; the manifest leaves the receiver off in the others too. */val enabled: Boolean get() = app.myspoti.engine.BuildConfig.DEBUG || com.music.spotui.data.api.UpdateChecker.isBetadiff --git a/base/app/src/main/java/com/music/spotui/di/AutoBrowser.kt b/base/app/src/main/java/com/music/spotui/di/AutoBrowser.ktindex d42b2eff..67483e6b 100644--- a/base/app/src/main/java/com/music/spotui/di/AutoBrowser.kt+++ b/base/app/src/main/java/com/music/spotui/di/AutoBrowser.kt@@ -314,9 +314,12 @@ object AutoBrowser {}if (page != null) {Graph.currentSongState.updateQueue(page.tracks)+ SongPlayer.registerContextName(page.uri, page.name)if (page.type == "liked") SongPlayer.registerLikedSongs(page.tracks.map { it.url })}- SongPlayer.playSong(key, contextUri = contextUri)+ // The list's songs: an audio-source extension then plays the list on from the song, as on+ // the phone, instead of the song alone and its radio. Spotify plays the context anyway.+ SongPlayer.playSong(key, contextUri = contextUri, songs = page?.tracks)song?.let { Graph.currentSongState.updateSongState(it.coverUri, it.title, it.singer, true, it.id, 0, it.album) }}