From 1a36daa088c9f636987517e6acc0e179204463cf Mon Sep 17 00:00:00 2001 From: azivner Date: Thu, 23 Nov 2017 23:54:54 -0500 Subject: [PATCH] sync fixes --- package.json | 1 - services/notes.js | 9 ++++----- services/sync.js | 6 ++++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 2eb91529d..bab7661da 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,6 @@ "name": "trilium", "description": "Trilium", "version": "0.0.1", - "private": true, "scripts": { "start": "node ./bin/www", "test-electron": "xo", diff --git a/services/notes.js b/services/notes.js index 30c193b2e..48f07b1a5 100644 --- a/services/notes.js +++ b/services/notes.js @@ -191,7 +191,6 @@ async function updateNote(noteId, newNote, ctx) { //await sql.insert("links", link); } - await sync_table.addNoteTreeSync(noteId); await sync_table.addNoteSync(noteId); }); } @@ -224,13 +223,13 @@ async function deleteNote(noteTreeId, browserId) { const noteId = await sql.getSingleValue("SELECT note_id FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]); - const notDeletedNoteTreesCount = await sql.getSingleValue("SELECT COUNT(*) FROM notes_tree WHERE note_id = ?", [noteId]); + const notDeletedNoteTreesCount = await sql.getSingleValue("SELECT COUNT(*) FROM notes_tree WHERE note_id = ? AND is_deleted = 0", [noteId]); if (!notDeletedNoteTreesCount) { - await sql.execute("UPDATE notes SET is_deleted = 1, date_modified = ? WHERE note_id = ?", [now, noteTreeId]); - await sync_table.addNoteSync(noteTreeId); + await sql.execute("UPDATE notes SET is_deleted = 1, date_modified = ? WHERE note_id = ?", [now, noteId]); + await sync_table.addNoteSync(noteId); - const children = await sql.getResults("SELECT note_tree_id FROM notes_tree WHERE note_pid = ? AND is_deleted = 0", [noteTreeId]); + const children = await sql.getResults("SELECT note_tree_id FROM notes_tree WHERE note_pid = ? AND is_deleted = 0", [noteId]); for (const child of children) { await deleteNote(child.note_tree_id, browserId); diff --git a/services/sync.js b/services/sync.js index 9e6533b4d..bf053423b 100644 --- a/services/sync.js +++ b/services/sync.js @@ -121,10 +121,12 @@ async function pullSync(syncContext) { continue; } - console.log("Pulling ", sync); - const resp = await syncRequest(syncContext, 'GET', "/api/sync/" + sync.entity_name + "/" + encodeURIComponent(sync.entity_id)); + if (!resp) { + log.error("Empty response to pull for " + sync.entity_name + ", id=" + sync.entity_id); + } + if (sync.entity_name === 'notes') { await syncUpdate.updateNote(resp.entity, resp.links, syncContext.sourceId); }