v1.0.31: fix remaining sync loop triggers + icon redesign
Three additional fixes found via live device logs: 1. Startup race window: FileObserver fires immediately after startWatching() before catchupScan coroutine runs, starting a 5s debounce with cooldown=0. Fixed by setting a 15s startup cooldown in watchPath() BEFORE calling watchDirRecursive. 2. Stale debounce bypass: debounce job started with cooldown=0 fires 5s later even after catchupScan has already set cooldown and started a catchup sync. Fixed by re-checking cooldown after the 5s delay and aborting if already active. 3. Debounce not cancelled by catchupScan: if a debounce was queued before catchupScan ran, catchupScan would enqueue a catchup sync AND the old debounce would fire 5s later enqueuing a second sync. Fixed by cancelling pending debounce in catchupScan before enqueue. Icon: four thick arcs (blue/red/green/orange) in a 4-way pinwheel with over/under ordering. White sync-arrow circle at center. Pure black background. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -149,6 +149,9 @@ class FileWatchService : Service() {
|
||||
return
|
||||
}
|
||||
fileObservers[pairId] = mutableListOf()
|
||||
// Set startup cooldown BEFORE registering watchers so inotify events that fire
|
||||
// immediately on registration don't trigger the debounce before catchupScan runs.
|
||||
syncCooldownUntil[pairId] = System.currentTimeMillis() + 15_000
|
||||
watchDirRecursive(dir, pairId, wifiOnly, chargingOnly)
|
||||
Timber.d("FileWatchService: watching pair $pairId at $path (${fileObservers[pairId]?.size} dirs)")
|
||||
scope.launch { catchupScan(pairId, dir, wifiOnly, chargingOnly) }
|
||||
@@ -207,7 +210,10 @@ class FileWatchService : Service() {
|
||||
if (hasNew || hasModified || hasDeleted) {
|
||||
Timber.d("FileWatchService: catchup detected changes for pair $pairId, scheduling sync")
|
||||
val pair = syncPairDao.getById(pairId) ?: return
|
||||
// Set cooldown so file writes during this sync don't immediately re-trigger
|
||||
// Cancel any debounce that started before our startup cooldown was set
|
||||
debounceJobs[pairId]?.cancel()
|
||||
debounceJobs.remove(pairId)
|
||||
// Hold cooldown for duration of sync + 60s settle
|
||||
syncCooldownUntil[pairId] = System.currentTimeMillis() + 120_000
|
||||
val req = SyncWorker.buildOneTimeRequest(pairId, wifiOnly, chargingOnly)
|
||||
WorkManager.getInstance(applicationContext)
|
||||
@@ -238,6 +244,12 @@ class FileWatchService : Service() {
|
||||
debounceJobs[pairId]?.cancel()
|
||||
debounceJobs[pairId] = scope.launch {
|
||||
delay(5_000)
|
||||
// Re-check: catchupScan or another path may have already set a cooldown
|
||||
// and handled this sync while we were waiting.
|
||||
if (System.currentTimeMillis() < (syncCooldownUntil[pairId] ?: 0L)) {
|
||||
Timber.d("FileWatchService: debounce fired but cooldown active for pair $pairId, skipping")
|
||||
return@launch
|
||||
}
|
||||
val pair = syncPairDao.getById(pairId)
|
||||
if (pair == null || !pair.isEnabled) return@launch
|
||||
Timber.d("FileWatchService: triggering sync for pair $pairId after debounce")
|
||||
|
||||
Reference in New Issue
Block a user