self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Desktop: Fuzzy search (#3632)

Browse Source
This commit is contained in:
Naveen M V
2020-09-06 17:37:00 +05:30
committed by GitHub
parent a8296e2e37
commit e108fdb1d8
31 changed files with 602 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ReactNativeClient/lib/BaseApplication.js
View File

@ -280,6 +280,7 @@ class BaseApplication {
});
let notes = [];
let highlightedWords = [];
if (parentId) {
if (parentType === Folder.modelType()) {
@ -288,12 +289,21 @@ class BaseApplication {
notes = await Tag.notes(parentId, options);
} else if (parentType === BaseModel.TYPE_SEARCH) {
const search = BaseModel.byId(state.searches, parentId);
notes = await SearchEngineUtils.notesForQuery(search.query_pattern);
notes = await SearchEngineUtils.notesForQuery(search.query_pattern, { fuzzy: search.fuzzy });
const parsedQuery = await SearchEngine.instance().parseQuery(search.query_pattern, search.fuzzy);
highlightedWords = SearchEngine.instance().allParsedQueryTerms(parsedQuery);
} else if (parentType === BaseModel.TYPE_SMART_FILTER) {
notes = await Note.previews(parentId, options);
}
}
if (highlightedWords.length) {
this.store().dispatch({
type: 'SET_HIGHLIGHTED',
words: highlightedWords,
});
}
this.store().dispatch({
type: 'NOTE_UPDATE_ALL',
notes: notes,
@ -681,6 +691,23 @@ class BaseApplication {
this.database_ = new JoplinDatabase(new DatabaseDriverNode());
this.database_.setLogExcludedQueryTypes(['SELECT']);
this.database_.setLogger(this.dbLogger_);
if (Setting.value('env') === 'dev') {
if (shim.isElectron()) {
this.database_.extensionToLoad = './lib/sql-extensions/spellfix';
}
} else {
if (shim.isElectron()) {
if (shim.isWindows()) {
const appDir = process.execPath.substring(0, process.execPath.lastIndexOf('\\'));
this.database_.extensionToLoad = `${appDir}/usr/lib/spellfix`;
} else {
const appDir = process.execPath.substring(0, process.execPath.lastIndexOf('/'));
this.database_.extensionToLoad = `${appDir}/usr/lib/spellfix`;
}
}
}
await this.database_.open({ name: `${profileDir}/database.sqlite` });
// if (Setting.value('env') === 'dev') await this.database_.clearForTesting();
@ -707,6 +734,11 @@ class BaseApplication {
setLocale(Setting.value('locale'));
}
if (Setting.value('db.fuzzySearchEnabled') === -1) {
const fuzzySearchEnabled = await this.database_.fuzzySearchEnabled();
Setting.setValue('db.fuzzySearchEnabled', fuzzySearchEnabled ? 1 : 0);
}
if (Setting.value('encryption.shouldReencrypt') < 0) {
// We suggest re-encryption if the user has at least one notebook
// and if encryption is enabled. This code runs only when shouldReencrypt = -1