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

got rid of request context and related refactorings

Browse Source
This commit is contained in:
azivner
2017-12-16 21:23:35 -05:00
parent 50ff5da947
commit e206269457
7 changed files with 24 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/sync.js
View File

@@ -186,7 +186,7 @@ async function pushSync(syncContext) {
log.info(`Skipping push #${sync.id} ${sync.entity_name} ${sync.entity_id} because it originates from sync target`);
}
else {
await readAndPushEntity(sync, syncContext);
await pushEntity(sync, syncContext);
}
lastSyncedPush = sync.id;
@@ -195,7 +195,7 @@ async function pushSync(syncContext) {
}
}
async function readAndPushEntity(sync, syncContext) {
async function pushEntity(sync, syncContext) {
let entity;
if (sync.entity_name === 'notes') {
@@ -230,16 +230,12 @@ async function readAndPushEntity(sync, syncContext) {
log.info(`Pushing changes in sync #${sync.id} ${sync.entity_name} ${sync.entity_id}`);
await sendEntity(syncContext, entity, sync.entity_name);
}
async function sendEntity(syncContext, entity, entityName) {
const payload = {
sourceId: source_id.currentSourceId,
sourceId: await source_id.getCurrentSourceId(),
entity: entity
};
await syncRequest(syncContext, 'PUT', '/api/sync/' + entityName, payload);
await syncRequest(syncContext, 'PUT', '/api/sync/' + sync.entity_name, payload);
}
async function checkContentHash(syncContext) {