From 1423163b3ad917d62015fa6401aa361df1c715da Mon Sep 17 00:00:00 2001 From: icarus Date: Mon, 20 Oct 2025 07:45:53 +0800 Subject: [PATCH] refactor(ocr): rename BuiltinOcrProviderIds to BuiltinOcrProviderIdMap for consistency --- src/main/services/ocr/OcrService.ts | 10 +++++----- .../settings/DocProcessSettings/OcrImageSettings.tsx | 4 ++-- .../settings/DocProcessSettings/OcrOVSettings.tsx | 4 ++-- .../settings/DocProcessSettings/OcrPpocrSettings.tsx | 4 ++-- .../settings/DocProcessSettings/OcrSystemSettings.tsx | 4 ++-- .../DocProcessSettings/OcrTesseractSettings.tsx | 4 ++-- src/renderer/src/types/ocr.ts | 10 +++++----- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/services/ocr/OcrService.ts b/src/main/services/ocr/OcrService.ts index 7946b14066..7128de03c4 100644 --- a/src/main/services/ocr/OcrService.ts +++ b/src/main/services/ocr/OcrService.ts @@ -13,7 +13,7 @@ import type { PutOcrProviderResponse, SupportedOcrFile } from '@types' -import { BuiltinOcrProviderIds } from '@types' +import { BuiltinOcrProviderIdMap } from '@types' import { eq } from 'drizzle-orm' import { merge } from 'lodash' @@ -31,16 +31,16 @@ export class OcrService { constructor() { // TODO: Ensure builtin providers are in db. // Register built-in providers - this.register(BuiltinOcrProviderIds.tesseract, tesseractService) + this.register(BuiltinOcrProviderIdMap.tesseract, tesseractService) if (systemOcrService) { - this.register(BuiltinOcrProviderIds.system, systemOcrService) + this.register(BuiltinOcrProviderIdMap.system, systemOcrService) } - this.register(BuiltinOcrProviderIds.paddleocr, ppocrService) + this.register(BuiltinOcrProviderIdMap.paddleocr, ppocrService) if (ovOcrService) { - this.register(BuiltinOcrProviderIds.ovocr, ovOcrService) + this.register(BuiltinOcrProviderIdMap.ovocr, ovOcrService) } } diff --git a/src/renderer/src/pages/settings/DocProcessSettings/OcrImageSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/OcrImageSettings.tsx index 0ac8ae7c68..831496ad45 100644 --- a/src/renderer/src/pages/settings/DocProcessSettings/OcrImageSettings.tsx +++ b/src/renderer/src/pages/settings/DocProcessSettings/OcrImageSettings.tsx @@ -5,7 +5,7 @@ import { ErrorTag } from '@renderer/components/Tags/ErrorTag' import { isMac, isWin } from '@renderer/config/constant' import { useOcrImageProvider } from '@renderer/hooks/ocr/useOcrImageProvider' import { useOcrProviders } from '@renderer/hooks/ocr/useOcrProviders' -import { BuiltinOcrProviderIds, isImageOcrProvider } from '@renderer/types' +import { BuiltinOcrProviderIdMap, isImageOcrProvider } from '@renderer/types' import { getErrorMessage } from '@renderer/utils' import { Select } from 'antd' import { useMemo } from 'react' @@ -41,7 +41,7 @@ const OcrImageSettings = () => { })) }, [getOcrProviderName, imageProviders]) - const isSystem = imageProvider?.id === BuiltinOcrProviderIds.system + const isSystem = imageProvider?.id === BuiltinOcrProviderIdMap.system if (!imageProvider) { return diff --git a/src/renderer/src/pages/settings/DocProcessSettings/OcrOVSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/OcrOVSettings.tsx index f31ff3783b..23ce01306a 100644 --- a/src/renderer/src/pages/settings/DocProcessSettings/OcrOVSettings.tsx +++ b/src/renderer/src/pages/settings/DocProcessSettings/OcrOVSettings.tsx @@ -1,6 +1,6 @@ import { Flex } from '@cherrystudio/ui' import { useOcrProvider } from '@renderer/hooks/ocr/useOcrProvider' -import { BuiltinOcrProviderIds, isOcrOVProvider } from '@renderer/types' +import { BuiltinOcrProviderIdMap, isOcrOVProvider } from '@renderer/types' import { Tag } from 'antd' import { useTranslation } from 'react-i18next' @@ -8,7 +8,7 @@ import { SettingRow, SettingRowTitle } from '..' export const OcrOVSettings = () => { const { t } = useTranslation() - const { provider } = useOcrProvider(BuiltinOcrProviderIds.ovocr) + const { provider } = useOcrProvider(BuiltinOcrProviderIdMap.ovocr) if (!isOcrOVProvider(provider)) { throw new Error('Not OV OCR provider.') diff --git a/src/renderer/src/pages/settings/DocProcessSettings/OcrPpocrSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/OcrPpocrSettings.tsx index 66e05aa214..181ecf5ff0 100644 --- a/src/renderer/src/pages/settings/DocProcessSettings/OcrPpocrSettings.tsx +++ b/src/renderer/src/pages/settings/DocProcessSettings/OcrPpocrSettings.tsx @@ -1,6 +1,6 @@ import { ErrorBoundary } from '@renderer/components/ErrorBoundary' import { useOcrProvider } from '@renderer/hooks/ocr/useOcrProvider' -import { BuiltinOcrProviderIds, isOcrPpocrProvider } from '@renderer/types' +import { BuiltinOcrProviderIdMap, isOcrPpocrProvider } from '@renderer/types' import { Input } from 'antd' import { startTransition, useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' @@ -13,7 +13,7 @@ export const OcrPpocrSettings = () => { const AISTUDIO_URL = 'https://aistudio.baidu.com/pipeline/mine' const { t } = useTranslation() - const { provider, config, updateConfig } = useOcrProvider(BuiltinOcrProviderIds.paddleocr) + const { provider, config, updateConfig } = useOcrProvider(BuiltinOcrProviderIdMap.paddleocr) if (!isOcrPpocrProvider(provider)) { throw new Error('Not PaddleOCR provider.') diff --git a/src/renderer/src/pages/settings/DocProcessSettings/OcrSystemSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/OcrSystemSettings.tsx index 6a9d5a1292..d41cad5719 100644 --- a/src/renderer/src/pages/settings/DocProcessSettings/OcrSystemSettings.tsx +++ b/src/renderer/src/pages/settings/DocProcessSettings/OcrSystemSettings.tsx @@ -6,7 +6,7 @@ import { isMac, isWin } from '@renderer/config/constant' import { useOcrProvider } from '@renderer/hooks/ocr/useOcrProvider' import useTranslate from '@renderer/hooks/useTranslate' import type { TranslateLanguageCode } from '@renderer/types' -import { BuiltinOcrProviderIds, isOcrSystemProvider } from '@renderer/types' +import { BuiltinOcrProviderIdMap, isOcrSystemProvider } from '@renderer/types' import { Select } from 'antd' import { startTransition, useCallback, useMemo, useState } from 'react' import { useTranslation } from 'react-i18next' @@ -19,7 +19,7 @@ export const OcrSystemSettings = () => { const { t } = useTranslation() // 和翻译自定义语言耦合了，应该还ok const { translateLanguages } = useTranslate() - const { provider, config, updateConfig } = useOcrProvider(BuiltinOcrProviderIds.system) + const { provider, config, updateConfig } = useOcrProvider(BuiltinOcrProviderIdMap.system) if (!isOcrSystemProvider(provider)) { throw new Error('Not system provider.') diff --git a/src/renderer/src/pages/settings/DocProcessSettings/OcrTesseractSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/OcrTesseractSettings.tsx index 0831df6cfa..a152d24862 100644 --- a/src/renderer/src/pages/settings/DocProcessSettings/OcrTesseractSettings.tsx +++ b/src/renderer/src/pages/settings/DocProcessSettings/OcrTesseractSettings.tsx @@ -5,7 +5,7 @@ import CustomTag from '@renderer/components/Tags/CustomTag' import { useOcrProvider } from '@renderer/hooks/ocr/useOcrProvider' import useTranslate from '@renderer/hooks/useTranslate' import type { TesseractLangCode } from '@renderer/types' -import { BuiltinOcrProviderIds, isOcrTesseractProvider } from '@renderer/types' +import { BuiltinOcrProviderIdMap, isOcrTesseractProvider } from '@renderer/types' import { TESSERACT_LANG_MAP } from '@shared/config/ocr' import { Select } from 'antd' import { useCallback, useMemo, useState } from 'react' @@ -17,7 +17,7 @@ import { SettingRow, SettingRowTitle } from '..' export const OcrTesseractSettings = () => { const { t } = useTranslation() - const { provider, config, updateConfig } = useOcrProvider(BuiltinOcrProviderIds.tesseract) + const { provider, config, updateConfig } = useOcrProvider(BuiltinOcrProviderIdMap.tesseract) if (!isOcrTesseractProvider(provider)) { throw new Error('Not tesseract provider.') diff --git a/src/renderer/src/types/ocr.ts b/src/renderer/src/types/ocr.ts index f29a350cc5..aa67aa24f4 100644 --- a/src/renderer/src/types/ocr.ts +++ b/src/renderer/src/types/ocr.ts @@ -4,7 +4,7 @@ import * as z from 'zod' import type { FileMetadata, ImageFileMetadata, TranslateLanguageCode } from '.' import { isImageFileMetadata, TranslateLanguageCodeSchema } from '.' -export const BuiltinOcrProviderIds = { +export const BuiltinOcrProviderIdMap = { tesseract: 'tesseract', system: 'system', paddleocr: 'paddleocr', @@ -182,7 +182,7 @@ export type OcrTesseractProvider = { BuiltinOcrProvider export const isOcrTesseractProvider = (p: OcrProvider): p is OcrTesseractProvider => { - return p.id === BuiltinOcrProviderIds.tesseract + return p.id === BuiltinOcrProviderIdMap.tesseract } export type TesseractLangCode = Tesseract.LanguageCode @@ -202,7 +202,7 @@ export type OcrSystemProvider = { BuiltinOcrProvider export const isOcrSystemProvider = (p: OcrProvider): p is OcrSystemProvider => { - return p.id === BuiltinOcrProviderIds.system + return p.id === BuiltinOcrProviderIdMap.system } // ========================================================== @@ -227,7 +227,7 @@ export type OcrPpocrProvider = { BuiltinOcrProvider export const isOcrPpocrProvider = (p: OcrProvider): p is OcrPpocrProvider => { - return p.id === BuiltinOcrProviderIds.paddleocr + return p.id === BuiltinOcrProviderIdMap.paddleocr } // ========================================================== @@ -252,7 +252,7 @@ export type OcrOvProvider = { BuiltinOcrProvider export const isOcrOVProvider = (p: OcrProvider): p is OcrOvProvider => { - return p.id === BuiltinOcrProviderIds.ovocr + return p.id === BuiltinOcrProviderIdMap.ovocr } // ==========================================================