gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 19:49:01 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

updating becca after sync

Browse Source
This commit is contained in:
zadam 2021-08-07 21:21:30 +02:00
parent 669eaa7509
commit 86a53ceebb
8 changed files with 103 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/becca/becca.js
View File

@ -102,6 +102,10 @@ class Becca {
return null;
}
if (entityName === 'note_revisions') {
return this.getNoteRevision(entityId);
}
const camelCaseEntityName = entityName.toLowerCase().replace(/(_[a-z])/g,
group =>
group

54
src/becca/becca_loader.js
View File

@ -1,15 +1,16 @@
"use strict";
const sql = require('../services/sql.js');
const eventService = require('../services/events.js');
const becca = require('./becca.js');
const sql = require('../services/sql');
const eventService = require('../services/events');
const becca = require('./becca');
const sqlInit = require('../services/sql_init');
const log = require('../services/log');
const Note = require('./entities/note.js');
const Branch = require('./entities/branch.js');
const Attribute = require('./entities/attribute.js');
const Option = require('./entities/option.js');
const cls = require("../services/cls.js");
const Note = require('./entities/note');
const Branch = require('./entities/branch');
const Attribute = require('./entities/attribute');
const Option = require('./entities/option');
const cls = require("../services/cls");
const entityConstructor = require("../becca/entity_constructor");
const beccaLoaded = new Promise((res, rej) => {
sqlInit.dbReady.then(() => {
@ -49,11 +50,7 @@ function load() {
log.info(`Becca (note cache) load took ${Date.now() - start}ms`);
}
eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_CHANGE_SYNCED], ({entityName, entity}) => {
if (!becca.loaded) {
return;
}
function postProcessEntityUpdate(entityName, entity) {
if (entityName === 'branches') {
branchUpdated(entity);
} else if (entityName === 'attributes') {
@ -61,6 +58,37 @@ eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_CHANGE_
} else if (entityName === 'note_reordering') {
noteReorderingUpdated(entity);
}
}
eventService.subscribe([eventService.ENTITY_CHANGE_SYNCED], ({entityName, entity}) => {
if (!becca.loaded) {
return;
}
if (["notes", "branches", "attributes"].includes(entityName)) {
const EntityClass = entityConstructor.getEntityFromEntityName(entityName);
const primaryKeyName = EntityClass.primaryKeyName;
let entity = becca.getEntity(entityName, entity[primaryKeyName]);
if (entity) {
entity.updateFromRow(entity);
} else {
entity = new EntityClass();
entity.updateFromRow(entity);
entity.init();
}
}
postProcessEntityUpdate(entityName, entity);
});
eventService.subscribe(eventService.ENTITY_CHANGED, ({entityName, entity}) => {
if (!becca.loaded) {
return;
}
postProcessEntityUpdate(entityName, entity);
});
eventService.subscribe([eventService.ENTITY_DELETED, eventService.ENTITY_DELETE_SYNCED], ({entityName, entityId}) => {

7
src/becca/entities/attribute.js
View File

@ -18,6 +18,11 @@ class Attribute extends AbstractEntity {
return;
}
this.updateFromRow(row);
this.init();
}
updateFromRow(row) {
this.update([
row.attributeId,
row.noteId,
@ -28,8 +33,6 @@ class Attribute extends AbstractEntity {
row.position,
row.utcDateModified
]);
this.init();
}
update([attributeId, noteId, type, name, value, isInheritable, position, utcDateModified]) {

7
src/becca/entities/branch.js
View File

@ -18,6 +18,11 @@ class Branch extends AbstractEntity {
return;
}
this.updateFromRow(row);
this.init();
}
updateFromRow(row) {
this.update([
row.branchId,
row.noteId,
@ -27,8 +32,6 @@ class Branch extends AbstractEntity {
row.isExpanded,
row.utcDateModified
]);
this.init();
}
update([branchId, noteId, parentNoteId, prefix, notePosition, isExpanded, utcDateModified]) {

11
src/becca/entities/note.js
View File

@ -24,6 +24,11 @@ class Note extends AbstractEntity {
return;
}
this.updateFromRow(row);
this.init();
}
updateFromRow(row) {
this.update([
row.noteId,
row.title,
@ -35,8 +40,6 @@ class Note extends AbstractEntity {
row.utcDateCreated,
row.utcDateModified
]);
this.init();
}
update([noteId, title, type, mime, isProtected, dateCreated, dateModified, utcDateCreated, utcDateModified]) {
@ -198,7 +201,7 @@ class Note extends AbstractEntity {
return JSON.parse(content);
}
setContent(content) {
setContent(content, ignoreMissingProtectedSession = false) {
if (content === null || content === undefined) {
throw new Error(`Cannot set null content to note ${this.noteId}`);
}
@ -221,7 +224,7 @@ class Note extends AbstractEntity {
if (protectedSessionService.isProtectedSessionAvailable()) {
pojo.content = protectedSessionService.encrypt(pojo.content);
}
else {
else if (!ignoreMissingProtectedSession) {
throw new Error(`Cannot update content of noteId=${this.noteId} since we're out of protected session.`);
}
}

17
src/becca/entities/note_revision.js
View File

@ -108,7 +108,7 @@ class NoteRevision extends AbstractEntity {
}
}
setContent(content) {
setContent(content, ignoreMissingProtectedSession = false) {
const pojo = {
noteRevisionId: this.noteRevisionId,
content: content,
@ -119,14 +119,14 @@ class NoteRevision extends AbstractEntity {
if (protectedSessionService.isProtectedSessionAvailable()) {
pojo.content = protectedSessionService.encrypt(pojo.content);
}
else {
else if (!ignoreMissingProtectedSession) {
throw new Error(`Cannot update content of noteRevisionId=${this.noteRevisionId} since we're out of protected session.`);
}
}
sql.upsert("note_revision_contents", "noteRevisionId", pojo);
const hash = utils.hash(this.noteRevisionId + "|" + content);
const hash = utils.hash(this.noteRevisionId + "|" + pojo.content.toString());
entityChangesService.addEntityChange({
entityName: 'note_revision_contents',
@ -138,6 +138,17 @@ class NoteRevision extends AbstractEntity {
});
}
/** @returns {{contentLength, dateModified, utcDateModified}} */
getContentMetadata() {
return sql.getRow(`
SELECT
LENGTH(content) AS contentLength,
dateModified,
utcDateModified
FROM note_revision_contents
WHERE noteRevisionId = ?`, [this.noteRevisionId]);
}
beforeSaving() {
super.beforeSaving();

43
src/services/consistency_checks.js
View File

@ -460,26 +460,35 @@ class ConsistencyChecks {
runEntityChangeChecks(entityName, key) {
this.findAndFixIssues(`
SELECT
${key} as entityId
FROM
${entityName}
LEFT JOIN entity_changes ON entity_changes.entityName = '${entityName}'
AND entity_changes.entityId = ${key}
WHERE
entity_changes.id IS NULL`,
SELECT
${key} as entityId
FROM
${entityName}
LEFT JOIN entity_changes ON entity_changes.entityName = '${entityName}'
AND entity_changes.entityId = ${key}
WHERE
entity_changes.id IS NULL`,
({entityId}) => {
if (this.autoFix) {
const entity = becca.getEntity(entityName, entityId);
if (entityName === 'note_contents' || entityName === 'note_revision_contents') {
const entity = entityName === 'note_contents'
? becca.getNote(entityId)
: becca.getNoteRevision(entityId);
entityChangesService.addEntityChange({
entityName,
entityId,
hash: entity.generateHash(),
isErased: false,
utcDateChanged: entity.getUtcDateChanged(),
isSynced: entityName !== 'options' || entity.isSynced
});
entity.setContent(entity.getContent(), true);
}
else {
const entity = becca.getEntity(entityName, entityId);
entityChangesService.addEntityChange({
entityName,
entityId,
hash: entity.generateHash(),
isErased: false,
utcDateChanged: entity.getUtcDateChanged(),
isSynced: entityName !== 'options' || entity.isSynced
});
}
logFix(`Created missing entity change for entityName=${entityName}, entityId=${entityId}`);
} else {

2
src/services/handlers.js
View File

@ -124,7 +124,7 @@ function processInverseRelations(entityName, entity, handler) {
eventService.subscribe(eventService.ENTITY_CHANGED, ({ entityName, entity }) => {
processInverseRelations(entityName, entity, (definition, note, targetNote) => {
// we need to make sure that also target's inverse attribute exists and if note, then create it
// we need to make sure that also target's inverse attribute exists and if not, then create it
// inverse attribute has to target our note as well
const hasInverseAttribute = (targetNote.getRelations(definition.inverseRelation))
.some(attr => attr.value === note.noteId);