feat: mix mood radio by seed percentage and embed download artwork
Moods now store a seedPercent (0-100, default 50). RadioService rolls that share independently for every queued slot: heads picks from the seed songs, tails from the generated recommendation pool. When one pool is empty the other fills the batch, so a mood never stalls. The DTO exposes both seedPercent and the derived recommendationPercent, and create/patch accept seedPercent. Automatic YT downloads now embed the video thumbnail as MP3 cover art so the scanner publishes a cover for newly imported tracks. V7 adds moods.seed_percent.
This commit is contained in:
1 parent
dd7bbde84d
commit
c75f2971b4
11 files changed
+146
-6
No files matched your search
@@ -99,6 +99,8 @@ data class MoodDto(
|
||||
val query: String? = null,
|
||||
val genres: List<String> = emptyList(),
|
||||
val targetSize: Int,
|
||||
val seedPercent: Int,
|
||||
val recommendationPercent: Int,
|
||||
val refreshHours: Int,
|
||||
val ytEnabled: Boolean,
|
||||
val lastDiscoveryAt: String? = null,
|
||||
@@ -116,6 +118,8 @@ fun MoodRecord.toDto(): MoodDto = MoodDto(
|
||||
query = query,
|
||||
genres = genres,
|
||||
targetSize = targetSize,
|
||||
seedPercent = seedPercent,
|
||||
recommendationPercent = 100 - seedPercent,
|
||||
refreshHours = refreshHours,
|
||||
ytEnabled = ytEnabled,
|
||||
lastDiscoveryAt = lastDiscoveryAt,
|
||||
@@ -150,6 +154,8 @@ data class CreateMoodRequest(
|
||||
val refreshHours: Int = 24,
|
||||
val ytEnabled: Boolean = true,
|
||||
val seedSongIds: List<String> = emptyList(),
|
||||
/** Share of each batch that comes from the seed songs; the rest is recommended. */
|
||||
val seedPercent: Int = 50,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
@@ -163,6 +169,7 @@ data class UpdateMoodRequest(
|
||||
val targetSize: Int? = null,
|
||||
val refreshHours: Int? = null,
|
||||
val ytEnabled: Boolean? = null,
|
||||
val seedPercent: Int? = null,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
|
||||
@@ -68,6 +68,7 @@ fun Route.moodRoutes(
|
||||
refreshHours = request.refreshHours,
|
||||
ytEnabled = request.ytEnabled,
|
||||
seedSongIds = seedIds,
|
||||
seedPercent = request.seedPercent,
|
||||
)
|
||||
call.respond(HttpStatusCode.Created, detail(mood, user, library))
|
||||
}
|
||||
@@ -104,6 +105,7 @@ fun Route.moodRoutes(
|
||||
targetSize = request.targetSize ?: mood.targetSize,
|
||||
refreshHours = request.refreshHours ?: mood.refreshHours,
|
||||
ytEnabled = request.ytEnabled ?: mood.ytEnabled,
|
||||
seedPercent = request.seedPercent ?: mood.seedPercent,
|
||||
) ?: notFound("Mood")
|
||||
|
||||
call.respond(detail(updated, user, library))
|
||||
|
||||
@@ -26,6 +26,7 @@ data class MoodRecord(
|
||||
val query: String?,
|
||||
val genres: List<String>,
|
||||
val targetSize: Int,
|
||||
val seedPercent: Int = 50,
|
||||
val refreshHours: Int,
|
||||
val ytEnabled: Boolean,
|
||||
val lastDiscoveryAt: String?,
|
||||
@@ -99,6 +100,7 @@ object MoodRepository {
|
||||
refreshHours: Int,
|
||||
ytEnabled: Boolean,
|
||||
seedSongIds: List<String>,
|
||||
seedPercent: Int = 50,
|
||||
): MoodRecord = transaction {
|
||||
val now = Instant.now().toString()
|
||||
val id = IdGenerator.moodId(owner, name, now)
|
||||
@@ -111,6 +113,7 @@ object MoodRepository {
|
||||
it[MoodsTable.query] = query?.trim()?.takeIf(String::isNotEmpty)
|
||||
it[MoodsTable.genres] = encodeGenres(genres)
|
||||
it[MoodsTable.targetSize] = targetSize.coerceIn(5, 500)
|
||||
it[MoodsTable.seedPercent] = seedPercent.coerceIn(0, 100)
|
||||
it[MoodsTable.refreshHours] = refreshHours.coerceIn(1, 720)
|
||||
it[MoodsTable.ytEnabled] = ytEnabled
|
||||
it[createdAt] = now
|
||||
@@ -134,6 +137,7 @@ object MoodRepository {
|
||||
targetSize: Int,
|
||||
refreshHours: Int,
|
||||
ytEnabled: Boolean,
|
||||
seedPercent: Int = 50,
|
||||
): MoodRecord? = transaction {
|
||||
val exists = MoodsTable.selectAll()
|
||||
.where { (MoodsTable.id eq id) and (MoodsTable.owner eq owner) }
|
||||
@@ -146,6 +150,7 @@ object MoodRepository {
|
||||
it[MoodsTable.query] = query?.trim()?.takeIf(String::isNotEmpty)
|
||||
it[MoodsTable.genres] = encodeGenres(genres)
|
||||
it[MoodsTable.targetSize] = targetSize.coerceIn(5, 500)
|
||||
it[MoodsTable.seedPercent] = seedPercent.coerceIn(0, 100)
|
||||
it[MoodsTable.refreshHours] = refreshHours.coerceIn(1, 720)
|
||||
it[MoodsTable.ytEnabled] = ytEnabled
|
||||
it[changedAt] = Instant.now().toString()
|
||||
@@ -430,6 +435,7 @@ object MoodRepository {
|
||||
query = row[MoodsTable.query],
|
||||
genres = decodeGenres(row[MoodsTable.genres]),
|
||||
targetSize = row[MoodsTable.targetSize],
|
||||
seedPercent = row[MoodsTable.seedPercent],
|
||||
refreshHours = row[MoodsTable.refreshHours],
|
||||
ytEnabled = row[MoodsTable.ytEnabled],
|
||||
lastDiscoveryAt = row[MoodsTable.lastDiscoveryAt],
|
||||
|
||||
@@ -147,6 +147,7 @@ object MoodsTable : Table("moods") {
|
||||
val query = text("query").nullable()
|
||||
val genres = text("genres").default("[]")
|
||||
val targetSize = integer("target_size").default(30)
|
||||
val seedPercent = integer("seed_percent").default(50)
|
||||
val refreshHours = integer("refresh_hours").default(24)
|
||||
val ytEnabled = bool("yt_enabled").default(true)
|
||||
val lastDiscoveryAt = varchar("last_discovery_at", 40).nullable()
|
||||
|
||||
@@ -24,6 +24,9 @@ class YtDlpDownloader(
|
||||
"--audio-quality",
|
||||
"0",
|
||||
"--embed-metadata",
|
||||
"--embed-thumbnail",
|
||||
"--convert-thumbnails",
|
||||
"jpg",
|
||||
"--no-playlist",
|
||||
"--no-cache-dir",
|
||||
"--no-progress",
|
||||
|
||||
@@ -30,10 +30,11 @@ data class StartedSession(
|
||||
* session are never repeated. The client asks for more whenever its buffer is
|
||||
* low, so the queue is always generated with the latest signals.
|
||||
*/
|
||||
class RadioService {
|
||||
class RadioService(
|
||||
private val random: Random = Random.Default,
|
||||
) {
|
||||
|
||||
private val log = LoggerFactory.getLogger(RadioService::class.java)
|
||||
private val random = Random.Default
|
||||
|
||||
fun start(
|
||||
mood: MoodRecord,
|
||||
@@ -166,7 +167,14 @@ class RadioService {
|
||||
)
|
||||
}
|
||||
|
||||
val picks = pickDiverse(scored, limit)
|
||||
val seedScored = scored.filter { (song, _) -> song.id in seedIds }
|
||||
val recommendationScored = scored.filter { (song, _) -> song.id !in seedIds }
|
||||
val picks = pickMixed(
|
||||
seedScored = seedScored,
|
||||
recommendationScored = recommendationScored,
|
||||
limit = limit,
|
||||
seedPercent = mood.seedPercent,
|
||||
)
|
||||
if (persist && sessionId != null && picks.isNotEmpty()) {
|
||||
RadioRepository.append(sessionId, picks.map { it.id })
|
||||
}
|
||||
@@ -195,6 +203,60 @@ class RadioService {
|
||||
return score
|
||||
}
|
||||
|
||||
/**
|
||||
* Picks a batch with the mood's requested seed share. Each slot rolls the
|
||||
* percentage independently, so a 70% mood gets roughly seven seed tracks in
|
||||
* ten. An exhausted pool falls back to the other one instead of stalling.
|
||||
*/
|
||||
internal fun pickMixed(
|
||||
seedScored: List<Pair<SongRecord, Double>>,
|
||||
recommendationScored: List<Pair<SongRecord, Double>>,
|
||||
limit: Int,
|
||||
seedPercent: Int,
|
||||
artistSpacing: Int = 2,
|
||||
albumSpacing: Int = 3,
|
||||
): List<SongRecord> {
|
||||
val seeds = seedScored
|
||||
.sortedByDescending { it.second }
|
||||
.toMutableList()
|
||||
val recommendations = recommendationScored
|
||||
.sortedByDescending { it.second }
|
||||
.toMutableList()
|
||||
val percent = seedPercent.coerceIn(0, 100)
|
||||
val picked = ArrayList<SongRecord>(limit)
|
||||
val artists = ArrayDeque<String>()
|
||||
val albums = ArrayDeque<String>()
|
||||
|
||||
while (picked.size < limit && (seeds.isNotEmpty() || recommendations.isNotEmpty())) {
|
||||
val preferSeed = when {
|
||||
seeds.isEmpty() -> false
|
||||
recommendations.isEmpty() -> true
|
||||
else -> random.nextInt(100) < percent
|
||||
}
|
||||
val pool = if (preferSeed) seeds else recommendations
|
||||
val song = pool.removeAt(diverseIndex(pool, artists, albums)).first
|
||||
picked += song
|
||||
|
||||
artists.addLast(song.displayArtist)
|
||||
if (artists.size > artistSpacing) artists.removeFirst()
|
||||
albums.addLast(song.albumId)
|
||||
if (albums.size > albumSpacing) albums.removeFirst()
|
||||
}
|
||||
return picked
|
||||
}
|
||||
|
||||
private fun diverseIndex(
|
||||
pool: List<Pair<SongRecord, Double>>,
|
||||
artists: ArrayDeque<String>,
|
||||
albums: ArrayDeque<String>,
|
||||
): Int {
|
||||
var index = pool.indexOfFirst { (song, _) ->
|
||||
song.displayArtist !in artists && song.albumId !in albums
|
||||
}
|
||||
if (index < 0) index = pool.indexOfFirst { (song, _) -> song.displayArtist !in artists }
|
||||
return if (index < 0) 0 else index
|
||||
}
|
||||
|
||||
/**
|
||||
* Picks the best remaining candidate while keeping artists and albums apart.
|
||||
* An artist may return after [artistSpacing] other tracks, an album after
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
-- Share of each radio batch that should come from the mood's seed songs.
|
||||
-- The rest is filled from the generated recommendation pool.
|
||||
ALTER TABLE moods ADD COLUMN seed_percent INTEGER NOT NULL DEFAULT 50;
|
||||
Reference in new issue
Block a user