public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2025-12-13 17:55:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed:

Browse Source 
- Conflict detection and merging of deleted files.
- Fixed wrong logs.
- Fix redundant logs.

Implemented
- Automatically deletion of old metadata.
This commit is contained in:
vorotamoroz
2022-10-27 17:41:26 +09:00
parent 331acd463d
commit 5945638633
4 changed files with 124 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ConflictResolveModal.ts
View File

@@ -38,8 +38,8 @@ export class ConflictResolveModal extends Modal {
diff = diff.replace(/\n/g, "<br>"); diff = diff.replace(/\n/g, "<br>");
div.innerHTML = diff; div.innerHTML = diff;
const div2 = contentEl.createDiv(""); const div2 = contentEl.createDiv("");
const date1 = new Date(this.result.left.mtime).toLocaleString(); const date1 = new Date(this.result.left.mtime).toLocaleString() + (this.result.left.deleted ? " (Deleted)" : "");
const date2 = new Date(this.result.right.mtime).toLocaleString(); const date2 = new Date(this.result.right.mtime).toLocaleString() + (this.result.right.deleted ? " (Deleted)" : "");
div2.innerHTML = ` div2.innerHTML = `
<span class='deleted'>A:${date1}</span><br /><span class='added'>B:${date2}</span><br> <span class='deleted'>A:${date1}</span><br /><span class='added'>B:${date2}</span><br>
`; `;

18
src/ObsidianLiveSyncSettingTab.ts
View File

@@ -813,6 +813,24 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
}) })
} }
); );
new Setting(containerGeneralSettingsEl)
.setName("Delete old metadata of deleted files on start-up")
.setClass("wizardHidden")
.setDesc("(Days passed, 0 to disable automatic-deletion)")
.addText((text) => {
text.setPlaceholder("")
.setValue(this.plugin.settings.automaticallyDeleteMetadataOfDeletedFiles + "")
.onChange(async (value) => {
let v = Number(value);
if (isNaN(v)) {
v = 0;
}
this.plugin.settings.automaticallyDeleteMetadataOfDeletedFiles = v;
await this.plugin.saveSettings();
});
text.inputEl.setAttribute("type", "number");
});
addScreenElement("20", containerGeneralSettingsEl); addScreenElement("20", containerGeneralSettingsEl);
const containerSyncSettingEl = containerEl.createDiv(); const containerSyncSettingEl = containerEl.createDiv();

2
src/lib

Submodule src/lib updated: b8a765f8e8...d5f9e0e6e9

149
src/main.ts
View File

