mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-04-30 12:58:35 +00:00
### New experimental feature
- We can perform Garbage Collection (Beta2) without rebuilding the entire database, and also fetch the database. ### Fixed - Resetting the bucket now properly clears all uploaded files. ### Refactored - Some files have been moved to better reflect their purpose and improve maintainability. - The extensive LiveSyncLocalDB has been split into separate files for each role.
This commit is contained in:
@@ -86,7 +86,7 @@ export class HiddenFileSync extends LiveSyncCommands implements IObsidianModule
|
||||
return this.plugin.kvDB;
|
||||
}
|
||||
getConflictedDoc(path: FilePathWithPrefix, rev: string) {
|
||||
return this.plugin.localDatabase.getConflictedDoc(path, rev);
|
||||
return this.plugin.managers.conflictManager.getConflictedDoc(path, rev);
|
||||
}
|
||||
onunload() {
|
||||
this.periodicInternalFileScanProcessor?.disable();
|
||||
@@ -699,7 +699,7 @@ Offline Changed files: ${processFiles.length}`;
|
||||
revFrom._revs_info
|
||||
?.filter((e) => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo)
|
||||
.first()?.rev ?? "";
|
||||
const result = await this.plugin.localDatabase.mergeObject(
|
||||
const result = await this.plugin.managers.conflictManager.mergeObject(
|
||||
doc.path,
|
||||
commonBase,
|
||||
doc._rev,
|
||||
|
||||
Reference in New Issue
Block a user