From bb23b08b1519598704367bfb3e9c5dddb5d267bf Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 2 Apr 2026 20:23:03 +0300 Subject: [PATCH] refactor(ocr): get rid of unused clean up --- apps/server/src/services/ocr/ocr_service.spec.ts | 16 ---------------- apps/server/src/services/ocr/ocr_service.ts | 13 ------------- .../services/ocr/processors/file_processor.ts | 7 ------- .../services/ocr/processors/image_processor.ts | 10 ---------- .../services/ocr/processors/office_processor.ts | 3 --- .../src/services/ocr/processors/pdf_processor.ts | 3 --- .../services/ocr/processors/tiff_processor.ts | 3 --- 7 files changed, 55 deletions(-) diff --git a/apps/server/src/services/ocr/ocr_service.spec.ts b/apps/server/src/services/ocr/ocr_service.spec.ts index 5ed0c90e2d..a780cf45f1 100644 --- a/apps/server/src/services/ocr/ocr_service.spec.ts +++ b/apps/server/src/services/ocr/ocr_service.spec.ts @@ -804,20 +804,4 @@ describe('OCRService', () => { }); }); - describe('cleanup', () => { - it('should terminate worker on cleanup', async () => { - - await ocrService.cleanup(); - - expect(mockWorker.terminate).toHaveBeenCalled(); - expect(mockLog.info).toHaveBeenCalledWith('OCR service cleaned up'); - }); - - it('should handle cleanup when worker is not initialized', async () => { - await ocrService.cleanup(); - - expect(mockWorker.terminate).not.toHaveBeenCalled(); - expect(mockLog.info).toHaveBeenCalledWith('OCR service cleaned up'); - }); - }); }); diff --git a/apps/server/src/services/ocr/ocr_service.ts b/apps/server/src/services/ocr/ocr_service.ts index 4baec68b3c..8ddc93fadf 100644 --- a/apps/server/src/services/ocr/ocr_service.ts +++ b/apps/server/src/services/ocr/ocr_service.ts @@ -1,5 +1,4 @@ import { getTesseractCode } from '@triliumnext/commons'; -import Tesseract from 'tesseract.js'; import becca from '../../becca/becca.js'; import blobService from '../blob.js'; @@ -38,7 +37,6 @@ interface OCRBlobRow { * Uses Tesseract.js for text recognition */ class OCRService { - private worker: Tesseract.Worker | null = null; private isProcessing = false; private processors: Map = new Map(); @@ -382,17 +380,6 @@ class OCRService { } } - /** - * Clean up OCR service - */ - async cleanup(): Promise { - if (this.worker) { - await this.worker.terminate(); - this.worker = null; - } - log.info('OCR service cleaned up'); - } - /** * Check if currently processing */ diff --git a/apps/server/src/services/ocr/processors/file_processor.ts b/apps/server/src/services/ocr/processors/file_processor.ts index d46b823bad..72a2b614c6 100644 --- a/apps/server/src/services/ocr/processors/file_processor.ts +++ b/apps/server/src/services/ocr/processors/file_processor.ts @@ -23,11 +23,4 @@ export abstract class FileProcessor { * Get list of MIME types supported by this processor */ abstract getSupportedMimeTypes(): string[]; - - /** - * Clean up any resources - */ - cleanup(): Promise { - return Promise.resolve(); - } } \ No newline at end of file diff --git a/apps/server/src/services/ocr/processors/image_processor.ts b/apps/server/src/services/ocr/processors/image_processor.ts index 79bc4fe98e..e5b66a3588 100644 --- a/apps/server/src/services/ocr/processors/image_processor.ts +++ b/apps/server/src/services/ocr/processors/image_processor.ts @@ -90,16 +90,6 @@ export class ImageProcessor extends FileProcessor { this.currentLanguage = language; } - async cleanup(): Promise { - if (this.worker) { - await this.worker.terminate(); - this.worker = null; - } - this.currentLanguage = null; - log.info('Image OCR processor cleaned up'); - } - - /** * Filter text based on minimum confidence threshold diff --git a/apps/server/src/services/ocr/processors/office_processor.ts b/apps/server/src/services/ocr/processors/office_processor.ts index b6b0ef6cb0..cabc07b3e0 100644 --- a/apps/server/src/services/ocr/processors/office_processor.ts +++ b/apps/server/src/services/ocr/processors/office_processor.ts @@ -53,7 +53,4 @@ export class OfficeProcessor extends FileProcessor { return 'office'; } - async cleanup(): Promise { - // Nothing to clean up. - } } diff --git a/apps/server/src/services/ocr/processors/pdf_processor.ts b/apps/server/src/services/ocr/processors/pdf_processor.ts index 77fc4e4602..6f383d6ac8 100644 --- a/apps/server/src/services/ocr/processors/pdf_processor.ts +++ b/apps/server/src/services/ocr/processors/pdf_processor.ts @@ -35,7 +35,4 @@ export class PDFProcessor extends FileProcessor { return 'pdf'; } - async cleanup(): Promise { - // Nothing to clean up. - } } diff --git a/apps/server/src/services/ocr/processors/tiff_processor.ts b/apps/server/src/services/ocr/processors/tiff_processor.ts index 1c11e35fea..27046a3177 100644 --- a/apps/server/src/services/ocr/processors/tiff_processor.ts +++ b/apps/server/src/services/ocr/processors/tiff_processor.ts @@ -86,7 +86,4 @@ export class TIFFProcessor extends FileProcessor { return 'tiff'; } - async cleanup(): Promise { - await this.imageProcessor.cleanup(); - } }