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

fix(sync): refactor SyncWorker for robust background sync (#909)

Browse Source 
* feat(sync): sync feeds concurrently

* fix(sync): refactor `SyncWorker` for robust background sync
This commit is contained in:
junkfood 2024-11-27 17:10:03 +09:00 committed by GitHub
parent 4caca8db39
commit 133f196430
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/me/ash/reader/domain/service/AbstractRssRepository.kt
View File

@ -201,39 +201,29 @@ abstract class AbstractRssRepository(
}
fun cancelSync() {
workManager.cancelAllWork()
SyncWorker.cancelPeriodicWork(workManager)
SyncWorker.cancelOneTimeWork(workManager)
}
fun doSyncOneTime() {
workManager.cancelAllWork()
SyncWorker.enqueueOneTimeWork(workManager)
}
suspend fun doSync(isOnStart: Boolean = false) {
workManager.cancelAllWork()
suspend fun initSync() {
accountDao.queryById(context.currentAccountId)?.let {
if (isOnStart) {
if (it.syncOnStart.value) {
SyncWorker.enqueueOneTimeWork(workManager)
}
if (it.syncInterval.value != SyncIntervalPreference.Manually.value) {
SyncWorker.enqueuePeriodicWork(
workManager = workManager,
syncInterval = it.syncInterval,
syncOnlyWhenCharging = it.syncOnlyWhenCharging,
syncOnlyOnWiFi = it.syncOnlyOnWiFi,
)
}
val syncOnStart = it.syncOnStart.value
if (syncOnStart) {
doSyncOneTime()
}
if (it.syncInterval.value != SyncIntervalPreference.Manually.value) {
SyncWorker.enqueuePeriodicWork(
workManager = workManager,
syncInterval = it.syncInterval,
syncOnlyWhenCharging = it.syncOnlyWhenCharging,
syncOnlyOnWiFi = it.syncOnlyOnWiFi,
)
} else {
SyncWorker.enqueueOneTimeWork(workManager)
if (it.syncInterval.value != SyncIntervalPreference.Manually.value) {
SyncWorker.enqueuePeriodicWork(
workManager = workManager,
syncInterval = it.syncInterval,
syncOnlyWhenCharging = it.syncOnlyWhenCharging,
syncOnlyOnWiFi = it.syncOnlyOnWiFi,
)
}
SyncWorker.cancelPeriodicWork(workManager)
}
}
}

33
app/src/main/java/me/ash/reader/domain/service/SyncWorker.kt
View File

@ -33,15 +33,25 @@ class SyncWorker @AssistedInject constructor(
companion object {
private const val IS_SYNCING = "isSyncing"
const val WORK_NAME = "ReadYou"
lateinit var uuid: UUID
private const val WORK_NAME_PERIODIC = "ReadYou"
private const val WORK_NAME_ONETIME = "SYNC_ONETIME"
const val WORK_TAG = "SYNC_TAG"
fun cancelOneTimeWork(workManager: WorkManager) {
workManager.cancelUniqueWork(WORK_NAME_ONETIME)
}
fun cancelPeriodicWork(workManager: WorkManager) {
workManager.cancelUniqueWork(WORK_NAME_PERIODIC)
}
fun enqueueOneTimeWork(
workManager: WorkManager,
) {
workManager.enqueue(OneTimeWorkRequestBuilder<SyncWorker>()
.addTag(WORK_NAME)
.build()
workManager.enqueueUniqueWork(
WORK_NAME_ONETIME,
ExistingWorkPolicy.KEEP,
OneTimeWorkRequestBuilder<SyncWorker>().addTag(WORK_TAG).build()
)
}
@ -52,15 +62,16 @@ class SyncWorker @AssistedInject constructor(
syncOnlyOnWiFi: SyncOnlyOnWiFiPreference,
) {
workManager.enqueueUniquePeriodicWork(
WORK_NAME,
WORK_NAME_PERIODIC,
ExistingPeriodicWorkPolicy.UPDATE,
PeriodicWorkRequestBuilder<SyncWorker>(syncInterval.value, TimeUnit.MINUTES)
.setConstraints(Constraints.Builder()
.setRequiresCharging(syncOnlyWhenCharging.value)
.setRequiredNetworkType(if (syncOnlyOnWiFi.value) NetworkType.UNMETERED else NetworkType.CONNECTED)
.build()
.setConstraints(
Constraints.Builder()
.setRequiresCharging(syncOnlyWhenCharging.value)
.setRequiredNetworkType(if (syncOnlyOnWiFi.value) NetworkType.UNMETERED else NetworkType.CONNECTED)
.build()
)
.addTag(WORK_NAME)
.addTag(WORK_TAG)
.setInitialDelay(syncInterval.value, TimeUnit.MINUTES)
.build()
)

2
app/src/main/java/me/ash/reader/infrastructure/android/AndroidApp.kt
View File

@ -133,7 +133,7 @@ class AndroidApp : Application(), Configuration.Provider {
}
private suspend fun workerInit() {
rssService.get().doSync(isOnStart = true)
rssService.get().initSync()
}
private suspend fun checkUpdate() {

4
app/src/main/java/me/ash/reader/ui/page/home/HomeViewModel.kt
View File

@ -46,11 +46,11 @@ class HomeViewModel @Inject constructor(
private val _filterUiState = MutableStateFlow(FilterState())
val filterUiState = _filterUiState.asStateFlow()
val syncWorkLiveData = workManager.getWorkInfosByTagLiveData(SyncWorker.WORK_NAME)
val syncWorkLiveData = workManager.getWorkInfosByTagLiveData(SyncWorker.WORK_TAG)
fun sync() {
applicationScope.launch(ioDispatcher) {
rssService.get().doSync()
rssService.get().doSyncOneTime()
}
}

2
app/src/main/java/me/ash/reader/ui/page/home/feeds/subscribe/SubscribeViewModel.kt
View File

@ -59,7 +59,7 @@ class SubscribeViewModel @Inject constructor(
fun importFromInputStream(inputStream: InputStream) {
applicationScope.launch {
opmlService.saveToDatabase(inputStream)
rssService.get().doSync()
rssService.get().doSyncOneTime()
}
}

2
app/src/main/java/me/ash/reader/ui/page/home/flow/FlowViewModel.kt
View File

@ -34,7 +34,7 @@ class FlowViewModel @Inject constructor(
fun sync() {
applicationScope.launch(ioDispatcher) {
rssService.get().doSync()
rssService.get().doSyncOneTime()
}
}