gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

autocomplete with prefixes

Browse Source
This commit is contained in:
azivner 2018-04-19 20:59:44 -04:00
parent 5ffd621e9d
commit 85eb50ed0f
6 changed files with 84 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/dialogs/branch_prefix.js
View File

@ -25,7 +25,7 @@ async function showDialog() {
$treePrefixInput.val(branch.prefix).focus();
const noteTitle = treeUtils.getNoteTitle(currentNode.data.noteId);
const noteTitle = await treeUtils.getNoteTitle(currentNode.data.noteId);
$noteTitle.html(noteTitle);
}

2
src/public/javascripts/dialogs/event_log.js
View File

@ -22,7 +22,7 @@ async function showDialog() {
const dateTime = utils.formatDateTime(utils.parseDate(event.dateAdded));
if (event.noteId) {
const noteLink = linkService.createNoteLink(event.noteId).prop('outerHTML');
const noteLink = await linkService.createNoteLink(event.noteId).prop('outerHTML');
event.comment = event.comment.replace('<note>', noteLink);
}

2
src/public/javascripts/dialogs/recent_changes.js
View File

@ -40,7 +40,7 @@ async function showDialog() {
noteLink = change.current_title;
}
else {
noteLink = linkService.createNoteLink(change.noteId, change.title);
noteLink = await linkService.createNoteLink(change.noteId, change.title);
}
changesListEl.append($('<li>')

6
src/public/javascripts/services/link.js
View File

@ -23,11 +23,11 @@ function getNodePathFromLabel(label) {
return null;
}
function createNoteLink(notePath, noteTitle) {
async function createNoteLink(notePath, noteTitle) {
if (!noteTitle) {
const noteId = treeUtils.getNoteIdFromNotePath(notePath);
noteTitle = treeUtils.getNoteTitle(noteId);
noteTitle = await treeUtils.getNoteTitle(noteId);
}
const noteLink = $("<a>", {
@ -75,7 +75,7 @@ function goToLink(e) {
}
function addLinkToEditor(linkTitle, linkHref) {
const editor = noteDetailText.getEditor();Rum
const editor = noteDetailText.getEditor();
editor.model.change( writer => {
const insertPosition = editor.model.document.selection.getFirstPosition();

2
src/public/javascripts/services/tree.js
View File

@ -203,7 +203,7 @@ async function showParentList(noteId, node) {
item = $("<span/>").attr("title", "Current note").append(title);
}
else {
item = linkService.createNoteLink(notePath, title);
item = await linkService.createNoteLink(notePath, title);
}
$parentListList.append($("<li/>").append(item));

115
src/services/autocomplete.js
View File

@ -8,10 +8,15 @@ let noteIds;
const childToParent = {};
const hideInAutocomplete = {};
// key is 'childNoteId-parentNoteId' as a replacement for branchId which we don't use here
let prefixes = {};
async function load() {
noteTitles = await sql.getMap(`SELECT noteId, LOWER(title) FROM notes WHERE isDeleted = 0 AND isProtected = 0`);
noteIds = Object.keys(noteTitles);
prefixes = await sql.getMap(`SELECT noteId || '-' || parentNoteId, prefix FROM branches WHERE prefix IS NOT NULL AND prefix != ''`);
const relations = await sql.getRows(`SELECT noteId, parentNoteId FROM branches WHERE isDeleted = 0`);
for (const rel of relations) {
@ -39,19 +44,27 @@ function getResults(query) {
continue;
}
const title = noteTitles[noteId];
const foundTokens = [];
for (const token of tokens) {
if (title.includes(token)) {
foundTokens.push(token);
}
const parents = childToParent[noteId];
if (!parents) {
continue;
}
if (foundTokens.length > 0) {
const remainingTokens = tokens.filter(token => !foundTokens.includes(token));
for (const parentNoteId of parents) {
const prefix = prefixes[noteId + '-' + parentNoteId];
const title = (prefix || '') + ' ' + noteTitles[noteId];
const foundTokens = [];
search(childToParent[noteId], remainingTokens, [noteId], results);
for (const token of tokens) {
if (title.includes(token)) {
foundTokens.push(token);
}
}
if (foundTokens.length > 0) {
const remainingTokens = tokens.filter(token => !foundTokens.includes(token));
search(parentNoteId, remainingTokens, [noteId], results);
}
}
}
@ -60,13 +73,9 @@ function getResults(query) {
return results;
}
function search(noteIds, tokens, path, results) {
if (!noteIds || noteIds.length === 0) {
return;
}
function search(noteId, tokens, path, results) {
if (tokens.length === 0) {
const retPath = getSomePath(noteIds, path);
const retPath = getSomePath(noteId, path);
if (retPath) {
const noteTitle = getNoteTitle(retPath);
@ -80,16 +89,22 @@ function search(noteIds, tokens, path, results) {
return;
}
for (const noteId of noteIds) {
const parents = childToParent[noteId];
if (!parents) {
return;
}
for (const parentNoteId of parents) {
if (results.length >= 200) {
return;
}
if (noteId === 'root' || hideInAutocomplete[noteId]) {
if (parentNoteId === 'root' || hideInAutocomplete[parentNoteId]) {
continue;
}
const title = noteTitles[noteId];
const prefix = prefixes[noteId + '-' + parentNoteId];
const title = (prefix || '') + ' ' + noteTitles[noteId];
const foundTokens = [];
for (const token of tokens) {
@ -101,39 +116,44 @@ function search(noteIds, tokens, path, results) {
if (foundTokens.length > 0) {
const remainingTokens = tokens.filter(token => !foundTokens.includes(token));
search(childToParent[noteId], remainingTokens, path.concat([noteId]), results);
search(parentNoteId, remainingTokens, path.concat([noteId]), results);
}
else {
search(childToParent[noteId], tokens, path.concat([noteId]), results);
search(parentNoteId, tokens, path.concat([noteId]), results);
}
}
}
function getNoteTitle(path) {
const titles = path.map(noteId => noteTitles[noteId]);
const titles = [];
let parentNoteId = 'root';
for (const noteId of path) {
const prefix = prefixes[noteId + '-' + parentNoteId];
const title = (prefix ? (prefix + ' - ') : '') + noteTitles[noteId];
titles.push(title);
parentNoteId = noteId;
}
return titles.join(' / ');
}
function getSomePath(noteIds, path) {
for (const noteId of noteIds) {
if (noteId === 'root') {
path.reverse();
function getSomePath(noteId, path) {
if (noteId === 'root') {
path.reverse();
return path;
}
return path;
}
if (hideInAutocomplete[noteId]) {
continue;
}
const parents = childToParent[noteId];
if (!parents || parents.length === 0) {
return false;
}
const parents = childToParent[noteId];
if (!parents || parents.length === 0) {
continue;
}
const retPath = getSomePath(parents, path.concat([noteId]));
for (const parentNoteId of parents) {
const retPath = getSomePath(parentNoteId, path.concat([noteId]));
if (retPath) {
return retPath;
@ -155,6 +175,25 @@ syncTableService.addListener(async (entityName, entityId) => {
noteTitles[note.noteId] = note.title;
}
}
else if (entityName === 'branches') {
const branch = await repository.getBranch(entityId);
if (childToParent[branch.noteId]) {
childToParent[branch.noteId] = childToParent[branch.noteId].filter(noteId => noteId !== branch.parentNoteId)
}
if (branch.isDeleted) {
delete prefixes[branch.noteId + '-' + branch.parentNoteId];
}
else {
if (branch.prefix) {
prefixes[branch.noteId + '-' + branch.parentNoteId] = branch.prefix;
}
childToParent[branch.noteId] = childToParent[branch.noteId] || [];
childToParent[branch.noteId].push(branch.parentNoteId);
}
}
else if (entityName === 'labels') {
const label = await repository.getLabel(entityId);