self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +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

48
packages/app-desktop/app.ts
View File

@ -63,11 +63,14 @@ import ShareService from '@joplin/lib/services/share/ShareService';
import checkForUpdates from './checkForUpdates';
import { AppState } from './app.reducer';
import syncDebugLog from '@joplin/lib/services/synchronizer/syncDebugLog';
import eventManager from '@joplin/lib/eventManager';
import eventManager, { EventName } from '@joplin/lib/eventManager';
import path = require('path');
import { checkPreInstalledDefaultPlugins, installDefaultPlugins, setSettingsForDefaultPlugins } from '@joplin/lib/services/plugins/defaultPlugins/defaultPluginsUtils';
import userFetcher, { initializeUserFetcher } from '@joplin/lib/utils/userFetcher';
import { parseNotesParent } from '@joplin/lib/reducer';
import OcrService from '@joplin/lib/services/ocr/OcrService';
import OcrDriverTesseract from '@joplin/lib/services/ocr/drivers/OcrDriverTesseract';
import SearchEngine from '@joplin/lib/services/searchengine/SearchEngine';
import { PackageInfo } from '@joplin/lib/versionInfo';
const pluginClasses = [
@ -83,6 +86,7 @@ class Application extends BaseApplication {
private checkAllPluginStartedIID_: any = null;
private initPluginServiceDone_ = false;
private ocrService_: OcrService;
public constructor() {
super();
@ -121,6 +125,10 @@ class Application extends BaseApplication {
this.updateTray();
}
if (action.type === 'SETTING_UPDATE_ONE' && action.key === 'ocr.enabled' || action.type === 'SETTING_UPDATE_ALL') {
this.setupOcrService();
}
if (action.type === 'SETTING_UPDATE_ONE' && action.key === 'style.editor.fontFamily' || action.type === 'SETTING_UPDATE_ALL') {
this.updateEditorFont();
}
@ -355,6 +363,34 @@ class Application extends BaseApplication {
Setting.setValue('wasClosedSuccessfully', false);
}
private setupOcrService() {
if (Setting.value('ocr.enabled')) {
if (!this.ocrService_) {
const Tesseract = (window as any).Tesseract;
const driver = new OcrDriverTesseract(
{ createWorker: Tesseract.createWorker },
`${bridge().buildDir()}/tesseract.js/worker.min.js`,
`${bridge().buildDir()}/tesseract.js-core`,
);
this.ocrService_ = new OcrService(driver);
}
void this.ocrService_.runInBackground();
} else {
if (!this.ocrService_) return;
void this.ocrService_.stopRunInBackground();
}
const handleResourceChange = () => {
void this.ocrService_.maintenance();
};
eventManager.on(EventName.ResourceCreate, handleResourceChange);
eventManager.on(EventName.ResourceChange, handleResourceChange);
}
public async start(argv: string[]): Promise<any> {
// If running inside a package, the command line, instead of being "node.exe <path> <flags>" is "joplin.exe <flags>" so
// insert an extra argument so that they can be processed in a consistent way everywhere.
@ -571,7 +607,7 @@ class Application extends BaseApplication {
// Forwards the local event to the global event manager, so that it can
// be picked up by the plugin manager.
ResourceEditWatcher.instance().on('resourceChange', (event: any) => {
eventManager.emit('resourceChange', event);
eventManager.emit(EventName.ResourceChange, event);
});
RevisionService.instance().runInBackground();
@ -587,6 +623,8 @@ class Application extends BaseApplication {
bridge: bridge(),
debug: new DebugService(reg.db()),
resourceService: ResourceService.instance(),
searchEngine: SearchEngine.instance(),
ocrService: () => this.ocrService_,
};
}
@ -600,6 +638,12 @@ class Application extends BaseApplication {
this.startRotatingLogMaintenance(Setting.value('profileDir'));
await this.setupOcrService();
eventManager.on(EventName.OcrServiceResourcesProcessed, () => {
SearchEngine.instance().scheduleSyncTables();
});
// await populateDatabase(reg.db(), {
// clearDatabase: true,
// folderCount: 1000,