andras/reconcile
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Simplify change handlers

Browse source
This commit is contained in:
Andras Schmelczer 2024-12-14 15:01:26 +00:00
parent 89156eb270
commit 47e976b0bb
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
5 changed files with 84 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

73
plugin/src/sync-functions/sync-locally-updated-file.ts
View file

@ -1,13 +1,70 @@
import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
import { TFile } from "obsidian";
import { Database } from "src/database/database";
import { Logger } from "src/logger";
import { SyncServer } from "src/services/sync_service";
import { hash } from "src/utils";
import { syncLocallyRenamedFile } from "./sync-locally-renamed-file";
import { hash, isEqualBytes } from "src/utils";
export async function syncLocallyUpdatedFile(
database: Database,
syncServer: SyncServer,
file: TFile
) {
syncLocallyRenamedFile(database, syncServer, file, file.path);
export async function syncLocallyUpdatedFile({
database,
syncServer,
file,
oldPath,
}: {
database: Database;
syncServer: SyncServer;
file: TFile;
oldPath?: string;
}) {
const contentBytes = new Uint8Array(await file.vault.readBinary(file));
const contentHash = hash(contentBytes);
const metadata = database.getDocument(oldPath || file.path);
if (!metadata) {
Logger.getInstance().info(
`Document metadata not found for ${
oldPath || file.path
}, it must be new`
);
} else if (metadata.hash === contentHash) {
Logger.getInstance().info(
`Document hash matches, no need to sync ${file.path}`
);
return;
}
const response = await syncServer.put({
parentVersionId: metadata?.parentVersionId,
relativePath: file.path,
contentBytes,
createdDate: new Date(file.stat.ctime),
});
const localDbUpdatePromise = database.moveDocument({
oldRelativePath: oldPath || file.path,
relativePath: file.path,
parentVersionId: response.versionId,
hash: contentHash,
});
if (file.path !== response.relativePath) {
await file.vault.rename(file, response.relativePath);
}
const newContentBytes = new Uint8Array(await file.vault.readBinary(file));
const responseBytes = lib.base64_to_bytes(response.contentBase64);
if (!isEqualBytes(contentBytes, newContentBytes)) {
Logger.getInstance().info(
`Content changed since sending original update request for ${file.path}`
);
const result = lib.merge(contentBytes, newContentBytes, responseBytes);
await file.vault.modifyBinary(file, result);
} else {
await file.vault.modifyBinary(file, responseBytes);
}
await localDbUpdatePromise;
}