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

Try with not using adapter

Browse source
This commit is contained in:
Andras Schmelczer 2025-01-08 21:55:27 +00:00
parent b93e2c7c83
commit 1566197b60
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
plugin/src/file-operations/obsidian-file-operations.ts
View file

@ -1,4 +1,4 @@
import type { Vault } from "obsidian";
import { TFile, Vault } from "obsidian";
import { normalizePath } from "obsidian";
import type { FileOperations } from "./file-operations";
import type { RelativePath } from "src/database/document-metadata";
@ -25,7 +25,7 @@ export class ObsidianFileOperations implements FileOperations {
await sleep(1000);
const result = new Uint8Array(
await this.vault.adapter.readBinary(normalizePath(path))
await this.vault.readBinary(this.getAbstractFile(path))
);
console.log("after readBinary");
await sleep(1000);
@ -61,7 +61,7 @@ export class ObsidianFileOperations implements FileOperations {
}
await this.createParentDirectories(normalizePath(path));
await this.vault.adapter.writeBinary(normalizePath(path), newContent);
await this.vault.createBinary(normalizePath(path), newContent);
console.log("after create2");
await sleep(1000);
}
@ -77,26 +77,21 @@ export class ObsidianFileOperations implements FileOperations {
}
if (isBinary(expectedContent)) {
await this.vault.adapter.writeBinary(
normalizePath(path),
newContent
);
await this.vault.createBinary(normalizePath(path), newContent);
return newContent;
}
const expetedText = new TextDecoder().decode(expectedContent);
const newText = new TextDecoder().decode(newContent);
const resultText = await this.vault.adapter.process(
normalizePath(path),
(currentText) => {
if (currentText !== expetedText) {
return mergeText(expetedText, currentText, newText);
}
return newText;
const file = this.getAbstractFile(path);
const resultText = await this.vault.process(file, (currentText) => {
if (currentText !== expetedText) {
return mergeText(expetedText, currentText, newText);
}
);
return newText;
});
return new TextEncoder().encode(resultText);
}
@ -132,4 +127,17 @@ export class ObsidianFileOperations implements FileOperations {
}
}
}
private getAbstractFile(path: RelativePath): TFile {
const file = this.vault.getAbstractFileByPath(path);
if (!file) {
throw new Error(`File not found: ${path}`);
}
if (file instanceof TFile) {
return file;
}
throw new Error(`Not a file: ${path}`);
}
}