From a6aee21a967c630a787cda569d4c8d67a81d5144 Mon Sep 17 00:00:00 2001
From: icarus <eurfelux@gmail.com>
Date: Fri, 22 Aug 2025 16:12:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ocr):=20=E7=BB=9F=E4=B8=80OCR=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AF=BC=E5=85=A5=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将所有OCR相关类型从'@renderer/types/ocr'改为从'@renderer/types'或'@types'导入
优化DEFAULT_OCR_PROVIDER类型定义
---
 src/main/services/ocr/OcrService.ts     | 5 +++--
 src/renderer/src/config/ocr.ts          | 4 ++--
 src/renderer/src/hooks/useOcr.ts        | 3 +--
 src/renderer/src/services/OcrService.ts | 2 +-
 src/renderer/src/store/ocr.ts           | 2 +-
 src/renderer/src/types/index.ts         | 2 ++
 src/renderer/src/types/ocr.ts           | 2 +-
 src/renderer/src/utils/ocr.ts           | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/services/ocr/OcrService.ts b/src/main/services/ocr/OcrService.ts
index ffb008f3dd..e15608b2b6 100644
--- a/src/main/services/ocr/OcrService.ts
+++ b/src/main/services/ocr/OcrService.ts
@@ -1,13 +1,14 @@
 import { loggerService } from '@logger'
-import { ImageFileMetadata, isImageFile } from '@types'
 import {
+  ImageFileMetadata,
   ImageOcrProvider,
   isBuiltinOcrProvider,
+  isImageFile,
   isImageOcrProvider,
   OcrProvider,
   OcrResult,
   SupportedOcrFile
-} from 'src/renderer/src/types/ocr'
+} from '@types'
 
 import { getTesseractWorker } from './TesseractService'
 
diff --git a/src/renderer/src/config/ocr.ts b/src/renderer/src/config/ocr.ts
index fef6c57f2e..7af72a9802 100644
--- a/src/renderer/src/config/ocr.ts
+++ b/src/renderer/src/config/ocr.ts
@@ -1,4 +1,4 @@
-import { BuiltinOcrProvider, ImageOcrProvider, OcrProviderCapability } from '@renderer/types/ocr'
+import { BuiltinOcrProvider, ImageOcrProvider, OcrProviderCapability } from '@renderer/types'
 
 const tesseract: BuiltinOcrProvider & ImageOcrProvider = {
   id: 'tesseract',
@@ -10,6 +10,6 @@ const tesseract: BuiltinOcrProvider & ImageOcrProvider = {
 
 export const BUILTIN_OCR_PROVIDERS: BuiltinOcrProvider[] = [tesseract] as const
 
-export const DEFAULT_OCR_PROVIDER: Record<OcrProviderCapability, BuiltinOcrProvider> = {
+export const DEFAULT_OCR_PROVIDER: Record<OcrProviderCapability, BuiltinOcrProvider & ImageOcrProvider> = {
   image: tesseract
 } as const
diff --git a/src/renderer/src/hooks/useOcr.ts b/src/renderer/src/hooks/useOcr.ts
index 47d0e4abc2..4e5a915a3e 100644
--- a/src/renderer/src/hooks/useOcr.ts
+++ b/src/renderer/src/hooks/useOcr.ts
@@ -1,6 +1,5 @@
 import { useAppSelector } from '@renderer/store'
-import { ImageFileMetadata, isImageFile } from '@renderer/types'
-import { SupportedOcrFile } from '@renderer/types/ocr'
+import { ImageFileMetadata, isImageFile, SupportedOcrFile } from '@renderer/types'
 import { useTranslation } from 'react-i18next'
 
 export const useImageOcr = () => {}
diff --git a/src/renderer/src/services/OcrService.ts b/src/renderer/src/services/OcrService.ts
index ff6c53835c..d241dc3231 100644
--- a/src/renderer/src/services/OcrService.ts
+++ b/src/renderer/src/services/OcrService.ts
@@ -1,4 +1,4 @@
-import { OcrProvider, OcrResult, SupportedOcrFile } from '@renderer/types/ocr'
+import { OcrProvider, OcrResult, SupportedOcrFile } from '@renderer/types'
 
 // const logger = loggerService.withContext('main:OcrService')
 
diff --git a/src/renderer/src/store/ocr.ts b/src/renderer/src/store/ocr.ts
index 74a041a702..fdee17479c 100644
--- a/src/renderer/src/store/ocr.ts
+++ b/src/renderer/src/store/ocr.ts
@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { BUILTIN_OCR_PROVIDERS, DEFAULT_OCR_PROVIDER } from '@renderer/config/ocr'
-import { ImageOcrProvider, OcrProvider } from '@renderer/types/ocr'
+import { ImageOcrProvider, OcrProvider } from '@renderer/types'
 
 export interface OcrState {
   providers: OcrProvider[]
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index e3663b966d..f5758132a9 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -9,6 +9,8 @@ export * from './file'
 import type { FileMetadata } from './file'
 import type { Message } from './newMessage'
 
+export * from './ocr'
+
 export type Assistant = {
   id: string
   name: string
diff --git a/src/renderer/src/types/ocr.ts b/src/renderer/src/types/ocr.ts
index 42a6d4aaae..8e7ca38c6d 100644
--- a/src/renderer/src/types/ocr.ts
+++ b/src/renderer/src/types/ocr.ts
@@ -1,4 +1,4 @@
-import { FileMetadata, FileTypes, Model } from '@types'
+import { FileMetadata, FileTypes, Model } from '.'
 
 export const BuiltinOcrProviderIds = {
   tesseract: 'tesseract'
diff --git a/src/renderer/src/utils/ocr.ts b/src/renderer/src/utils/ocr.ts
index 2d59335e1d..1c4e6628d3 100644
--- a/src/renderer/src/utils/ocr.ts
+++ b/src/renderer/src/utils/ocr.ts
@@ -1,5 +1,5 @@
 import TesseractLogo from '@renderer/assets/images/providers/Tesseract.js.png'
-import { isBuiltinOcrProviderId } from '@renderer/types/ocr'
+import { isBuiltinOcrProviderId } from '@renderer/types'
 
 export function getOcrProviderLogo(providerId: string) {
   if (isBuiltinOcrProviderId(providerId)) {