mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2025-02-07 19:30:08 +02:00
Fixed
- Saving notes with wrong type.
This commit is contained in:
parent
41034d7d92
commit
7d6b83a1cb
@ -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",
|
||||
|
4
package-lock.json
generated
4
package-lock.json
generated
@ -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",
|
||||
|
@ -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",
|
||||
|
@ -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 () => {
|
||||
|
2
src/lib
2
src/lib
@ -1 +1 @@
|
||||
Subproject commit 654bfcf8a6f446a5bf8a562d1a905db1ba2f6cf3
|
||||
Subproject commit 548265c7016f2829412900220bcae2ec145abfe6
|
Loading…
x
Reference in New Issue
Block a user