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

fulltext also searches for branch prefixes

Browse Source
This commit is contained in:
zadam
2020-05-14 21:30:36 +02:00
parent a287bb59ea
commit 1ec446137d
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/services/note_cache.js
View File

@@ -25,6 +25,8 @@ class Note {
this.isProtected = !!row.isProtected; this.isProtected = !!row.isProtected;
/** @param {boolean} */ /** @param {boolean} */
this.isDecrypted = !row.isProtected || !!row.isContentAvailable; this.isDecrypted = !row.isProtected || !!row.isContentAvailable;
/** @param {Branch[]} */
this.parentBranches = [];
/** @param {Note[]} */ /** @param {Note[]} */
this.parents = []; this.parents = [];
/** @param {Note[]} */ /** @param {Note[]} */
@@ -139,6 +141,12 @@ class Note {
this.fulltextCache = this.title.toLowerCase(); this.fulltextCache = this.title.toLowerCase();
for (const branch of this.parentBranches) {
if (branch.prefix) {
this.fulltextCache += ' ' + branch.prefix;
}
}
for (const attr of this.attributes) { for (const attr of this.attributes) {
// it's best to use space as separator since spaces are filtered from the search string by the tokenization into words // it's best to use space as separator since spaces are filtered from the search string by the tokenization into words
this.fulltextCache += ' ' + attr.name.toLowerCase(); this.fulltextCache += ' ' + attr.name.toLowerCase();
@@ -217,6 +225,8 @@ class Branch {
} }
childNote.parents.push(parentNote); childNote.parents.push(parentNote);
childNote.parentBranches.push(this);
parentNote.children.push(childNote); parentNote.children.push(childNote);
childParentToBranch[`${this.noteId}-${this.parentNoteId}`] = this; childParentToBranch[`${this.noteId}-${this.parentNoteId}`] = this;
@@ -792,12 +802,12 @@ eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_DELETED
} }
else if (entityName === 'branches') { else if (entityName === 'branches') {
const {branchId, noteId, parentNoteId} = entity; const {branchId, noteId, parentNoteId} = entity;
if (entity.isDeleted) {
const childNote = notes[noteId]; const childNote = notes[noteId];
if (entity.isDeleted) {
if (childNote) { if (childNote) {
childNote.parents = childNote.parents.filter(parent => parent.noteId !== parentNoteId); childNote.parents = childNote.parents.filter(parent => parent.noteId !== parentNoteId);
childNote.parentBranches = childNote.parentBranches.filter(branch => branch.branchId !== branchId);
if (childNote.parents.length > 0) { if (childNote.parents.length > 0) {
childNote.invalidateSubtreeCaches(); childNote.invalidateSubtreeCaches();
@@ -807,7 +817,7 @@ eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_DELETED
const parentNote = notes[parentNoteId]; const parentNote = notes[parentNoteId];
if (parentNote) { if (parentNote) {
childNote.children = childNote.children.filter(child => child.noteId !== noteId); parentNote.children = parentNote.children.filter(child => child.noteId !== noteId);
} }
delete childParentToBranch[`${noteId}-${parentNoteId}`]; delete childParentToBranch[`${noteId}-${parentNoteId}`];
@@ -816,14 +826,16 @@ eventService.subscribe([eventService.ENTITY_CHANGED, eventService.ENTITY_DELETED
else if (branchId in branches) { else if (branchId in branches) {
// only relevant thing which can change in a branch is prefix // only relevant thing which can change in a branch is prefix
branches[branchId].prefix = entity.prefix; branches[branchId].prefix = entity.prefix;
if (childNote) {
childNote.fulltextCache = null;
}
} }
else { else {
branches[branchId] = new Branch(entity); branches[branchId] = new Branch(entity);
const note = notes[entity.noteId]; if (childNote) {
childNote.resortParents();
if (note) {
note.resortParents();
} }
} }
} }