fix: normalize inverted year ranges in album and random song feeds

This commit is contained in:
TapTap committed 2026-11-13 12:49:00 +00:00
1 parent 26d31834a5
commit 628d739d4c
2 files changed
+29 -4

No files matched your search

@@ -274,9 +274,19 @@ object LibraryRepository {
.where { AlbumsTable.id inSubQuery visibleAlbums(folderIds) }
.map { it[AlbumsTable.id] }
// Clients may send the range inverted (e.g. descending by year), so normalize it.
val lowerYear = when {
fromYear != null && toYear != null && fromYear > toYear -> toYear
else -> fromYear
}
val upperYear = when {
fromYear != null && toYear != null && fromYear > toYear -> fromYear
else -> toYear
}
var albums = ids.mapNotNull { albumRecord(it, folderIds, userName) }
if (fromYear != null) albums = albums.filter { (it.year ?: Int.MIN_VALUE) >= fromYear }
if (toYear != null) albums = albums.filter { (it.year ?: Int.MAX_VALUE) <= toYear }
if (lowerYear != null) albums = albums.filter { (it.year ?: Int.MIN_VALUE) >= lowerYear }
if (upperYear != null) albums = albums.filter { (it.year ?: Int.MAX_VALUE) <= upperYear }
if (!genre.isNullOrBlank()) {
albums = albums.filter { album -> album.genres.any { it.equals(genre, ignoreCase = true) } }
}
@@ -323,11 +333,20 @@ object LibraryRepository {
): List<SongRecord> = read {
if (folderIds.isEmpty()) return@read emptyList()
val lowerYear = when {
fromYear != null && toYear != null && fromYear > toYear -> toYear
else -> fromYear
}
val upperYear = when {
fromYear != null && toYear != null && fromYear > toYear -> fromYear
else -> toYear
}
val rows = SongsTable.selectAll()
.where {
(SongsTable.folderId inList folderIds) and
(fromYear?.let { SongsTable.year greaterEq it } ?: Op.TRUE) and
(toYear?.let { SongsTable.year lessEq it } ?: Op.TRUE)
(lowerYear?.let { SongsTable.year greaterEq it } ?: Op.TRUE) and
(upperYear?.let { SongsTable.year lessEq it } ?: Op.TRUE)
}
.toList()
@@ -223,6 +223,12 @@ class BrowsingRoutesTest {
)["albumList2"]!!.jsonObject["album"]!!.jsonArray
assertEquals(1, recent.size)
// Feishin sends an inverted range for descending by-year queries.
val byYear = parseBody(
client.get("/rest/getAlbumList2?$auth&type=byYear&fromYear=2026&toYear=0").bodyAsText(),
)["albumList2"]!!.jsonObject["album"]!!.jsonArray
assertEquals(1, byYear.size)
val genres = parseBody(client.get("/rest/getGenres?$auth").bodyAsText())["genres"]!!
.jsonObject["genre"]!!.jsonArray
assertEquals(listOf("Rock"), genres.map { it.jsonObject["value"]!!.jsonPrimitive.content })