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

using server.method() instead of direct call to $.ajax - preparation for electron without network requests

Browse Source
This commit is contained in:
azivner
2017-11-28 20:52:38 -05:00
parent 14001f67d8
commit 54c0ff15b3
17 changed files with 150 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/sync.js
View File

@@ -105,6 +105,12 @@ async function getLastSyncedPull() {
return parseInt(await options.getOption('last_synced_pull'));
}
async function setLastSyncedPull(syncId) {
await sql.doInTransaction(async () => {
await options.setOption('last_synced_pull', syncId);
});
}
async function pullSync(syncContext) {
const lastSyncedPull = await getLastSyncedPull();
@@ -118,6 +124,8 @@ async function pullSync(syncContext) {
if (source_id.isLocalSourceId(sync.source_id)) {
log.info("Skipping " + sync.entity_name + " " + sync.entity_id + " because it has local source id.");
await setLastSyncedPull(sync.id);
continue;
}
@@ -149,9 +157,7 @@ async function pullSync(syncContext) {
throw new Error("Unrecognized entity type " + sync.entity_name);
}
await sql.doInTransaction(async () => {
await options.setOption('last_synced_pull', sync.id);
});
await setLastSyncedPull(sync.id);
}
log.info("Finished pull");