refactor(ocr): rename BuiltinOcrProviderIds to BuiltinOcrProviderIdMap for consistency

This commit is contained in:
icarus 2025-10-20 07:45:53 +08:00
parent f9ed8343fe
commit 1423163b3a
7 changed files with 20 additions and 20 deletions

View File

@ -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)
}
}

View File

@ -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 <Alert color="danger" title={t('ocr.error.provider.not_found')} />

View File

@ -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.')

View File

@ -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.')

View File

@ -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.')

View File

@ -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.')

View File

@ -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
}
// ==========================================================