sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

becca conversion WIP

pull/255/head
zadam 2021-04-30 23:10:25 +07:00
parent e41be520a8
commit ccadff5015
5 changed files with 157 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/entities/option.js
Unescape Escape View File

@ -1,39 +0,0 @@
"use strict";
const Entity = require('./entity');
const dateUtils = require('../services/date_utils');
/**
* Option represents name-value pair, either directly configurable by the user or some system property.
*
* @property {string} name
* @property {string} value
* @property {boolean} isSynced
* @property {string} utcDateModified
* @property {string} utcDateCreated
*
* @extends Entity
*/
class Option extends Entity {
static get entityName() { return "options"; }
static get primaryKeyName() { return "name"; }
static get hashedProperties() { return ["name", "value"]; }
constructor(row) {
super(row);
this.isSynced = !!this.isSynced;
}
beforeSaving() {
if (!this.utcDateCreated) {
this.utcDateCreated = dateUtils.utcNowDateTime();
}
super.beforeSaving();
this.utcDateModified = dateUtils.utcNowDateTime();
}
}
module.exports = Option;

8
src/services/becca/becca.js
Unescape Escape View File

@ -10,15 +10,17 @@ class Becca {
reset() {
/** @type {Object.<String, Note>} */
this.notes = [];
this.notes = {};
/** @type {Object.<String, Branch>} */
this.branches = [];
this.branches = {};
/** @type {Object.<String, Branch>} */
this.childParentToBranch = {};
/** @type {Object.<String, Attribute>} */
this.attributes = [];
this.attributes = {};
/** @type {Object.<String, Attribute[]>} Points from attribute type-name to list of attributes */
this.attributeIndex = {};
/** @type {Object.<String, Option>} */
this.options = {};
this.loaded = false;
}

218
src/services/becca/becca_loader.js
Unescape Escape View File

@ -8,6 +8,7 @@ const log = require('../log');
const Note = require('./entities/note');
const Branch = require('./entities/branch');
const Attribute = require('./entities/attribute');
const Option = require('./entities/option');
sqlInit.dbReady.then(() => {
load();
@ -18,15 +19,19 @@ function load() {
becca.reset();
for (const row of sql.iterateRows(`SELECT noteId, title, type, mime, isProtected, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes`, [])) {
new Note(becca, row);
new Note(row);
}
for (const row of sql.iterateRows(`SELECT branchId, noteId, parentNoteId, prefix, notePosition, isExpanded FROM branches WHERE isDeleted = 0`, [])) {
new Branch(becca, row);
new Branch(row);
}
for (const row of sql.iterateRows(`SELECT attributeId, noteId, type, name, value, isInheritable, position FROM attributes WHERE isDeleted = 0`, [])) {
new Attribute(becca, row);
new Attribute(row);
}
for (const row of sql.getRows(`SELECT name, value, isSynced, utcDateModified FROM options`)) {
new Option(row);
}
becca.loaded = true;
@ -34,140 +39,151 @@ function load() {
log.info(`Becca (note cache) load took ${Date.now() - start}ms`);
}
eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_DELETED, eventService.ENTITY_SYNCED], ({entityName, entity}) => {
// note that entity can also be just POJO without methods if coming from sync
function updateNote(entity) {
const {noteId} = entity;
if (!becca.loaded) {
return;
}
if (entity.isDeleted) {
delete becca.notes[noteId];
} else if (noteId in becca.notes) {
becca.notes[noteId].update(entity);
} else {
const note = new Note(entity);
if (entityName === 'notes') {
const {noteId} = entity;
if (entity.isDeleted) {
delete becca.notes[noteId];
}
else if (noteId in becca.notes) {
becca.notes[noteId].update(entity);
}
else {
const note = new Note(becca, entity);
note.decrypt();
}
note.decrypt();
}
else if (entityName === 'branches') {
const {branchId, noteId, parentNoteId} = entity;
const childNote = becca.notes[noteId];
if (entity.isDeleted) {
if (childNote) {
childNote.parents = childNote.parents.filter(parent => parent.noteId !== parentNoteId);
childNote.parentBranches = childNote.parentBranches.filter(branch => branch.branchId !== branchId);
}
if (childNote.parents.length > 0) {
childNote.invalidateSubTree();
}
}
function updateBranch(entity) {
const {branchId, noteId, parentNoteId} = entity;
const childNote = becca.notes[noteId];
const parentNote = becca.notes[parentNoteId];
if (entity.isDeleted) {
if (childNote) {
childNote.parents = childNote.parents.filter(parent => parent.noteId !== parentNoteId);
childNote.parentBranches = childNote.parentBranches.filter(branch => branch.branchId !== branchId);
if (parentNote) {
parentNote.children = parentNote.children.filter(child => child.noteId !== noteId);
if (childNote.parents.length > 0) {
childNote.invalidateSubTree();
}
}
const parentNote = becca.notes[parentNoteId];
delete becca.childParentToBranch[`${noteId}-${parentNoteId}`];
delete becca.branches[branchId];
if (parentNote) {
parentNote.children = parentNote.children.filter(child => child.noteId !== noteId);
}
else if (branchId in becca.branches) {
// only relevant properties which can change in a branch are prefix and isExpanded
becca.branches[branchId].prefix = entity.prefix;
becca.branches[branchId].isExpanded = entity.isExpanded;
if (childNote) {
childNote.flatTextCache = null;
}
delete becca.childParentToBranch[`${noteId}-${parentNoteId}`];
delete becca.branches[branchId];
} else if (branchId in becca.branches) {
// only relevant properties which can change in a branch are prefix and isExpanded
becca.branches[branchId].prefix = entity.prefix;
becca.branches[branchId].isExpanded = entity.isExpanded;
if (childNote) {
childNote.flatTextCache = null;
}
else {
becca.branches[branchId] = new Branch(becca, entity);
} else {
becca.branches[branchId] = new Branch(entity);
if (childNote) {
childNote.resortParents();
}
if (childNote) {
childNote.resortParents();
}
}
else if (entityName === 'attributes') {
const {attributeId, noteId} = entity;
const note = becca.notes[noteId];
const attr = becca.attributes[attributeId];
}
function updateAttribute(entity) {
const {attributeId, noteId} = entity;
const note = becca.notes[noteId];
const attr = becca.attributes[attributeId];
if (entity.isDeleted) {
if (note && attr) {
// first invalidate and only then remove the attribute (otherwise invalidation wouldn't be complete)
if (attr.isAffectingSubtree || note.isTemplate) {
note.invalidateSubTree();
} else {
note.invalidateThisCache();
}
if (entity.isDeleted) {
if (note && attr) {
// first invalidate and only then remove the attribute (otherwise invalidation wouldn't be complete)
if (attr.isAffectingSubtree || note.isTemplate) {
note.invalidateSubTree();
} else {
note.invalidateThisCache();
}
note.ownedAttributes = note.ownedAttributes.filter(attr => attr.attributeId !== attributeId);
note.ownedAttributes = note.ownedAttributes.filter(attr => attr.attributeId !== attributeId);
const targetNote = attr.targetNote;
const targetNote = attr.targetNote;
if (targetNote) {
targetNote.targetRelations = targetNote.targetRelations.filter(rel => rel.attributeId !== attributeId);
}
if (targetNote) {
targetNote.targetRelations = targetNote.targetRelations.filter(rel => rel.attributeId !== attributeId);
}
}
delete becca.attributes[attributeId];
delete becca.attributes[attributeId];
if (attr) {
const key = `${attr.type}-${attr.name.toLowerCase()}`;
if (attr) {
const key = `${attr.type}-${attr.name.toLowerCase()}`;
if (key in becca.attributeIndex) {
becca.attributeIndex[key] = becca.attributeIndex[key].filter(attr => attr.attributeId !== attributeId);
}
if (key in becca.attributeIndex) {
becca.attributeIndex[key] = becca.attributeIndex[key].filter(attr => attr.attributeId !== attributeId);
}
}
else if (attributeId in becca.attributes) {
const attr = becca.attributes[attributeId];
} else if (attributeId in becca.attributes) {
const attr = becca.attributes[attributeId];
// attr name and isInheritable are immutable
attr.value = entity.value;
// attr name and isInheritable are immutable
attr.value = entity.value;
if (attr.isAffectingSubtree || note.isTemplate) {
note.invalidateSubtreeFlatText();
} else {
note.invalidateThisCache();
}
} else {
const attr = new Attribute(entity);
if (note) {
if (attr.isAffectingSubtree || note.isTemplate) {
note.invalidateSubtreeFlatText();
}
else {
note.invalidateSubTree();
} else {
note.invalidateThisCache();
}
}
else {
const attr = new Attribute(becca, entity);
if (note) {
if (attr.isAffectingSubtree || note.isTemplate) {
note.invalidateSubTree();
}
else {
note.invalidateThisCache();
}
}
}
}
else if (entityName === 'note_reordering') {
const parentNoteIds = new Set();
}
for (const branchId in entity) {
const branch = becca.branches[branchId];
function updateNoteReordering(entity) {
const parentNoteIds = new Set();
if (branch) {
branch.notePosition = entity[branchId];
for (const branchId in entity) {
const branch = becca.branches[branchId];
parentNoteIds.add(branch.parentNoteId);
}
if (branch) {
branch.notePosition = entity[branchId];
parentNoteIds.add(branch.parentNoteId);
}
}
}
eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_DELETED, eventService.ENTITY_SYNCED], ({entityName, entity}) => {
// note that entity can also be just POJO without methods if coming from sync
if (!becca.loaded) {
return;
}
if (entityName === 'notes') {
updateNote(entity);
}
else if (entityName === 'branches') {
updateBranch(entity);
}
else if (entityName === 'attributes') {
updateAttribute(entity);
}
else if (entityName === 'options') {
// nothing needed
}
else if (entityName === 'note_reordering') {
updateNoteReordering(entity);
}
});
eventService.subscribe(eventService.ENTER_PROTECTED_SESSION, () => {

32
src/services/becca/entities/option.js
Unescape Escape View File

@ -0,0 +1,32 @@
"use strict";
const dateUtils = require('../../date_utils.js');
const AbstractEntity = require("./abstract_entity.js");
/**
* Option represents name-value pair, either directly configurable by the user or some system property.
*/
class Option extends AbstractEntity {
static get entityName() { return "options"; }
static get primaryKeyName() { return "name"; }
static get hashedProperties() { return ["name", "value"]; }
constructor(row) {
super();
this.name = row.name;
this.value = row.value;
this.isSynced = !!row.isSynced;
this.utcDateModified = row.utcDateModified;
this.becca.options[this.name] = this;
}
beforeSaving() {
super.beforeSaving();
this.utcDateModified = dateUtils.utcNowDateTime();
}
}
module.exports = Option;

6
src/services/options.js
Unescape Escape View File

@ -1,5 +1,5 @@
function getOption(name) {
const option = require('./repository').getOption(name);
const option = require('./becca').getOption(name);
if (!option) {
throw new Error(`Option ${name} doesn't exist`);
@ -37,7 +37,7 @@ function getOptionBool(name) {
}
function setOption(name, value) {
const option = require('./repository').getOption(name);
const option = require('./becca').getOption(name);
if (value === true || value === false) {
value = value.toString();
@ -55,7 +55,7 @@ function setOption(name, value) {
function createOption(name, value, isSynced) {
// to avoid circular dependency, need to find better solution
const Option = require('../entities/option');
const Option = require('../services/becca/entities/option');
new Option({
name: name,