Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2025-12-29 23:12:38 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(ocr): 改进OCR处理中的消息管理和错误处理

Browse Source 
在useOcr钩子中统一管理OCR处理的消息提示，并完善错误处理逻辑
移除TranslatePage中重复的消息管理代码，简化OCR处理流程
This commit is contained in:
icarus 2025-08-22 20:21:29 +08:00
parent 7afa9f7ab0
commit 1cce646e4b
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/renderer/src/hooks/useOcr.ts
View File

@ -1,8 +1,11 @@
import { loggerService } from '@logger'
import { useAppSelector } from '@renderer/store'
import { ImageFileMetadata, isImageFile, SupportedOcrFile } from '@renderer/types'
import { uuid } from '@renderer/utils'
import { formatErrorMessage } from '@renderer/utils/error'
import { useTranslation } from 'react-i18next'
export const useImageOcr = () => {}
const logger = loggerService.withContext('useOcr')
export const useOcr = () => {
const { t } = useTranslation()
@ -18,14 +21,24 @@ export const useOcr = () => {
}
/**
* 对支持的文件进行OCR识别
* 对支持的文件进行OCR识别.
* @param file 支持OCR的文件
* @returns OCR识别结果的Promise
* @throws 当文件类型不支持时抛出错误
* @throws 当文件类型不支持或OCR失败时抛出错误
*/
const ocr = async (file: SupportedOcrFile) => {
if (isImageFile(file)) {
return ocrImage(file)
const key = uuid()
window.message.loading({ content: t('ocr.processing'), key, duration: 0 })
try {
if (isImageFile(file)) {
return ocrImage(file)
}
} catch (e) {
logger.error('Failed to ocr.', e as Error)
window.message.error(t('ocr.error.unknown') + ': ' + formatErrorMessage(e))
throw e
} finally {
window.message.destroy(key)
}
// @ts-expect-error all types should be covered
throw new Error(t('ocr.file.not_supported', { type: file.type }))

24
src/renderer/src/pages/translate/TranslatePage.tsx
View File

@ -20,7 +20,6 @@ import { setTranslating as setTranslatingAction } from '@renderer/store/runtime'
import { setTranslatedContent as setTranslatedContentAction } from '@renderer/store/translate'
import {
type AutoDetectionMethod,
isImageFile,
isSupportedOcrFile,
type Model,
type TranslateHistory,
@ -446,21 +445,14 @@ const TranslatePage: FC = () => {
}
// extensible
const shouldOCR = isImageFile(file)
const shouldOCR = isSupportedOcrFile(file)
if (shouldOCR) {
if (isSupportedOcrFile(file)) {
window.message.loading({ content: t('ocr.processing'), key: 'translate_ocr_processing', duration: 0 })
try {
const ocrResult = await ocr(file)
setText(ocrResult.text)
} catch (e) {
logger.error('Failed to ocr.', e as Error)
window.message.error(t('ocr.error.unknown') + ': ' + formatErrorMessage(e))
}
} else {
// @ts-expect-error all situations covered. just for robustness
window.message.error(t('ocr.file.not_supported', { type: file.type }))
try {
const ocrResult = await ocr(file)
setText(ocrResult.text)
} finally {
// do nothing when failed.
}
} else {
// the threshold may be too large
@ -474,6 +466,8 @@ const TranslatePage: FC = () => {
} catch (e) {
logger.error('Failed to read text file.', e as Error)
window.message.error(t('translate.files.error.unknown') + ': ' + formatErrorMessage(e))
} finally {
window.message.destroy('translate_files_reading')
}
}
}
@ -482,8 +476,6 @@ const TranslatePage: FC = () => {
window.message.error(t('translate.files.error.unknown') + ': ' + formatErrorMessage(e))
} finally {
setIsProcessing(false)
window.message.destroy('translate_ocr_processing')
window.message.destroy('translate_files_reading')
}
}, [ocr, onSelectFile, selecting, t])