gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

new ~ operator in search for regex

Browse Source
This commit is contained in:
zadam 2022-05-11 23:06:14 +02:00
parent bf49648896
commit 45edef2d71
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/services/search/expressions/note_content_fulltext.js
View File

@ -8,7 +8,17 @@ const protectedSessionService = require('../../protected_session');
const striptags = require('striptags'); const striptags = require('striptags');
const utils = require("../../utils"); const utils = require("../../utils");
const ALLOWED_OPERATORS = ['*=*', '=', '*=', '=*']; const ALLOWED_OPERATORS = ['*=*', '=', '*=', '=*', '~'];
const cachedRegexes = {};
function getRegex(str) {
if (!(str in cachedRegexes)) {
cachedRegexes[str] = new RegExp(str, 'ms'); // multiline, dot-all
}
return cachedRegexes[str];
}
class NoteContentFulltextExp extends Expression { class NoteContentFulltextExp extends Expression {
constructor(operator, {tokens, raw, flatText}) { constructor(operator, {tokens, raw, flatText}) {
@ -57,7 +67,8 @@ class NoteContentFulltextExp extends Expression {
if ((this.operator === '=' && token === content) if ((this.operator === '=' && token === content)
|| (this.operator === '*=' && content.endsWith(token)) || (this.operator === '*=' && content.endsWith(token))
|| (this.operator === '=*' && content.startsWith(token))) { || (this.operator === '=*' && content.startsWith(token))
|| (this.operator === '~' && getRegex(token).test(content))) {
resultNoteSet.add(becca.notes[noteId]); resultNoteSet.add(becca.notes[noteId]);
} }

11
src/services/search/services/build_comparator.js
View File

@ -1,3 +1,13 @@
const cachedRegexes = {};
function getRegex(str) {
if (!(str in cachedRegexes)) {
cachedRegexes[str] = new RegExp(str);
}
return cachedRegexes[str];
}
const stringComparators = { const stringComparators = {
"=": comparedValue => (val => val === comparedValue), "=": comparedValue => (val => val === comparedValue),
"!=": comparedValue => (val => val !== comparedValue), "!=": comparedValue => (val => val !== comparedValue),
@ -8,6 +18,7 @@ const stringComparators = {
"*=": comparedValue => (val => val && val.endsWith(comparedValue)), "*=": comparedValue => (val => val && val.endsWith(comparedValue)),
"=*": comparedValue => (val => val && val.startsWith(comparedValue)), "=*": comparedValue => (val => val && val.startsWith(comparedValue)),
"*=*": comparedValue => (val => val && val.includes(comparedValue)), "*=*": comparedValue => (val => val && val.includes(comparedValue)),
"~": comparedValue => (val => val && !!getRegex(comparedValue).test(val)),
}; };
const numericComparators = { const numericComparators = {

2
src/services/search/services/parse.js
View File

@ -40,7 +40,7 @@ function getFulltext(tokens, searchContext) {
} }
function isOperator(str) { function isOperator(str) {
return str.match(/^[!=<>*]+$/); return str.match(/^[!=<>*~]+$/);
} }
function getExpression(tokens, searchContext, level = 0) { function getExpression(tokens, searchContext, level = 0) {