mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-03-30 05:35:16 +00:00
### Fixed
- Now no chunk creation errors will be raised after switching `Compute revisions for chunks`.
- Some invisible file can be handled correctly (e.g., `writing-goals-history.csv`).
- Fetching configuration from the server is now saves the configuration immediately (if we are not in the wizard).
### Improved
- Mismatched configuration dialogue is now more informative, and rewritten to more user-friendly.
- Applying configuration mismatch is now without rebuilding (at our own risks).
- Now, rebuilding is decided more fine grained.
### Improved internally
- Translations can be nested. i.e., task:`Some procedure`, check: `%{task} checking`, checkfailed: `%{check} failed` produces `Some procedure checking failed`.
226 lines
8.8 KiB
TypeScript
226 lines
8.8 KiB
TypeScript
import { type App, TFile, type DataWriteOptions, TFolder, TAbstractFile } from "../../../deps.ts";
|
|
import { serialized } from "../../../lib/src/concurrency/lock.ts";
|
|
import { Logger } from "../../../lib/src/common/logger.ts";
|
|
import { isPlainText } from "../../../lib/src/string_and_binary/path.ts";
|
|
import type { FilePath, HasSettings, UXFileInfoStub } from "../../../lib/src/common/types.ts";
|
|
import { createBinaryBlob, isDocContentSame } from "../../../lib/src/common/utils.ts";
|
|
import type { InternalFileInfo } from "../../../common/types.ts";
|
|
import { markChangesAreSame } from "../../../common/utils.ts";
|
|
import { type UXFileInfo } from "../../../lib/src/common/types.ts";
|
|
|
|
function getFileLockKey(file: TFile | TFolder | string | UXFileInfo) {
|
|
return `fl:${typeof file == "string" ? file : file.path}`;
|
|
}
|
|
function toArrayBuffer(arr: Uint8Array | ArrayBuffer | DataView): ArrayBufferLike {
|
|
if (arr instanceof Uint8Array) {
|
|
return arr.buffer;
|
|
}
|
|
if (arr instanceof DataView) {
|
|
return arr.buffer;
|
|
}
|
|
return arr;
|
|
}
|
|
|
|
// function isFile(file: TFile | TFolder | string | UXFileInfo): boolean {
|
|
// file instanceof TFile;
|
|
// }
|
|
|
|
async function processReadFile<T>(file: TFile | TFolder | string | UXFileInfo, proc: () => Promise<T>) {
|
|
const ret = await serialized(getFileLockKey(file), () => proc());
|
|
return ret;
|
|
}
|
|
async function processWriteFile<T>(file: TFile | TFolder | string | UXFileInfo, proc: () => Promise<T>) {
|
|
const ret = await serialized(getFileLockKey(file), () => proc());
|
|
return ret;
|
|
}
|
|
|
|
export class SerializedFileAccess {
|
|
app: App;
|
|
plugin: HasSettings<{ handleFilenameCaseSensitive: boolean }>;
|
|
constructor(app: App, plugin: (typeof this)["plugin"]) {
|
|
this.app = app;
|
|
this.plugin = plugin;
|
|
}
|
|
|
|
async tryAdapterStat(file: TFile | string) {
|
|
const path = file instanceof TFile ? file.path : file;
|
|
return await processReadFile(file, async () => {
|
|
if (!(await this.app.vault.adapter.exists(path))) return null;
|
|
return this.app.vault.adapter.stat(path);
|
|
});
|
|
}
|
|
async adapterStat(file: TFile | string) {
|
|
const path = file instanceof TFile ? file.path : file;
|
|
return await processReadFile(file, () => this.app.vault.adapter.stat(path));
|
|
}
|
|
async adapterExists(file: TFile | string) {
|
|
const path = file instanceof TFile ? file.path : file;
|
|
return await processReadFile(file, () => this.app.vault.adapter.exists(path));
|
|
}
|
|
async adapterRemove(file: TFile | string) {
|
|
const path = file instanceof TFile ? file.path : file;
|
|
return await processReadFile(file, () => this.app.vault.adapter.remove(path));
|
|
}
|
|
|
|
async adapterRead(file: TFile | string) {
|
|
const path = file instanceof TFile ? file.path : file;
|
|
return await processReadFile(file, () => this.app.vault.adapter.read(path));
|
|
}
|
|
async adapterReadBinary(file: TFile | string) {
|
|
const path = file instanceof TFile ? file.path : file;
|
|
return await processReadFile(file, () => this.app.vault.adapter.readBinary(path));
|
|
}
|
|
|
|
async adapterReadAuto(file: TFile | string) {
|
|
const path = file instanceof TFile ? file.path : file;
|
|
if (isPlainText(path)) return await processReadFile(file, () => this.app.vault.adapter.read(path));
|
|
return await processReadFile(file, () => this.app.vault.adapter.readBinary(path));
|
|
}
|
|
|
|
async adapterWrite(file: TFile | string, data: string | ArrayBuffer | Uint8Array, options?: DataWriteOptions) {
|
|
const path = file instanceof TFile ? file.path : file;
|
|
if (typeof data === "string") {
|
|
return await processWriteFile(file, () => this.app.vault.adapter.write(path, data, options));
|
|
} else {
|
|
return await processWriteFile(file, () =>
|
|
this.app.vault.adapter.writeBinary(path, toArrayBuffer(data), options)
|
|
);
|
|
}
|
|
}
|
|
|
|
async vaultCacheRead(file: TFile) {
|
|
return await processReadFile(file, () => this.app.vault.cachedRead(file));
|
|
}
|
|
|
|
async vaultRead(file: TFile) {
|
|
return await processReadFile(file, () => this.app.vault.read(file));
|
|
}
|
|
|
|
async vaultReadBinary(file: TFile) {
|
|
return await processReadFile(file, () => this.app.vault.readBinary(file));
|
|
}
|
|
|
|
async vaultReadAuto(file: TFile) {
|
|
const path = file.path;
|
|
if (isPlainText(path)) return await processReadFile(file, () => this.app.vault.read(file));
|
|
return await processReadFile(file, () => this.app.vault.readBinary(file));
|
|
}
|
|
|
|
async vaultModify(file: TFile, data: string | ArrayBuffer | Uint8Array, options?: DataWriteOptions) {
|
|
if (typeof data === "string") {
|
|
return await processWriteFile(file, async () => {
|
|
const oldData = await this.app.vault.read(file);
|
|
if (data === oldData) {
|
|
if (options && options.mtime) markChangesAreSame(file.path, file.stat.mtime, options.mtime);
|
|
return true;
|
|
}
|
|
await this.app.vault.modify(file, data, options);
|
|
return true;
|
|
});
|
|
} else {
|
|
return await processWriteFile(file, async () => {
|
|
const oldData = await this.app.vault.readBinary(file);
|
|
if (await isDocContentSame(createBinaryBlob(oldData), createBinaryBlob(data))) {
|
|
if (options && options.mtime) markChangesAreSame(file.path, file.stat.mtime, options.mtime);
|
|
return true;
|
|
}
|
|
await this.app.vault.modifyBinary(file, toArrayBuffer(data), options);
|
|
return true;
|
|
});
|
|
}
|
|
}
|
|
async vaultCreate(
|
|
path: string,
|
|
data: string | ArrayBuffer | Uint8Array,
|
|
options?: DataWriteOptions
|
|
): Promise<TFile> {
|
|
if (typeof data === "string") {
|
|
return await processWriteFile(path, () => this.app.vault.create(path, data, options));
|
|
} else {
|
|
return await processWriteFile(path, () => this.app.vault.createBinary(path, toArrayBuffer(data), options));
|
|
}
|
|
}
|
|
|
|
trigger(name: string, ...data: any[]) {
|
|
return this.app.vault.trigger(name, ...data);
|
|
}
|
|
|
|
async adapterAppend(normalizedPath: string, data: string, options?: DataWriteOptions) {
|
|
return await this.app.vault.adapter.append(normalizedPath, data, options);
|
|
}
|
|
|
|
async delete(file: TFile | TFolder, force = false) {
|
|
return await processWriteFile(file, () => this.app.vault.delete(file, force));
|
|
}
|
|
async trash(file: TFile | TFolder, force = false) {
|
|
return await processWriteFile(file, () => this.app.vault.trash(file, force));
|
|
}
|
|
|
|
isStorageInsensitive(): boolean {
|
|
//@ts-ignore
|
|
return this.app.vault.adapter.insensitive ?? true;
|
|
}
|
|
|
|
getAbstractFileByPathInsensitive(path: FilePath | string): TAbstractFile | null {
|
|
//@ts-ignore
|
|
return app.vault.getAbstractFileByPathInsensitive(path);
|
|
}
|
|
|
|
getAbstractFileByPath(path: FilePath | string): TAbstractFile | null {
|
|
if (!this.plugin.settings.handleFilenameCaseSensitive || this.isStorageInsensitive()) {
|
|
return this.getAbstractFileByPathInsensitive(path);
|
|
}
|
|
return this.app.vault.getAbstractFileByPath(path);
|
|
}
|
|
|
|
getFiles() {
|
|
return this.app.vault.getFiles();
|
|
}
|
|
|
|
async ensureDirectory(fullPath: string) {
|
|
const pathElements = fullPath.split("/");
|
|
pathElements.pop();
|
|
let c = "";
|
|
for (const v of pathElements) {
|
|
c += v;
|
|
try {
|
|
await this.app.vault.adapter.mkdir(c);
|
|
} catch (ex: any) {
|
|
if (ex?.message == "Folder already exists.") {
|
|
// Skip if already exists.
|
|
} else {
|
|
Logger("Folder Create Error");
|
|
Logger(ex);
|
|
}
|
|
}
|
|
c += "/";
|
|
}
|
|
}
|
|
|
|
touchedFiles: string[] = [];
|
|
|
|
_statInternal(file: FilePath) {
|
|
return this.app.vault.adapter.stat(file);
|
|
}
|
|
|
|
async touch(file: TFile | FilePath) {
|
|
const path = file instanceof TFile ? (file.path as FilePath) : file;
|
|
const statOrg = file instanceof TFile ? file.stat : await this._statInternal(path);
|
|
const stat = statOrg || { mtime: 0, size: 0 };
|
|
const key = `${path}-${stat.mtime}-${stat.size}`;
|
|
this.touchedFiles.unshift(key);
|
|
this.touchedFiles = this.touchedFiles.slice(0, 100);
|
|
}
|
|
recentlyTouched(file: TFile | InternalFileInfo | UXFileInfoStub) {
|
|
const key =
|
|
"stat" in file
|
|
? `${file.path}-${file.stat.mtime}-${file.stat.size}`
|
|
: `${file.path}-${file.mtime}-${file.size}`;
|
|
if (this.touchedFiles.indexOf(key) == -1) return false;
|
|
return true;
|
|
}
|
|
clearTouched() {
|
|
this.touchedFiles = [];
|
|
}
|
|
}
|