Skip to content

Updated boolean for non-deletion cases in SyncManager determineSyncActions method #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
esmodea wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Updated boolean for non-deletion cases in SyncManager determineSyncActions method #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
698c303
Updated boolean for non-deletion cases in SyncManager determineSyncAc…
esmodea Sep 18, 2025
afbd7a3
Fixed type errors
esmodea Sep 18, 2025
152b36f
Removed unneeded boolean logic that caused files not to be downloaded…
esmodea Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mock-obsidian.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export function arrayBufferToBase64(buffer: ArrayBuffer): string {
}

export function base64ToArrayBuffer(base64: string): ArrayBuffer {
return Buffer.from(base64, "base64");
return Buffer.from(base64, "base64").buffer;
}

// Mock Event reference
Expand Down
8 changes: 4 additions & 4 deletions src/sync-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ export default class SyncManager {
}

const normalizedPath = normalizePath(targetPath);
await this.vault.adapter.writeBinary(normalizedPath, data);
await this.vault.adapter.writeBinary(normalizedPath, data.buffer);
await this.logger.info("Written file", {
normalizedPath,
});
Expand Down Expand Up @@ -724,12 +724,12 @@ export default class SyncManager {
}
}

// For non-deletion cases, if SHAs differ, we just need to check if local changed.
// For non-deletion cases, if SHAs differ, we need to check if local changed and what file was modified last
// Conflicts are already filtered out so we can make this decision easily
if (localSHA !== localFile.sha) {
if (localSHA !== localFile.sha && remoteFile.lastModified < localFile.lastModified) {
actions.push({ type: "upload", filePath: filePath });
return;
} else {
} else if(remoteFile.lastModified > localFile.lastModified) {
actions.push({ type: "download", filePath: filePath });
return;
}
Expand Down