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

note revision sync and other fixes

Browse Source
This commit is contained in:
zadam
2019-11-01 20:00:56 +01:00
parent 5c05963bd9
commit 2e58e32112
9 changed files with 177 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/services/sync_update.js
View File

@@ -39,7 +39,7 @@ async function updateEntity(sync, entity, sourceId) {
// currently making exception for protected notes and note revisions because here
// the title and content are not available decrypted as listeners would expect
if ((entityName !== 'notes' && entityName !== 'note_revisions') || !entity.isProtected) {
if (!['notes', 'note_contents', 'note_revisions', 'note_revision_contents'].includes(entityName) || !entity.isProtected) {
await eventService.emit(eventService.ENTITY_SYNCED, {
entityName,
entity
@@ -101,11 +101,7 @@ async function updateNoteRevision(entity, sourceId) {
const orig = await sql.getRowOrNull("SELECT * FROM note_revisions WHERE noteRevisionId = ?", [entity.noteRevisionId]);
await sql.transactional(async () => {
// we update note revision even if date modified to is the same because the only thing which might have changed
// is the protected status (and correnspondingly title and content) which doesn't affect the utcDateCreated
if (orig === null || orig.utcDateCreated <= entity.utcDateCreated) {
entity.content = entity.content === null ? null : Buffer.from(entity.content, 'base64');
if (orig === null || orig.utcDateModified < entity.utcDateModified) {
await sql.replace('note_revisions', entity);
await syncTableService.addNoteRevisionSync(entity.noteRevisionId, sourceId);
@@ -115,6 +111,22 @@ async function updateNoteRevision(entity, sourceId) {
});
}
async function updateNoteRevisionContent(entity, sourceId) {
const orig = await sql.getRowOrNull("SELECT * FROM note_revision_contents WHERE noteRevisionId = ?", [entity.noteRevisionId]);
await sql.transactional(async () => {
if (orig === null || orig.utcDateModified < entity.utcDateModified) {
entity.content = entity.content === null ? null : Buffer.from(entity.content, 'base64');
await sql.replace('note_revision_contents', entity);
await syncTableService.addNoteRevisionContentSync(entity.noteRevisionId, sourceId);
log.info("Update/sync note revision content " + entity.noteRevisionId);
}
});
}
async function updateNoteReordering(entityId, entity, sourceId) {
await sql.transactional(async () => {
for (const key in entity) {