feat: choose Deezer or YouTube Music per mood
- models carry source and externalId instead of videoId - AppCache v3 discards the old shape - source selector in the create dialog, mood settings and search screen - switching source patches the mood and re-runs the search - client requests ten catalog results with a 60s timeout
This commit is contained in:
1 parent
96ab25a91d
commit
3b40726edb
14 files changed
+338
-76
No files matched your search
@@ -38,7 +38,7 @@ class ApiClientTest {
|
||||
)
|
||||
"/api/v1/moods" -> respond(
|
||||
"""
|
||||
{"moods":[{"id":"mo-1","name":"Focus","collectionPercent":60,
|
||||
{"moods":[{"id":"mo-1","name":"Focus","source":"deezer","collectionPercent":60,
|
||||
"recommendationPercent":40,"recommendationCount":10,"refreshHours":24,
|
||||
"createdAt":"now","changedAt":"now","songCount":2,"recommendationReady":3}]}
|
||||
""".trimIndent(),
|
||||
@@ -68,10 +68,10 @@ class ApiClientTest {
|
||||
"/api/v1/search" -> respond(
|
||||
"""
|
||||
{"results":[
|
||||
{"videoId":"v1","title":"Fresh","artist":"Artist","duration":180,
|
||||
"downloaded":false},
|
||||
{"videoId":"v2","title":"Old","artist":"Artist","duration":200,
|
||||
"songId":"sg-2","downloaded":true}
|
||||
{"source":"deezer","externalId":"v1","title":"Fresh","artist":"Artist",
|
||||
"duration":180,"downloaded":false},
|
||||
{"source":"deezer","externalId":"v2","title":"Old","artist":"Artist",
|
||||
"duration":200,"songId":"sg-2","downloaded":true}
|
||||
]}
|
||||
""".trimIndent(),
|
||||
HttpStatusCode.OK,
|
||||
@@ -98,8 +98,9 @@ class ApiClientTest {
|
||||
assertNull(results[0].songId)
|
||||
assertEquals("sg-2", results[1].songId)
|
||||
assertTrue(results[1].downloaded)
|
||||
assertEquals("v2", results[1].externalId)
|
||||
|
||||
val added = client.addSong("mo-1", videoId = "v1")
|
||||
val added = client.addSong("mo-1", source = "deezer", externalId = "v1")
|
||||
assertTrue(added.downloading)
|
||||
assertEquals(1, added.detail.mood.songCount)
|
||||
}
|
||||
@@ -112,8 +113,8 @@ class ApiClientTest {
|
||||
"""
|
||||
{"detail":{"mood":{"id":"mo-1","name":"Focus","createdAt":"now",
|
||||
"changedAt":"now","songCount":2},"songs":[],"recommendations":[]},
|
||||
"recommendation":{"videoId":"v1","title":"Pick","artist":"Artist",
|
||||
"state":"added"}}
|
||||
"recommendation":{"source":"deezer","externalId":"v1","title":"Pick",
|
||||
"artist":"Artist","state":"added"}}
|
||||
""".trimIndent(),
|
||||
HttpStatusCode.OK,
|
||||
jsonHeaders,
|
||||
@@ -122,8 +123,8 @@ class ApiClientTest {
|
||||
"""
|
||||
{"detail":{"mood":{"id":"mo-1","name":"Focus","createdAt":"now",
|
||||
"changedAt":"now","songCount":2},"songs":[],"recommendations":[]},
|
||||
"recommendation":{"videoId":"v2","title":"Other","artist":"Artist",
|
||||
"state":"rejected"}}
|
||||
"recommendation":{"source":"deezer","externalId":"v2","title":"Other",
|
||||
"artist":"Artist","state":"rejected"}}
|
||||
""".trimIndent(),
|
||||
HttpStatusCode.OK,
|
||||
jsonHeaders,
|
||||
@@ -223,6 +224,6 @@ class ApiClientTest {
|
||||
storage.write("mood-cache.json", """{"version":1,"songs":[{"id":"old"}]}""")
|
||||
val invalidated = cache.load()
|
||||
assertTrue(invalidated.moods.isEmpty())
|
||||
assertEquals(2, invalidated.version)
|
||||
assertEquals(3, invalidated.version)
|
||||
}
|
||||
}
|
||||
@@ -111,8 +111,8 @@ class AppStoreTest {
|
||||
"/api/v1/me" -> respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
|
||||
"/api/v1/moods" -> respond("""{"moods":[${moodJson(0)}]}""", HttpStatusCode.OK, jsonHeaders)
|
||||
"/api/v1/search" -> respond(
|
||||
"""{"results":[{"videoId":"v1","title":"Fresh","artist":"Artist",
|
||||
"duration":180,"downloaded":false}]}""",
|
||||
"""{"results":[{"source":"youtube","externalId":"v1","title":"Fresh",
|
||||
"artist":"Artist","duration":180,"downloaded":false}]}""",
|
||||
HttpStatusCode.OK,
|
||||
jsonHeaders,
|
||||
)
|
||||
@@ -133,7 +133,7 @@ class AppStoreTest {
|
||||
advanceTimeBy(350)
|
||||
runCurrent()
|
||||
awaitState { store.state.value.searchResults.isNotEmpty() }
|
||||
assertEquals("v1", store.state.value.searchResults.single().videoId)
|
||||
assertEquals("v1", store.state.value.searchResults.single().externalId)
|
||||
|
||||
store.addSearchResult(store.state.value.searchResults.single())
|
||||
awaitState { store.state.value.message != null }
|
||||
@@ -180,6 +180,54 @@ class AppStoreTest {
|
||||
store.release()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `changing the mood source re-runs the search against the new catalog`() = runTest {
|
||||
val storage = MemoryStorage()
|
||||
val cache = AppCache(storage)
|
||||
cache.saveSession(SessionState("http://music", "token", User("alice", admin = false)))
|
||||
val engine = MockEngine { request ->
|
||||
when {
|
||||
request.url.encodedPath == "/api/v1/me" ->
|
||||
respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
|
||||
request.url.encodedPath == "/api/v1/moods" ->
|
||||
respond("""{"moods":[${moodJson(0)}]}""", HttpStatusCode.OK, jsonHeaders)
|
||||
request.method.value == "PATCH" && request.url.encodedPath == "/api/v1/moods/mo-1" ->
|
||||
respond(detailJson(emptyList(), source = "deezer"), HttpStatusCode.OK, jsonHeaders)
|
||||
request.url.encodedPath == "/api/v1/moods/mo-1" ->
|
||||
respond(detailJson(emptyList()), HttpStatusCode.OK, jsonHeaders)
|
||||
request.url.encodedPath == "/api/v1/moods/mo-1/preview" ->
|
||||
respond("""{"songs":[]}""", HttpStatusCode.OK, jsonHeaders)
|
||||
request.url.encodedPath == "/api/v1/search" -> {
|
||||
val source = request.url.parameters["source"]
|
||||
val body = if (source == "deezer") {
|
||||
"""{"results":[{"source":"deezer","externalId":"67238732",
|
||||
"title":"Instant Crush","artist":"Daft Punk","duration":337,
|
||||
"downloaded":false}]}"""
|
||||
} else {
|
||||
"""{"results":[]}"""
|
||||
}
|
||||
respond(body, HttpStatusCode.OK, jsonHeaders)
|
||||
}
|
||||
else -> respondError(HttpStatusCode.NotFound)
|
||||
}
|
||||
}
|
||||
val store = store(storage, cache, FakePlayer(), engine)
|
||||
runCurrent()
|
||||
store.openMood("mo-1")
|
||||
awaitState { store.state.value.selectedMood != null }
|
||||
store.openSearch("mo-1")
|
||||
store.setSearchQuery("daft")
|
||||
advanceTimeBy(350)
|
||||
runCurrent()
|
||||
|
||||
store.setMoodSource("mo-1", "deezer")
|
||||
awaitState { store.state.value.searchResults.any { it.source == "deezer" } }
|
||||
|
||||
assertEquals("deezer", store.state.value.moods.first { it.id == "mo-1" }.source)
|
||||
assertEquals("67238732", store.state.value.searchResults.single().externalId)
|
||||
store.release()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `sleep timer pauses playback when it expires`() = runTest {
|
||||
val storage = MemoryStorage()
|
||||
@@ -319,31 +367,38 @@ class AppStoreTest {
|
||||
private val jsonHeaders = headersOf(HttpHeaders.ContentType, "application/json")
|
||||
|
||||
private fun songJson(id: String) = """
|
||||
{"id":"$id","videoId":"video-$id","title":"Song $id","artist":"Artist",
|
||||
"album":"Album","duration":180,"bitRate":320,"size":1000,"suffix":"mp3"}
|
||||
{"id":"$id","source":"youtube","externalId":"video-$id","title":"Song $id",
|
||||
"artist":"Artist","album":"Album","duration":180,"bitRate":320,"size":1000,"suffix":"mp3"}
|
||||
""".trimIndent()
|
||||
|
||||
private fun moodJson(songCount: Int) = """
|
||||
{"id":"mo-1","name":"Focus","collectionPercent":50,"recommendationPercent":50,
|
||||
"recommendationCount":10,"refreshHours":24,"createdAt":"2026-01-01T00:00:00Z",
|
||||
"changedAt":"2026-01-01T00:00:00Z","songCount":$songCount}
|
||||
private fun moodJson(songCount: Int, source: String = "youtube") = """
|
||||
{"id":"mo-1","name":"Focus","source":"$source","collectionPercent":50,
|
||||
"recommendationPercent":50,"recommendationCount":10,"refreshHours":24,
|
||||
"createdAt":"2026-01-01T00:00:00Z","changedAt":"2026-01-01T00:00:00Z",
|
||||
"songCount":$songCount}
|
||||
""".trimIndent()
|
||||
|
||||
private fun recommendationJson(state: String = "new", songId: String? = null) = """
|
||||
{"videoId":"v1","title":"Pick","artist":"Artist","duration":180,"state":"$state",
|
||||
{"source":"youtube","externalId":"v1","title":"Pick","artist":"Artist",
|
||||
"duration":180,"state":"$state",
|
||||
${songId?.let { "\"song\":${songJson(it)}," } ?: ""}
|
||||
"firstSeen":"2026-01-01T00:00:00Z","lastSeen":"2026-01-01T00:00:00Z"}
|
||||
""".trimIndent()
|
||||
|
||||
private fun detailJson(songs: List<String>, recommendation: String? = null) = """
|
||||
{"mood":${moodJson(songs.size)},
|
||||
private fun detailJson(
|
||||
songs: List<String>,
|
||||
recommendation: String? = null,
|
||||
source: String = "youtube",
|
||||
) = """
|
||||
{"mood":${moodJson(songs.size, source)},
|
||||
"songs":[${songs.joinToString(",") { """{"song":${songJson(it)},"origin":"search","addedAt":"now"}""" }}],
|
||||
"recommendations":${recommendation?.let { "[$it]" } ?: "[]"}}
|
||||
""".trimIndent()
|
||||
|
||||
private fun song(id: String, duration: Int = 180) = Song(
|
||||
id = id,
|
||||
videoId = "video-$id",
|
||||
source = "youtube",
|
||||
externalId = "video-$id",
|
||||
title = "Song $id",
|
||||
artist = "Artist",
|
||||
album = "Album",
|
||||
|
||||
Reference in new issue
Block a user