From c6901c9c63e312b956e08fa900195d7b13d4351b Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Fri, 13 Nov 2026 22:27:10 +0100 Subject: [PATCH] fix(#147, #411): review round 8 - hand-offs end once claimed, back up only after a real settings change --- .../calendula/data/backup/AutoBackup.kt | 16 ++++++++----- .../calendula/domain/backup/BackupPlan.kt | 4 ++++ .../calendula/ui/calendars/BackupScreen.kt | 8 +++++-- .../ui/calendars/CalendarsViewModel.kt | 24 +++++++++++++++---- .../calendula/domain/backup/BackupPlanTest.kt | 7 ++++++ 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/data/backup/AutoBackup.kt b/app/src/main/java/de/jeanlucmakiola/calendula/data/backup/AutoBackup.kt index 27a3ee73..02977e18 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/data/backup/AutoBackup.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/data/backup/AutoBackup.kt @@ -28,6 +28,7 @@ import de.jeanlucmakiola.calendula.data.ics.IcsExporter import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs import de.jeanlucmakiola.calendula.domain.backup.backupTargets import de.jeanlucmakiola.calendula.domain.backup.planBackupFiles +import de.jeanlucmakiola.calendula.domain.backup.latestHeldElsewhere import de.jeanlucmakiola.calendula.domain.backup.latestLedgerKey import de.jeanlucmakiola.calendula.domain.backup.replacedLatestCopies import de.jeanlucmakiola.calendula.domain.backup.withLedgerEntry @@ -210,21 +211,24 @@ class BackupWorker( val landed = exporter.writeToFolder(folder, listing, latest, bytes) // A provider that renamed it leaves a copy to clean up next // run; the intended name stays ours only if it already was. - val ownsLatest = landed == latest || latest in listing.files || - latest in ledger[latestKey].orEmpty() + val ownsLatest = landed == latest || latest in ledger[latestKey].orEmpty() val current = listOfNotNull(landed, latest.takeIf { ownsLatest }) - record(latestKey, plan.staleLatest + plan.handOff + current) + // A hand-off stays on record only until its new owner claimed it. + suspend fun recordLatest(stale: List) = prefs.updateAutoBackupLedger(folder.toString()) { + val pending = plan.handOff - it.latestHeldElsewhere(target.key) + withLedgerEntry(it, latestKey, stale + pending + current, liveKeys) + } + recordLatest(plan.staleLatest) if (landed == latest) landedLatest += target.key val staleLeft = exporter.deleteFromFolder(listing, plan.staleLatest) - record(latestKey, plan.staleLatest.filter { it in staleLeft } + plan.handOff + current) + recordLatest(plan.staleLatest.filter { it in staleLeft }) } catch (e: Exception) { Log.w(TAG, "Stable copy of one series failed", e) } } } // A layout switch retires the other layout's copies once every new one is there. - val stableCopies = plans.count { it.latestName != null } - if (stableCopies > 0 && landedLatest.size == stableCopies) { + if (landedLatest.size == plans.size) { replacedLatestCopies(targets, prefs.autoBackupLedger.first(), existing).forEach { (key, names) -> withContext(NonCancellable) { val left = exporter.deleteFromFolder(listing, names) diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/domain/backup/BackupPlan.kt b/app/src/main/java/de/jeanlucmakiola/calendula/domain/backup/BackupPlan.kt index dec835d4..cb1085a5 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/domain/backup/BackupPlan.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/domain/backup/BackupPlan.kt @@ -251,6 +251,10 @@ fun withLedgerEntry( return next.filterValues { it.isNotEmpty() } } +/** Stable copies recorded under any series but [key] — a hand-off that has already been claimed. */ +fun BackupLedger.latestHeldElsewhere(key: String): Set = + filterKeys { it.startsWith(LATEST_PREFIX) && it != latestLedgerKey(key) }.values.flatten().toSet() + /** `Work.ics`: the series' stable copy. */ fun latestFileName(baseName: String): String = "$baseName$ICS_EXTENSION" diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/BackupScreen.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/BackupScreen.kt index 39819b50..0c738b42 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/BackupScreen.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/BackupScreen.kt @@ -119,6 +119,7 @@ fun BackupScreen( ) { uri -> uri?.let(viewModel::setAutoBackupFolder) } var showInterval by remember { mutableStateOf(false) } var showBackupCalendars by rememberSaveable { mutableStateOf(false) } + var selectionBefore by remember { mutableStateOf(null) } var showKeep by rememberSaveable { mutableStateOf(false) } val backupFailedText = stringResource(R.string.calendars_backup_failed) @@ -167,7 +168,10 @@ fun BackupScreen( }, onExportPick = { showExportPicker = true }, onEditInterval = { showInterval = true }, - onEditCalendars = { showBackupCalendars = true }, + onEditCalendars = { + selectionBefore = autoBackup.selection + showBackupCalendars = true + }, onEditKeep = { showKeep = true }, ) } @@ -190,7 +194,7 @@ fun BackupScreen( onCheckedChange = viewModel::setAutoBackupCalendar, onDismiss = { showBackupCalendars = false - viewModel.autoBackupCalendarsChosen() + viewModel.autoBackupCalendarsChosen(selectionBefore ?: autoBackup.selection) }, ) } diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt b/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt index fbf49bf7..5ebad9b6 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt @@ -20,6 +20,8 @@ import de.jeanlucmakiola.calendula.domain.ics.IcsWriter import de.jeanlucmakiola.floret.android.stateWhileSubscribed import de.jeanlucmakiola.floret.di.IoDispatcher import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.Job +import kotlinx.coroutines.joinAll import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow @@ -217,12 +219,16 @@ class CalendarsViewModel @Inject constructor( } } + /** Selection writes since the calendar picker opened; the run after it waits for them. */ + private val selectionWrites = mutableListOf() + fun setAutoBackupCalendar(calendar: CalendarSource, included: Boolean) { - viewModelScope.launch { settingsPrefs.setAutoBackupCalendar(calendar, included) } + selectionWrites += viewModelScope.launch { settingsPrefs.setAutoBackupCalendar(calendar, included) } } fun setAutoBackupCombined(combined: Boolean) { viewModelScope.launch { + if (settingsPrefs.autoBackupCombined.first() == combined) return@launch settingsPrefs.setAutoBackupCombined(combined) runBackupIfActive() } @@ -230,14 +236,24 @@ class CalendarsViewModel @Inject constructor( fun setAutoBackupKeep(keep: Int) { viewModelScope.launch { + if (settingsPrefs.autoBackupKeep.first() == keep) return@launch settingsPrefs.setAutoBackupKeep(keep) runBackupIfActive() } } - /** After the calendar choice is closed, back up what is now selected rather than at the next interval. */ - fun autoBackupCalendarsChosen() { - viewModelScope.launch { runBackupIfActive() } + /** + * After the calendar choice is closed, back up what is now selected rather + * than at the next interval — only if it changed, since every run rotates + * an older backup out. + */ + fun autoBackupCalendarsChosen(before: BackupSelection) { + val pending = selectionWrites.toList() + selectionWrites.clear() + viewModelScope.launch { + pending.joinAll() + if (settingsPrefs.autoBackupSelection.first() != before) runBackupIfActive() + } } private suspend fun runBackupIfActive() { diff --git a/app/src/test/java/de/jeanlucmakiola/calendula/domain/backup/BackupPlanTest.kt b/app/src/test/java/de/jeanlucmakiola/calendula/domain/backup/BackupPlanTest.kt index 84a04429..ee9be52e 100644 --- a/app/src/test/java/de/jeanlucmakiola/calendula/domain/backup/BackupPlanTest.kt +++ b/app/src/test/java/de/jeanlucmakiola/calendula/domain/backup/BackupPlanTest.kt @@ -277,4 +277,11 @@ class BackupPlanTest { latestLedgerKey("2"), listOf("Work.ics"), ) } + + @Test + fun `a claimed hand-off shows as held elsewhere`() { + val ledger = mapOf(latestLedgerKey("1") to listOf("Job.ics"), latestLedgerKey("2") to listOf("Work.ics"), "2" to listOf("Work_a.ics")) + assertThat(ledger.latestHeldElsewhere("1")).containsExactly("Work.ics") + assertThat(ledger.latestHeldElsewhere("2")).containsExactly("Job.ics") + } }