diff --git a/manifest.json b/manifest.json index 67e67d0..d22aff9 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian-livesync", "name": "Self-hosted LiveSync", - "version": "0.11.8", + "version": "0.11.9", "minAppVersion": "0.9.12", "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.", "author": "vorotamoroz", diff --git a/package-lock.json b/package-lock.json index 752d652..8a84fa4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "obsidian-livesync", - "version": "0.11.8", + "version": "0.11.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "obsidian-livesync", - "version": "0.11.8", + "version": "0.11.9", "license": "MIT", "dependencies": { "diff-match-patch": "^1.0.5", diff --git a/package.json b/package.json index 1785b2e..b8fbbd1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obsidian-livesync", - "version": "0.11.8", + "version": "0.11.9", "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.", "main": "main.js", "type": "module", diff --git a/src/LocalPouchDB.ts b/src/LocalPouchDB.ts index ec0f092..9da1a2c 100644 --- a/src/LocalPouchDB.ts +++ b/src/LocalPouchDB.ts @@ -49,7 +49,6 @@ export class LocalPouchDB { isReady = false; h32: (input: string, seed?: number) => string; - h64: (input: string, seedHigh?: number, seedLow?: number) => string; h32Raw: (input: Uint8Array, seed?: number) => number; hashCaches = new LRUCache(); @@ -234,9 +233,8 @@ export class LocalPouchDB { async prepareHashFunctions() { if (this.h32 != null) return; - const { h32, h64, h32Raw } = await xxhash(); + const { h32, h32Raw } = await xxhash(); this.h32 = h32; - this.h64 = h64; this.h32Raw = h32Raw; } @@ -316,8 +314,10 @@ export class LocalPouchDB { if (!obj.type || (obj.type && obj.type == "notes") || obj.type == "newnote" || obj.type == "plain") { const note = obj as Entry; let children: string[] = []; + let type: "plain" | "newnote" = "plain"; if (obj.type == "newnote" || obj.type == "plain") { children = obj.children; + type = obj.type; } const doc: LoadedEntry & PouchDB.Core.IdMeta & PouchDB.Core.GetMeta = { data: "", @@ -329,7 +329,7 @@ export class LocalPouchDB { _rev: obj._rev, _conflicts: obj._conflicts, children: children, - datatype: "newnote", + datatype: type, }; return doc; } @@ -662,13 +662,12 @@ export class LocalPouchDB { if (saved) { Logger(`Content saved:${note._id} ,pieces:${processed} (new:${made}, skip:${skiped}, cache:${cacheUsed})`); const newDoc: PlainEntry | NewEntry = { - NewNote: true, children: savenNotes, _id: note._id, ctime: note.ctime, mtime: note.mtime, size: note.size, - type: plainSplit ? "plain" : "newnote", + type: note.datatype, }; // Here for upsert logic, await runWithLock("file:" + newDoc._id, false, async () => { diff --git a/src/lib b/src/lib index 654bfcf..548265c 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit 654bfcf8a6f446a5bf8a562d1a905db1ba2f6cf3 +Subproject commit 548265c7016f2829412900220bcae2ec145abfe6