Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 11:26:15 +01:00
Code Issues Packages Projects Releases Activity

fixed sync bug

Browse Source
This commit is contained in:
azivner
2017-11-01 23:39:17 -04:00
parent a5735961a4
commit 9e3515b122
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/sync.js
View File

@@ -51,13 +51,13 @@ async function pullSync(syncContext, syncLog) {
}
if (sync.entity_name === 'notes') {
await updateNote(resp.entity, resp.links, sync.source_id, syncLog);
await updateNote(resp.entity, resp.links, syncContext.sourceId, syncLog);
}
else if (sync.entity_name === 'notes_tree') {
await updateNoteTree(resp, sync.source_id, syncLog);
await updateNoteTree(resp, syncContext.sourceId, syncLog);
}
else if (sync.entity_name === 'notes_history') {
await updateNoteHistory(resp, sync.source_id, syncLog);
await updateNoteHistory(resp, syncContext.sourceId, syncLog);
}
else {
logSyncError("Unrecognized entity type " + sync.entity_name, e, syncLog);
@@ -129,9 +129,7 @@ async function pushSync(syncContext, syncLog) {
break;
}
console.log("sync: ", sync);
if (sync.sourceId === syncContext.sourceId) {
if (sync.sourceId === syncContext.source_id) {
logSync("Skipping sync " + sync.entity_name + " " + sync.entity_id + " because it originates from sync target", syncLog);
}
else {
@@ -196,8 +194,6 @@ async function sync() {
const syncContext = await login(syncLog);
console.log("sync context: ", syncContext);
await pullSync(syncContext, syncLog);
await pushSync(syncContext, syncLog);