FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix starred items query

This commit is contained in:
Shinokuni 2021-04-16 22:45:40 +02:00
parent 2c2df55970
commit 66844cfaf8
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
db/src/main/java/com/readrops/db/ItemsQueryBuilder.kt
View File

@ -14,10 +14,6 @@ object ItemsQueryBuilder {
private val ITEM_COLUMNS = arrayOf(".id", ".remoteId") private val ITEM_COLUMNS = arrayOf(".id", ".remoteId")
private const val SELECT_ALL_JOIN = "Item INNER JOIN Feed on Item.feed_id = Feed.id " +
"LEFT JOIN Folder on Feed.folder_id = Folder.id LEFT JOIN UnreadItemsIds On " +
"Item.remoteId = UnreadItemsIds.remote_id"
private const val ORDER_BY_ASC = ".id DESC" private const val ORDER_BY_ASC = ".id DESC"
private const val ORDER_BY_DESC = "pub_date ASC" private const val ORDER_BY_DESC = "pub_date ASC"
@ -37,10 +33,13 @@ object ItemsQueryBuilder {
if (filterType == FilterType.FEED_FILTER && filterFeedId == 0) if (filterType == FilterType.FEED_FILTER && filterFeedId == 0)
throw IllegalArgumentException("FeedId must be greater than 0 if current filter is FEED_FILTER") throw IllegalArgumentException("FeedId must be greater than 0 if current filter is FEED_FILTER")
SupportSQLiteQueryBuilder.builder(if (starQuery) SELECT_ALL_JOIN.replace("Item", "StarredItem") else SELECT_ALL_JOIN).run { val tableName = tableName(starQuery)
columns(COLUMNS.plus(buildItemColumns(starQuery))) val selectAllJoin = buildSelectAllJoin(tableName)
SupportSQLiteQueryBuilder.builder(selectAllJoin).run {
columns(COLUMNS.plus(buildItemColumns(tableName)))
selection(buildWhereClause(this@with), null) selection(buildWhereClause(this@with), null)
orderBy(if (sortType == ListSortType.NEWEST_TO_OLDEST) buildOrderByAsc(starQuery) else ORDER_BY_DESC) orderBy(if (sortType == ListSortType.NEWEST_TO_OLDEST) buildOrderByAsc(tableName) else ORDER_BY_DESC)
create() create()
} }
@ -62,18 +61,25 @@ object ItemsQueryBuilder {
toString() toString()
} }
private fun buildItemColumns(starQuery: Boolean): Array<String> { private fun tableName(starQuery: Boolean): String = if (starQuery) "StarredItem" else "Item"
private fun buildItemColumns(tableName: String): Array<String> {
val columns = arrayListOf<String>() val columns = arrayListOf<String>()
for (column in ITEM_COLUMNS) { for (column in ITEM_COLUMNS) {
columns += if (starQuery) "StarredItem$column" else "Item$column" columns += tableName + column
} }
return columns.toTypedArray() return columns.toTypedArray()
} }
private fun buildOrderByAsc(starQuery: Boolean): String = private fun buildOrderByAsc(tableName: String): String = tableName + ORDER_BY_ASC
if (starQuery) "StarredItem$ORDER_BY_ASC" else "Item$ORDER_BY_ASC"
private fun buildSelectAllJoin(tableName: String): String = """
$tableName INNER JOIN Feed on $tableName.feed_id = Feed.id
LEFT JOIN Folder on Feed.folder_id = Folder.id LEFT JOIN UnreadItemsIds On
$tableName.remoteId = UnreadItemsIds.remote_id
""".trimIndent()
} }