Repository navigation
Fix: Restore locally deleted files during sync - #258
Merged
Merged
Conversation
pull Bot
pushed a commit
to ben-vargas/supernote-obsidian-plugin
that referenced
this pull request
Sep 22, 2026
runDeviceSync had no direct coverage: the file was deliberately thin and relied on deviceSync.ts's unit tests for the decision logic. The pending restore-deleted-files change (PR philips#258) adds real re-partitioning logic to the orchestration layer, which needs its own tests. Uses an in-memory fake vault plus vi.mock for obsidian (a real TFile class, for the instanceof checks), scanDeviceSupernoteTree, and fetchFromDevice; manifest fixtures are built with the real buildSyncRecord/hashBytes so they stay honest. Covers: - restoring a locally deleted file whose device copy is unchanged (deleted file re-downloaded at the same path, counts, manifest refresh) - restoring into a deleted subfolder (folders recreated) - intact unchanged files left untouched and un-fetched - locally edited unchanged files still flagged as skip-conflict, never clobbered or re-downloaded - a mixed run partitioning each file into exactly one bucket - a failed restore download reported per-file without aborting the run One test is skipped for now: fault isolation when an unchanged vault file can't be read. It encodes the expected per-file degradation, but the re-partition pass calls currentHash() unguarded, so it currently fails with the error escaping runDeviceSync entirely. To be unskipped by the fix in the next commit.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Restore locally deleted files during sync: Previously, if a file's device copy hadn't changed but its vault copy had been deleted, sync would just flag it as unchanged (and potentially log it as a "skip-conflict" candidate) without ever re-downloading it.
This adds a pass after
planSyncthat checks each "unchanged" listing's vault file: if it's missing (currentHashreturnsnull), the listing is moved into thetoSyncset so it gets restored, instead of staying in the drift-check loop where a missing file was never actually recoverable.No changes to
deviceSync.ts's decision logic, this only re-partitionsplanSync's output insyncEngine.tsbefore acting on it.