@@ -174,7 +174,6 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
nextKey = `${row.id}\u{10ffff}`; nextKey = `${row.id}\u{10ffff}`;
if (!("type" in doc)) continue; if (!("type" in doc)) continue;
if (doc.type == "newnote" || doc.type == "plain") { if (doc.type == "newnote" || doc.type == "plain") {
// const docId = doc._id.startsWith("i:") ? doc._id.substring("i:".length) : doc._id;
notes.push({ path: id2path(doc._id), mtime: doc.mtime }); notes.push({ path: id2path(doc._id), mtime: doc.mtime });
} }
if (isChunk(nextKey)) { if (isChunk(nextKey)) {
@@ -203,8 +202,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
nextKey = `${row.id}\u{10ffff}`; nextKey = `${row.id}\u{10ffff}`;
if (!("_conflicts" in doc)) continue; if (!("_conflicts" in doc)) continue;
if (isInternalChunk(row.id)) continue; if (isInternalChunk(row.id)) continue;
if (doc._deleted) continue; // We have to check also deleted files.
if ("deleted" in doc && doc.deleted) continue; // if (doc._deleted) continue;
// if ("deleted" in doc && doc.deleted) continue;
if (doc.type == "newnote" || doc.type == "plain") { if (doc.type == "newnote" || doc.type == "plain") {
// const docId = doc._id.startsWith("i:") ? doc._id.substring("i:".length) : doc._id; // const docId = doc._id.startsWith("i:") ? doc._id.substring("i:".length) : doc._id;
notes.push({ path: id2path(doc._id), mtime: doc.mtime }); notes.push({ path: id2path(doc._id), mtime: doc.mtime });
@@ -226,11 +226,52 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
if (isInternalChunk(target)) { if (isInternalChunk(target)) {
//NOP //NOP
} else { } else {
await this.showIfConflicted(this.app.vault.getAbstractFileByPath(target) as TFile); await this.showIfConflicted(target);
} }
} }
} }
async collectDeletedFiles() {
const pageLimit = 1000;
let nextKey = "";
const limitDays = this.settings.automaticallyDeleteMetadataOfDeletedFiles;
if (limitDays <= 0) return;
Logger(`Checking expired file history`);
const limit = Date.now() - (86400 * 1000 * limitDays);
const notes: { path: string, mtime: number, ttl: number, doc: PouchDB.Core.ExistingDocument<EntryDoc & PouchDB.Core.AllDocsMeta> }[] = [];
do {
const docs = await this.localDatabase.localDatabase.allDocs({ limit: pageLimit, startkey: nextKey, conflicts: true, include_docs: true });
nextKey = "";
for (const row of docs.rows) {
const doc = row.doc;
nextKey = `${row.id}\u{10ffff}`;
if (doc.type == "newnote" || doc.type == "plain") {
if (doc.deleted && (doc.mtime - limit) < 0) {
notes.push({ path: id2path(doc._id), mtime: doc.mtime, ttl: (doc.mtime - limit) / 1000 / 86400, doc: doc });
}
}
if (isChunk(nextKey)) {
// skip the chunk zone.
nextKey = CHeaderEnd;
}
}
} while (nextKey != "");
if (notes.length == 0) {
Logger("There are no old documents");
Logger(`Checking expired file history done`);
return;
}
for (const v of notes) {
Logger(`Deletion history expired: ${v.path}`);
const delDoc = v.doc;
delDoc._deleted = true;
// console.dir(delDoc);
await this.localDatabase.localDatabase.put(delDoc);
}
Logger(`Checking expired file history done`);
}
async onload() { async onload() {
setLogger(this.addLog.bind(this)); // Logger moved to global. setLogger(this.addLog.bind(this)); // Logger moved to global.
Logger("loading plugin"); Logger("loading plugin");
@@ -528,7 +569,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
id: "livesync-checkdoc-conflicted", id: "livesync-checkdoc-conflicted",
name: "Resolve if conflicted.", name: "Resolve if conflicted.",
editorCallback: async (editor: Editor, view: MarkdownView) => { editorCallback: async (editor: Editor, view: MarkdownView) => {
await this.showIfConflicted(view.file); await this.showIfConflicted(view.file.path);
}, },
}); });
@@ -921,7 +962,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
if (this.settings.syncOnFileOpen && !this.suspended) { if (this.settings.syncOnFileOpen && !this.suspended) {
await this.replicate(); await this.replicate();
} }
await this.showIfConflicted(file); await this.showIfConflicted(file.path);
} }
async applyBatchChange() { async applyBatchChange() {
@@ -1170,7 +1211,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
touch(newFile); touch(newFile);
this.app.vault.trigger("create", newFile); this.app.vault.trigger("create", newFile);
} catch (ex) { } catch (ex) {
Logger(msg + "ERROR, Could not parse: " + path + "(" + doc.datatype + ")", LOG_LEVEL.NOTICE); Logger(msg + "ERROR, Could not create: " + path + "(" + doc.datatype + ")", LOG_LEVEL.NOTICE);
Logger(ex, LOG_LEVEL.VERBOSE); Logger(ex, LOG_LEVEL.VERBOSE);
} }
} else { } else {
@@ -1727,10 +1768,18 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
Logger("Initializing", LOG_LEVEL.NOTICE, "syncAll"); Logger("Initializing", LOG_LEVEL.NOTICE, "syncAll");
} }
await this.collectDeletedFiles();
const filesStorage = this.app.vault.getFiles().filter(e => this.isTargetFile(e)); const filesStorage = this.app.vault.getFiles().filter(e => this.isTargetFile(e));
const filesStorageName = filesStorage.map((e) => e.path); const filesStorageName = filesStorage.map((e) => e.path);
const wf = await this.localDatabase.localDatabase.allDocs(); const wf = await this.localDatabase.localDatabase.allDocs();
const filesDatabase = wf.rows.filter((e) => !isChunk(e.id) && !isPluginChunk(e.id) && e.id != "obsydian_livesync_version").filter(e => isValidPath(e.id)).map((e) => id2path(e.id)).filter(e => this.isTargetFile(e)); const filesDatabase = wf.rows.filter((e) =>
!isChunk(e.id) &&
!isPluginChunk(e.id) &&
e.id != "obsydian_livesync_version" &&
e.id != "_design/replicate"
)
.filter(e => isValidPath(e.id)).map((e) => id2path(e.id)).filter(e => this.isTargetFile(e));
const isInitialized = await (this.localDatabase.kvDB.get<boolean>("initialized")) || false; const isInitialized = await (this.localDatabase.kvDB.get<boolean>("initialized")) || false;
// Make chunk bigger if it is the initial scan. There must be non-active docs. // Make chunk bigger if it is the initial scan. There must be non-active docs.
if (filesDatabase.length == 0 && !isInitialized) { if (filesDatabase.length == 0 && !isInitialized) {
@@ -1748,28 +1797,28 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
this.setStatusBarText(`UPDATE DATABASE`); this.setStatusBarText(`UPDATE DATABASE`);
const runAll = async<T>(procedureName: string, objects: T[], callback: (arg: T) => Promise<void>) => { const runAll = async<T>(procedureName: string, objects: T[], callback: (arg: T) => Promise<void>) => {
const count = objects.length; // const count = objects.length;
Logger(procedureName); Logger(procedureName);
let i = 0; // let i = 0;
const semaphore = Semaphore(10); const semaphore = Semaphore(10);
Logger(`${procedureName} exec.`); // Logger(`${procedureName} exec.`);
if (!this.localDatabase.isReady) throw Error("Database is not ready!"); if (!this.localDatabase.isReady) throw Error("Database is not ready!");
const processes = objects.map(e => (async (v) => { const processes = objects.map(e => (async (v) => {
const releaser = await semaphore.acquire(1, procedureName); const releaser = await semaphore.acquire(1, procedureName);
try { try {
await callback(v); await callback(v);
i++; // i++;
if (i % 50 == 0) { // if (i % 50 == 0) {
const notify = `${procedureName} : ${i}/${count}`; // const notify = `${procedureName} : ${i}/${count}`;
if (showingNotice) { // if (showingNotice) {
Logger(notify, LOG_LEVEL.NOTICE, "syncAll"); // Logger(notify, LOG_LEVEL.NOTICE, "syncAll");
} else { // } else {
Logger(notify); // Logger(notify);
} // }
this.setStatusBarText(notify); // this.setStatusBarText(notify);
} // }
} catch (ex) { } catch (ex) {
Logger(`Error while ${procedureName}`, LOG_LEVEL.NOTICE); Logger(`Error while ${procedureName}`, LOG_LEVEL.NOTICE);
Logger(ex); Logger(ex);
@@ -1785,18 +1834,19 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
await runAll("UPDATE DATABASE", onlyInStorage, async (e) => { await runAll("UPDATE DATABASE", onlyInStorage, async (e) => {
Logger(`Update into ${e.path}`); Logger(`Update into ${e.path}`);
await this.updateIntoDB(e, initialScan); await this.updateIntoDB(e, initialScan);
}); });
if (!initialScan) { if (!initialScan) {
await runAll("UPDATE STORAGE", onlyInDatabase, async (e) => { await runAll("UPDATE STORAGE", onlyInDatabase, async (e) => {
const w = await this.localDatabase.getDBEntryMeta(e); const w = await this.localDatabase.getDBEntryMeta(e, {}, true);
if (w) { if (w && !(w.deleted || w._deleted)) {
Logger(`Check or pull from db:${e}`); Logger(`Check or pull from db:${e}`);
await this.pullFile(e, filesStorage, false, null, false); await this.pullFile(e, filesStorage, false, null, false);
Logger(`Check or pull from db:${e} OK`); Logger(`Check or pull from db:${e} OK`);
} else if (w) {
Logger(`Deletion history skipped: ${e}`, LOG_LEVEL.VERBOSE);
} else { } else {
Logger(`entry not found, maybe deleted (it is normal behavior):${e}`); Logger(`entry not found: ${e}`);
} }
}); });
} }
@@ -1872,7 +1922,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
// --> conflict resolving // --> conflict resolving
async getConflictedDoc(path: string, rev: string): Promise<false | diff_result_leaf> { async getConflictedDoc(path: string, rev: string): Promise<false | diff_result_leaf> {
try { try {
const doc = await this.localDatabase.getDBEntry(path, { rev: rev }, false, false); const doc = await this.localDatabase.getDBEntry(path, { rev: rev }, false, false, true);
if (doc === false) return false; if (doc === false) return false;
let data = doc.data; let data = doc.data;
if (doc.datatype == "newnote") { if (doc.datatype == "newnote") {
@@ -1881,6 +1931,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
data = doc.data; data = doc.data;
} }
return { return {
deleted: doc.deleted || doc._deleted,
ctime: doc.ctime, ctime: doc.ctime,
mtime: doc.mtime, mtime: doc.mtime,
rev: rev, rev: rev,
@@ -1900,7 +1951,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
* @returns true -> resolved, false -> nothing to do, or check result. * @returns true -> resolved, false -> nothing to do, or check result.
*/ */
async getConflictedStatus(path: string): Promise<diff_check_result> { async getConflictedStatus(path: string): Promise<diff_check_result> {
const test = await this.localDatabase.getDBEntry(path, { conflicts: true }, false, false); const test = await this.localDatabase.getDBEntry(path, { conflicts: true }, false, false, true);
if (test === false) return false; if (test === false) return false;
if (test == null) return false; if (test == null) return false;
if (!test._conflicts) return false; if (!test._conflicts) return false;
@@ -1920,8 +1971,8 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
Logger(`could not get old revisions, automatically used newer one:${path}`, LOG_LEVEL.NOTICE); Logger(`could not get old revisions, automatically used newer one:${path}`, LOG_LEVEL.NOTICE);
return true; return true;
} }
// first,check for same contents // first, check for same contents and deletion status.
if (leftLeaf.data == rightLeaf.data) { if (leftLeaf.data == rightLeaf.data && leftLeaf.deleted == rightLeaf.deleted) {
let leaf = leftLeaf; let leaf = leftLeaf;
if (leftLeaf.mtime > rightLeaf.mtime) { if (leftLeaf.mtime > rightLeaf.mtime) {
leaf = rightLeaf; leaf = rightLeaf;
@@ -1955,11 +2006,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
}; };
} }
showMergeDialog(file: TFile, conflictCheckResult: diff_result): Promise<boolean> { showMergeDialog(filename: string, conflictCheckResult: diff_result): Promise<boolean> {
return new Promise((res, rej) => { return new Promise((res, rej) => {
Logger("open conflict dialog", LOG_LEVEL.VERBOSE); Logger("open conflict dialog", LOG_LEVEL.VERBOSE);
new ConflictResolveModal(this.app, conflictCheckResult, async (selected) => { new ConflictResolveModal(this.app, conflictCheckResult, async (selected) => {
const testDoc = await this.localDatabase.getDBEntry(file.path, { conflicts: true }); const testDoc = await this.localDatabase.getDBEntry(filename, { conflicts: true }, false, false, true);
if (testDoc === false) { if (testDoc === false) {
Logger("Missing file..", LOG_LEVEL.VERBOSE); Logger("Missing file..", LOG_LEVEL.VERBOSE);
return res(true); return res(true);
@@ -1974,25 +2025,31 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
//concat both, //concat both,
// write data,and delete both old rev. // write data,and delete both old rev.
const p = conflictCheckResult.diff.map((e) => e[1]).join(""); const p = conflictCheckResult.diff.map((e) => e[1]).join("");
await this.localDatabase.deleteDBEntry(file.path, { rev: conflictCheckResult.left.rev }); await this.localDatabase.deleteDBEntry(filename, { rev: conflictCheckResult.left.rev });
await this.localDatabase.deleteDBEntry(file.path, { rev: conflictCheckResult.right.rev }); await this.localDatabase.deleteDBEntry(filename, { rev: conflictCheckResult.right.rev });
await this.app.vault.modify(file, p); const file = this.app.vault.getAbstractFileByPath(filename) as TFile;
await this.updateIntoDB(file); if (file) {
await this.pullFile(file.path); await this.app.vault.modify(file, p);
await this.updateIntoDB(file);
} else {
const newFile = await this.app.vault.create(filename, p);
await this.updateIntoDB(newFile);
}
await this.pullFile(filename);
Logger("concat both file"); Logger("concat both file");
setTimeout(() => { setTimeout(() => {
//resolved, check again. //resolved, check again.
this.showIfConflicted(file); this.showIfConflicted(filename);
}, 500); }, 500);
} else if (toDelete == null) { } else if (toDelete == null) {
Logger("Leave it still conflicted"); Logger("Leave it still conflicted");
} else { } else {
Logger(`Conflict resolved:${file.path}`); Logger(`Conflict resolved:${filename}`);
await this.localDatabase.deleteDBEntry(file.path, { rev: toDelete }); await this.localDatabase.deleteDBEntry(filename, { rev: toDelete });
await this.pullFile(file.path, null, true, toKeep); await this.pullFile(filename, null, true, toKeep);
setTimeout(() => { setTimeout(() => {
//resolved, check again. //resolved, check again.
this.showIfConflicted(file); this.showIfConflicted(filename);
}, 500); }, 500);
} }
@@ -2019,7 +2076,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
try { try {
const file = this.app.vault.getAbstractFileByPath(filename); const file = this.app.vault.getAbstractFileByPath(filename);
if (file != null && file instanceof TFile) { if (file != null && file instanceof TFile) {
await this.showIfConflicted(file); await this.showIfConflicted(file.path);
} }
} catch (ex) { } catch (ex) {
Logger(ex); Logger(ex);
@@ -2028,9 +2085,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
}, 1000); }, 1000);
} }
async showIfConflicted(file: TFile) { async showIfConflicted(filename: string) {
await runWithLock("conflicted", false, async () => { await runWithLock("conflicted", false, async () => {
const conflictCheckResult = await this.getConflictedStatus(file.path); const conflictCheckResult = await this.getConflictedStatus(filename);
if (conflictCheckResult === false) { if (conflictCheckResult === false) {
//nothing to do. //nothing to do.
return; return;
@@ -2039,12 +2096,12 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
//auto resolved, but need check again; //auto resolved, but need check again;
Logger("conflict:Automatically merged, but we have to check it again"); Logger("conflict:Automatically merged, but we have to check it again");
setTimeout(() => { setTimeout(() => {
this.showIfConflicted(file); this.showIfConflicted(filename);
}, 500); }, 500);
return; return;
} }
//there conflicts, and have to resolve ; //there conflicts, and have to resolve ;
await this.showMergeDialog(file, conflictCheckResult); await this.showMergeDialog(filename, conflictCheckResult);
}); });
} }