FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make synchronization aware of subFilters (Folder/Feed) in TimelineTab

Browse Source 
* Only for local accounts
This commit is contained in:
Shinokuni 2024-03-21 10:54:54 +01:00
parent 32e0c17e08
commit 0aced64faf
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appcompose/src/androidTest/java/com/readrops/app/compose/LocalRSSRepositoryTest.kt
View File

@ -85,7 +85,7 @@ class LocalRSSRepositoryTest : KoinTest {
.setBody(Buffer().readFrom(stream)) .setBody(Buffer().readFrom(stream))
) )
val result = repository.synchronize(null) { val result = repository.synchronize(listOf()) {
assertEquals(it.name, feeds.first().name) assertEquals(it.name, feeds.first().name)
} }

2
appcompose/src/main/java/com/readrops/app/compose/repositories/ARepository.kt
View File

@ -29,7 +29,7 @@ abstract class ARepository(
* and errors per feed if occurred to be transmitted to the user * and errors per feed if occurred to be transmitted to the user
*/ */
abstract suspend fun synchronize( abstract suspend fun synchronize(
selectedFeeds: List<Feed>?, selectedFeeds: List<Feed>,
onUpdate: (Feed) -> Unit onUpdate: (Feed) -> Unit
): Pair<SyncResult, ErrorResult> ): Pair<SyncResult, ErrorResult>

6
appcompose/src/main/java/com/readrops/app/compose/repositories/LocalRSSRepository.kt
View File

@ -27,15 +27,15 @@ class LocalRSSRepository(
} }
override suspend fun synchronize( override suspend fun synchronize(
selectedFeeds: List<Feed>?, selectedFeeds: List<Feed>,
onUpdate: (Feed) -> Unit onUpdate: (Feed) -> Unit
): Pair<SyncResult, ErrorResult> { ): Pair<SyncResult, ErrorResult> {
val errors = mutableMapOf<Feed, Exception>() val errors = mutableMapOf<Feed, Exception>()
val syncResult = SyncResult() val syncResult = SyncResult()
val feeds = if (selectedFeeds.isNullOrEmpty()) { val feeds = selectedFeeds.ifEmpty {
database.newFeedDao().selectFeeds(account.id) database.newFeedDao().selectFeeds(account.id)
} else selectedFeeds }
for (feed in feeds) { for (feed in feeds) {
onUpdate(feed) onUpdate(feed)

14
appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineScreenModel.kt
View File

@ -81,10 +81,20 @@ class TimelineScreenModel(
fun refreshTimeline() { fun refreshTimeline() {
_timelineState.update { it.copy(isRefreshing = true) } _timelineState.update { it.copy(isRefreshing = true) }
screenModelScope.launch(dispatcher) {
repository?.synchronize(null) {
screenModelScope.launch(dispatcher) {
val selectedFeeds = if (currentAccount!!.isLocal) {
when (filters.value.subFilter) {
SubFilter.FEED -> listOf(database.newFeedDao().selectFeed(filters.value.filterFeedId))
SubFilter.FOLDER -> database.newFeedDao().selectFeedsByFolder(filters.value.filterFolderId)
else -> listOf()
} }
} else listOf()
repository?.synchronize(
selectedFeeds = selectedFeeds,
onUpdate = { }
)
_timelineState.update { _timelineState.update {
it.copy( it.copy(

7
db/src/main/java/com/readrops/db/dao/newdao/NewFeedDao.kt
View File

@ -12,8 +12,11 @@ import kotlinx.coroutines.flow.Flow
@Dao @Dao
abstract class NewFeedDao : NewBaseDao<Feed> { abstract class NewFeedDao : NewBaseDao<Feed> {
@Query("Select * From Feed") @Query("Select * From Feed Where id = :feedId")
abstract fun selectFeeds(): Flow<List<Feed>> abstract suspend fun selectFeed(feedId: Int): Feed
@Query("Select * From Feed Where folder_id = :folderId")
abstract suspend fun selectFeedsByFolder(folderId: Int): List<Feed>
@Query("Select * from Feed Where account_id = :accountId order by name ASC") @Query("Select * from Feed Where account_id = :accountId order by name ASC")
abstract suspend fun selectFeeds(accountId: Int): List<Feed> abstract suspend fun selectFeeds(accountId: Int): List<Feed>