Louvorg/ReaderForSelfoss-multiplatform
Louvorg/ReaderForSelfoss-multiplatform
3
2
Fork 2
Code Issues 16 Pull Requests Actions 1 Projects 1 Releases 68 Wiki Activity

Rearrange filtering steps
All checks were successful
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
davidoskky 2022-10-11 00:52:12 +02:00
parent d0a982f385
commit 02098a7aa9
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt
View File

@ -66,16 +66,19 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
} else {
if (appSettingsService.isItemCachingEnabled()) {
fromDB = true
val dbItems = getDBItems().filter {
displayedItems == ItemType.ALL ||
(it.unread && displayedItems == ItemType.UNREAD) ||
(it.starred && displayedItems == ItemType.STARRED)
}
if (tagFilter != null) {
dbItems.filter { it.tags.contains(tagFilter!!.tag) }
}
if (sourceFilter != null) {
dbItems.filter { it.sourcetitle == sourceFilter!!.title }
}
fetchedItems = SelfossModel.StatusAndData.succes(
getDBItems().filter {
displayedItems == ItemType.ALL ||
(it.unread && displayedItems == ItemType.UNREAD) ||
(it.starred && displayedItems == ItemType.STARRED)
}.filter {
tagFilter == null || it.tags.contains(tagFilter!!.tag)
}.filter {
sourceFilter == null || it.sourcetitle == sourceFilter!!.title
}.map { it.toView() }
dbItems.map { it.toView() }
)
}
}