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

fix problems with updating note in note cache when entities are coming out of order (e.g. sync)

Browse Source
This commit is contained in:
zadam
2020-09-03 21:37:06 +02:00
parent 918e827d91
commit 0bd9b849b2
6 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/services/sync.js
View File

@@ -37,11 +37,11 @@ async function sync() {
do {
const syncContext = await login();
await pushSync(syncContext);
await pushChanges(syncContext);
await pullSync(syncContext);
await pullChanges(syncContext);
await pushSync(syncContext);
await pushChanges(syncContext);
await syncFinished(syncContext);
@@ -122,7 +122,7 @@ async function doLogin() {
return syncContext;
}
async function pullSync(syncContext) {
async function pullChanges(syncContext) {
let atLeastOnePullApplied = false;
while (true) {
@@ -175,7 +175,7 @@ async function pullSync(syncContext) {
log.info("Finished pull");
}
async function pushSync(syncContext) {
async function pushChanges(syncContext) {
let lastSyncedPush = getLastSyncedPush();
while (true) {