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

fix(fever): resolve issue with orphaned articles during sync (#534)

Browse Source
This commit is contained in:
Ash 2024-01-18 09:37:25 +08:00 committed by GitHub
parent 2b43ce2c71
commit f6fd9230a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/me/ash/reader/domain/service/FeverRssService.kt
View File

@ -91,8 +91,8 @@ class FeverRssService @Inject constructor(
* used as the starting mark for the next pull until the number of articles * used as the starting mark for the next pull until the number of articles
* obtained is 0 or their quantity exceeds 250, at which point the pulling process stops. * obtained is 0 or their quantity exceeds 250, at which point the pulling process stops.
* *
* 1. Fetch the Fever groups * 1. Fetch the Fever groups (may need to remove orphaned groups)
* 2. Fetch the Fever feeds (including favicons) * 2. Fetch the Fever feeds (including favicons, may need to remove orphaned feeds)
* 3. Fetch the Fever articles * 3. Fetch the Fever articles
* 4. Synchronize read/unread and starred/un-starred items * 4. Synchronize read/unread and starred/un-starred items
*/ */
@ -106,15 +106,20 @@ class FeverRssService @Inject constructor(
val feverAPI = getFeverAPI() val feverAPI = getFeverAPI()
// 1. Fetch the Fever groups // 1. Fetch the Fever groups
groupDao.insertOrUpdate( val groups = feverAPI.getGroups().groups?.map {
feverAPI.getGroups().groups?.map { Group(
Group( id = accountId.spacerDollar(it.id!!),
id = accountId.spacerDollar(it.id!!), name = it.title ?: context.getString(R.string.empty),
name = it.title ?: context.getString(R.string.empty), accountId = accountId,
accountId = accountId, )
) } ?: emptyList()
} ?: emptyList() groupDao.insertOrUpdate(groups)
) val groupIds = groups.map { it.id }
groupDao.queryAll(accountId).forEach {
if (!groupIds.contains(it.id)) {
super.deleteGroup(it)
}
}
// 2. Fetch the Fever feeds // 2. Fetch the Fever feeds
val feedsBody = feverAPI.getFeeds() val feedsBody = feverAPI.getFeeds()
@ -126,6 +131,11 @@ class FeverRssService @Inject constructor(
} }
} }
} }
feedDao.queryAll(accountId).forEach {
if (!feedsGroupsMap.contains(it.id.dollarLast())) {
super.deleteFeed(it)
}
}
// Fetch the Fever favicons // Fetch the Fever favicons
val faviconsById = feverAPI.getFavicons().favicons?.associateBy { it.id } ?: emptyMap() val faviconsById = feverAPI.getFavicons().favicons?.associateBy { it.id } ?: emptyMap()