feat(phase-1/m2.3): import dedupe — importing the same file twice adds nothing

Phase 1 M2 task 3 (tools/DESKTOP_PHASE_PLAN.md §4). Logic lives in
BackupBridge so both platforms get it through the one bridge:

- BackupBridge.import gains skipExisting (default true) and returns
  ImportSummary(imported, skipped). A note is skipped when the library
  already holds the key (createdAt, updatedAt, sha256(content)) — the
  triple the export preserves verbatim, trustworthy only since the M2
  import-timestamp fix. Keys are snapshotted BEFORE importing, so two
  genuinely identical notes inside one file still both import into a
  fresh library; only a second import of the same file is a no-op.
  Snapshotted keys include trashed notes. skipExisting=false restores
  the old additive behaviour (the documented override).
- Android: BackupManager.import passes the flag and returns the summary
  (signature-identical call for SettingsViewModel); its snackbar now
  reports the skip count. Screen layouts untouched — exit criterion
  "Android backup screens unchanged" holds.
- Desktop: the import confirm dialog swaps its "duplicates persist"
  warning for a working "Skip notes that are already here" checkbox
  (default ON); scripted path prints the re-import outcome.
- Format unchanged: formatVersion stays 1 (streaming/dedupe-at-format
  level stays a Phase-2 formatVersion=2 idea).

Verification passed: :core:data-jvm:backupSmoke (new step — re-import
skipped=27, override added 27, store=54; RESULT M2 round-trip PASS on
the real export) + :desktopApp:run --args="--data-dir /tmp/incido-m2t3
--backup-import <export> --backup-export … --exit-after 8" (imported=27
skipped=0 → exported=27 → reimport imported=0 skipped=27, clean exit) +
assembleDebug + :core:data-jvm:smoke + :desktopApp:run --self-test —
all green; output recorded in DESKTOP_FEASIBILITY.md.

Known limitation (by design): attachments are not in the key.
This commit is contained in:
Incido Developer committed 2026-10-05 19:33:07 +13:00
1 parent cf0e74b68d
commit 031d8570b4
7 files changed
+138 -21

No files matched your search

@@ -62,14 +62,17 @@ class BackupManager(
* [passphrase] is required (caller validates with
* [PasswordPolicy]).
*
* Returns the number of notes imported.
* [skipExisting] (default true) dedupes on the bridge's
* (createdAt, updatedAt, sha256(content)) key — see
* [BackupBridge.import]. Returns what was imported vs skipped.
*/
suspend fun import(
uri: Uri,
passphrase: CharArray? = null,
skipExisting: Boolean = true,
onProgress: (current: Int, total: Int) -> Unit = { _, _ -> },
): Int = withContext(Dispatchers.IO) {
BackupBridge.import(repository, openInput(uri), passphrase, onProgress)
): ImportSummary = withContext(Dispatchers.IO) {
BackupBridge.import(repository, openInput(uri), passphrase, skipExisting, onProgress)
}
/**
@@ -243,8 +243,12 @@ class SettingsViewModel(
backupManager.preview(uri, passphrase)
suspend fun import(uri: android.net.Uri, passphrase: CharArray? = null) {
val count = backupManager.import(uri, passphrase)
_snackbar.value = "Imported $count note(s)."
val result = backupManager.import(uri, passphrase)
_snackbar.value = if (result.skipped > 0) {
"Imported ${result.imported} note(s), skipped ${result.skipped} already imported."
} else {
"Imported ${result.imported} note(s)."
}
}
/**