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

Desktop: Add support for OCR (#8975)

Browse Source
This commit is contained in:
Laurent Cozic
2023-12-13 19:24:58 +00:00
committed by GitHub
parent 0e847685ff
commit bce94f1775
79 changed files with 2381 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/lib/BaseApplication.ts
View File

@@ -39,7 +39,7 @@ const SyncTargetAmazonS3 = require('./SyncTargetAmazonS3.js');
import EncryptionService from './services/e2ee/EncryptionService';
import ResourceFetcher from './services/ResourceFetcher';
import SearchEngineUtils from './services/searchengine/SearchEngineUtils';
import SearchEngine from './services/searchengine/SearchEngine';
import SearchEngine, { ProcessResultsRow } from './services/searchengine/SearchEngine';
import RevisionService from './services/RevisionService';
import ResourceService from './services/ResourceService';
import DecryptionWorker from './services/DecryptionWorker';
@@ -60,6 +60,7 @@ import { ProfileConfig } from './services/profileConfig/types';
import initProfile from './services/profileConfig/initProfile';
import { parseShareCache } from './services/share/reducer';
import RotatingLogs from './RotatingLogs';
import { NoteEntity } from './services/database/types';
import { join } from 'path';
import processStartFlags, { MatchedStartFlags } from './utils/processStartFlags';
@@ -227,8 +228,9 @@ export default class BaseApplication {
parentId: parentId,
});
let notes = [];
let highlightedWords = [];
let notes: NoteEntity[] = [];
let highlightedWords: string[] = [];
let searchResults: ProcessResultsRow[] = [];
if (parentId) {
if (parentType === Folder.modelType()) {
@@ -237,7 +239,9 @@ export default 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, true, { appendWildCards: true });
const response = await SearchEngineUtils.notesForQuery(search.query_pattern, true, { appendWildCards: true });
notes = response.notes;
searchResults = response.results;
const parsedQuery = await SearchEngine.instance().parseQuery(search.query_pattern);
highlightedWords = SearchEngine.instance().allParsedQueryTerms(parsedQuery);
} else if (parentType === BaseModel.TYPE_SMART_FILTER) {
@@ -250,6 +254,11 @@ export default class BaseApplication {
words: highlightedWords,
});
this.store().dispatch({
type: 'SEARCH_RESULTS_SET',
value: searchResults,
});
this.store().dispatch({
type: 'NOTE_UPDATE_ALL',
notes: notes,