Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 09:56:36 +01:00
Code Issues Packages Projects Releases Activity

fix partial syncs

Browse Source
This commit is contained in:
zadam
2021-01-14 23:22:13 +01:00
parent cbc1f63732
commit 199b49c1f7
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/services/sync_update.js
View File

@@ -23,35 +23,36 @@ function updateEntity(entityChange, entity, sourceId) {
}
}
function updateNormalEntity(entityChange, entity, sourceId) {
const {utcDateChanged, hash, isErased} = sql.getRow(`
function updateNormalEntity(remoteEntityChange, entity, sourceId) {
const localEntityChange = sql.getRow(`
SELECT utcDateChanged, hash, isErased
FROM entity_changes
WHERE entityName = ? AND entityId = ?`, [entityChange.entityName, entityChange.entityId]);
WHERE entityName = ? AND entityId = ?`, [remoteEntityChange.entityName, remoteEntityChange.entityId]);
if (!isErased && entityChange.isErased) {
if (localEntityChange && !localEntityChange.isErased && remoteEntityChange.isErased) {
sql.transactional(() => {
const primaryKey = entityConstructor.getEntityFromEntityName(entityName).primaryKeyName;
sql.execute(`DELETE FROM ${entityChange.entityName} WHERE ${primaryKey} = ?`, entityChange.entityId);
sql.execute(`DELETE FROM ${remoteEntityChange.entityName} WHERE ${primaryKey} = ?`, remoteEntityChange.entityId);
entityChangesService.addEntityChange(entityChange, sourceId);
entityChangesService.addEntityChange(remoteEntityChange, sourceId);
});
return true;
}
if (utcDateChanged < entityChange.utcDateChanged
|| hash !== entityChange.hash // sync error, we should still update
if (!localEntityChange
|| localEntityChange.utcDateChanged < remoteEntityChange.utcDateChanged
|| localEntityChange.hash !== remoteEntityChange.hash // sync error, we should still update
) {
if (['note_contents', 'note_revision_contents'].includes(entityChange.entityName)) {
if (['note_contents', 'note_revision_contents'].includes(remoteEntityChange.entityName)) {
entity.content = handleContent(entity.content);
}
sql.transactional(() => {
sql.replace(entityChange.entityName, entity);
sql.replace(remoteEntityChange.entityName, entity);
entityChangesService.addEntityChange(entityChange, sourceId);
entityChangesService.addEntityChange(remoteEntityChange, sourceId);
});
return true;