fix: normalize inverted year ranges in album and random song feeds
This commit is contained in:
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) }
|
.where { AlbumsTable.id inSubQuery visibleAlbums(folderIds) }
|
||||||
.map { it[AlbumsTable.id] }
|
.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) }
|
var albums = ids.mapNotNull { albumRecord(it, folderIds, userName) }
|
||||||
if (fromYear != null) albums = albums.filter { (it.year ?: Int.MIN_VALUE) >= fromYear }
|
if (lowerYear != null) albums = albums.filter { (it.year ?: Int.MIN_VALUE) >= lowerYear }
|
||||||
if (toYear != null) albums = albums.filter { (it.year ?: Int.MAX_VALUE) <= toYear }
|
if (upperYear != null) albums = albums.filter { (it.year ?: Int.MAX_VALUE) <= upperYear }
|
||||||
if (!genre.isNullOrBlank()) {
|
if (!genre.isNullOrBlank()) {
|
||||||
albums = albums.filter { album -> album.genres.any { it.equals(genre, ignoreCase = true) } }
|
albums = albums.filter { album -> album.genres.any { it.equals(genre, ignoreCase = true) } }
|
||||||
}
|
}
|
||||||
@@ -323,11 +333,20 @@ object LibraryRepository {
|
|||||||
): List<SongRecord> = read {
|
): List<SongRecord> = read {
|
||||||
if (folderIds.isEmpty()) return@read emptyList()
|
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()
|
val rows = SongsTable.selectAll()
|
||||||
.where {
|
.where {
|
||||||
(SongsTable.folderId inList folderIds) and
|
(SongsTable.folderId inList folderIds) and
|
||||||
(fromYear?.let { SongsTable.year greaterEq it } ?: Op.TRUE) and
|
(lowerYear?.let { SongsTable.year greaterEq it } ?: Op.TRUE) and
|
||||||
(toYear?.let { SongsTable.year lessEq it } ?: Op.TRUE)
|
(upperYear?.let { SongsTable.year lessEq it } ?: Op.TRUE)
|
||||||
}
|
}
|
||||||
.toList()
|
.toList()
|
||||||
|
|
||||||
|
|||||||
@@ -223,6 +223,12 @@ class BrowsingRoutesTest {
|
|||||||
)["albumList2"]!!.jsonObject["album"]!!.jsonArray
|
)["albumList2"]!!.jsonObject["album"]!!.jsonArray
|
||||||
assertEquals(1, recent.size)
|
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"]!!
|
val genres = parseBody(client.get("/rest/getGenres?$auth").bodyAsText())["genres"]!!
|
||||||
.jsonObject["genre"]!!.jsonArray
|
.jsonObject["genre"]!!.jsonArray
|
||||||
assertEquals(listOf("Rock"), genres.map { it.jsonObject["value"]!!.jsonPrimitive.content })
|
assertEquals(listOf("Rock"), genres.map { it.jsonObject["value"]!!.jsonPrimitive.content })
|
||||||
|
|||||||
Reference in new issue
Block a user