diff options
| author | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-09-17 13:58:25 +0200 |
|---|---|---|
| committer | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-09-17 13:58:25 +0200 |
| commit | 9ab6686b98499c745024a474a71e3d99b6e14973 (patch) | |
| tree | 1debf57412d72c6289dd06bd17f0c024a490a3af /internal/engine/apply_test.go | |
| parent | a80d470cbad7335fd5e534f32d935e5a49aadb24 (diff) | |
| download | krino-9ab6686b98499c745024a474a71e3d99b6e14973.tar.gz krino-9ab6686b98499c745024a474a71e3d99b6e14973.zip | |
a chain that deletes itself still gives back the file it displaced
(on-conflict overwrite) trashes the file in the way; §7.4 promises undo
restores it. Walking a file's log entries stopped dead at a permanent
delete, so the displace written earlier in the same chain was never
reached: the user's file stayed in the Trash, the refusal named only
the file they did not care about, and krino log called the run undone.
The displaced file is a different file, so it is offered as its own
entry in the undo plan, keyed by its own path - the deleted file stays
refused, since nothing of it can come back, and the copy or move that
preceded the delete stays unreversed too (undoing a copy whose original
was then deleted would destroy the last remaining copy).
The accounting matched: every reversible step of a deleted file was
subtracted, its displace included, so the run read (undone). Only what
genuinely cannot come back is subtracted now.
End to end, the scenario from the review: the only copy of a file is
displaced by an incoming one that is then permanently deleted.
before: archive/ empty, "(undone)", nothing offered
after: archive/a.pdf restored, run reads partly undone
Diffstat (limited to 'internal/engine/apply_test.go')
| -rw-r--r-- | internal/engine/apply_test.go | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/internal/engine/apply_test.go b/internal/engine/apply_test.go index a6b3185..c832e3a 100644 --- a/internal/engine/apply_test.go +++ b/internal/engine/apply_test.go @@ -1463,3 +1463,82 @@ func TestApplyUndoRetryLogsBothMkdirEntriesAndStillMarksOriginalRunUndone(t *tes t.Errorf("the undo run %q itself must never read as Undone", undoRun) } } + +// TestPermanentDeleteStillRestoresWhatItDisplaced: a chain that overwrites +// and then permanently deletes trashes a file the user owned to make room. +// That file is a different file, and §7.4 promises of it: "move the +// existing target to Trash first (logged, so undo restores it)". Walking +// the file's entries used to stop dead at the permanent delete, so the +// displace was never reached and the user's file stayed in the Trash with +// krino reporting the run fully undone. +func TestPermanentDeleteStillRestoresWhatItDisplaced(t *testing.T) { + // A real trash entry, so the reversal is offered rather than refused + // for a reason that has nothing to do with this test. + h := sandbox(t) + entry := filepath.Join(trash.Dir(), "files", "a.pdf") + if err := os.MkdirAll(filepath.Dir(entry), 0o755); err != nil { + t.Fatal(err) + } + if err := os.WriteFile(entry, []byte("the file that was in the way"), 0o644); err != nil { + t.Fatal(err) + } + fi, err := os.Lstat(entry) + if err != nil { + t.Fatal(err) + } + displaced := filepath.Join(h, "archive", "a.pdf") + info := filepath.Join(trash.Dir(), "info", "a.pdf.trashinfo") + if err := os.MkdirAll(filepath.Dir(info), 0o755); err != nil { + t.Fatal(err) + } + if err := os.WriteFile(info, []byte("[Trash Info]\nPath="+displaced+"\nDeletionDate=2026-09-17T00:00:00\n"), 0o644); err != nil { + t.Fatal(err) + } + ents := []journal.Entry{ + // Chronological, as the log has them: the displace first, then the + // move that needed the name, then the permanent delete. + {Action: "displace", Status: "ok", File: "a.pdf", Dir: "dl", Step: 1, + Src: displaced, Dst: entry, Detail: "a.pdf", + Size: fi.Size(), ModTime: fi.ModTime()}, + {Action: "move", Status: "ok", File: "a.pdf", Dir: "dl", Step: 1, + Src: filepath.Join(h, "dl", "a.pdf"), Dst: displaced}, + {Action: "delete", Status: "ok", File: "a.pdf", Dir: "dl", Step: 2, + Src: displaced}, + } + uf := planUndoFile("dl", "a.pdf", ents, map[journal.ReversedKey]int{}) + if uf.Refused == "" { + t.Error("the permanently deleted file is no longer refused") + } + + rest, ok := displacedUndoFile("dl", ents, map[journal.ReversedKey]int{}) + if !ok { + t.Fatal("the displaced file was not offered for reversal at all") + } + if rest.Refused != "" { + t.Errorf("the displaced file is refused: %q", rest.Refused) + } + if len(rest.Steps) != 1 || rest.Steps[0].Action != "undo-displace" { + t.Fatalf("steps = %+v; want one undo-displace", rest.Steps) + } + if rest.Steps[0].Dst != displaced { + t.Errorf("the reversal puts the file at %q, want %q", rest.Steps[0].Dst, displaced) + } + if rest.File != displaced { + t.Errorf("the offered file is %q, want the displaced file %q", rest.File, displaced) + } +} + +// TestDisplacedFileIsNotOfferedTwice: when the chain's own file is +// reversible, the displace is reversed as one of its steps, as before - +// the separate offer exists only for the file that cannot be reversed. +func TestDisplacedFileIsNotOfferedTwice(t *testing.T) { + ents := []journal.Entry{ + {Action: "displace", Status: "ok", File: "a.pdf", Dir: "dl", Step: 1, + Src: "/archive/a.pdf", Dst: "/trash/files/a.pdf", Detail: "a.pdf"}, + {Action: "move", Status: "ok", File: "a.pdf", Dir: "dl", Step: 1, + Src: "/dl/a.pdf", Dst: "/archive/a.pdf"}, + } + if _, ok := displacedUndoFile("dl", ents, map[journal.ReversedKey]int{}); ok { + t.Error("a reversible chain's displace was offered a second time on its own") + } +} |
