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

More search engine improvements

Browse Source
This commit is contained in:
Laurent Cozic
2019-01-15 18:10:22 +00:00
parent 2e12b2655b
commit a7896b43d7
5 changed files with 76 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ReactNativeClient/lib/services/SearchEngine.js
View File

@ -14,6 +14,7 @@ class SearchEngine {
this.dispatch = (action) => {};
this.logger_ = new Logger();
this.db_ = null;
this.isIndexing_ = false;
}
static instance() {
@ -51,7 +52,7 @@ class SearchEngine {
}
async rebuildIndex() {
async rebuildIndex_() {
let noteIds = await this.db().selectAll('SELECT id FROM notes WHERE is_conflict = 0 AND encryption_applied = 0');
noteIds = noteIds.map(n => n.id);
@ -77,14 +78,28 @@ class SearchEngine {
Setting.setValue('searchEngine.lastProcessedChangeId', lastChangeId);
}
scheduleSyncTables() {
if (this.scheduleSyncTablesIID_) return;
this.scheduleSyncTablesIID_ = setTimeout(async () => {
await this.syncTables();
this.scheduleSyncTablesIID_ = null;
}, 10000);
}
async syncTables() {
if (this.isIndexing_) return;
this.isIndexing_ = true;
this.logger().info('SearchEngine: Updating FTS table...');
await ItemChange.waitForAllSaved();
if (!Setting.value('searchEngine.initialIndexingDone')) {
await this.rebuildIndex();
Setting.setValue('searchEngine.initialIndexingDone', true)
await this.rebuildIndex_();
Setting.setValue('searchEngine.initialIndexingDone', true);
this.isIndexing_ = false;
return;
}
@ -135,6 +150,8 @@ class SearchEngine {
await ItemChangeUtils.deleteProcessedChanges();
this.logger().info('SearchEngine: Updated FTS table in ' + (Date.now() - startTime) + 'ms');
this.isIndexing_ = false;
}
async countRows() {