Merge branch 'main' of github.com:CherryHQ/cherry-studio into wip/data-refactor

src/main/services/CodeToolsService.ts

@@ -323,7 +323,7 @@ class CodeToolsService {
           ? `set "BUN_INSTALL=${bunInstallPath}" && set "NPM_CONFIG_REGISTRY=${registryUrl}" &&`
           : `export BUN_INSTALL="${bunInstallPath}" && export NPM_CONFIG_REGISTRY="${registryUrl}" &&`
 
-      const installCommand = `${installEnvPrefix} ${bunPath} install -g ${packageName}`
+      const installCommand = `${installEnvPrefix} "${bunPath}" install -g ${packageName}`
       baseCommand = `echo "Installing ${packageName}..." && ${installCommand} && echo "Installation complete, starting ${cliTool}..." && ${baseCommand}`
     }
 

src/main/services/WindowService.ts

@@ -499,6 +499,8 @@ export class WindowService {
       }
     })
 
+    this.setupWebContentsHandlers(this.miniWindow)
+
     miniWindowState.manage(this.miniWindow)
 
     //miniWindow should show in current desktop

src/main/services/ocr/OcrService.ts

@@ -1,7 +1,7 @@
 import { loggerService } from '@logger'
+import { isLinux } from '@main/constant'
 import { BuiltinOcrProviderIds, OcrHandler, OcrProvider, OcrResult, SupportedOcrFile } from '@types'
 
-import { systemOcrService } from './builtin/SystemOcrService'
 import { tesseractService } from './builtin/TesseractService'
 
 const logger = loggerService.withContext('OcrService')
@@ -33,4 +33,8 @@ export const ocrService = new OcrService()
 
 // Register built-in providers
 ocrService.register(BuiltinOcrProviderIds.tesseract, tesseractService.ocr.bind(tesseractService))
-ocrService.register(BuiltinOcrProviderIds.system, systemOcrService.ocr.bind(systemOcrService))
+
+if (!isLinux) {
+  const { systemOcrService } = require('./builtin/SystemOcrService')
+  ocrService.register(BuiltinOcrProviderIds.system, systemOcrService.ocr.bind(systemOcrService))
+}

src/main/services/ocr/builtin/SystemOcrService.ts

@@ -1,6 +1,5 @@
-import { isMac, isWin } from '@main/constant'
+import { isLinux, isWin } from '@main/constant'
 import { loadOcrImage } from '@main/utils/ocr'
-import { OcrAccuracy, recognize } from '@napi-rs/system-ocr'
 import {
   ImageFileMetadata,
   isImageFileMetadata as isImageFileMetadata,
@@ -15,12 +14,14 @@ import { OcrBaseService } from './OcrBaseService'
 export class SystemOcrService extends OcrBaseService {
   constructor() {
     super()
-    if (!isWin && !isMac) {
-      throw new Error('System OCR is only supported on Windows and macOS')
-    }
   }
 
   private async ocrImage(file: ImageFileMetadata, options?: OcrSystemConfig): Promise<OcrResult> {
+    if (isLinux) {
+      return { text: '' }
+    }
+
+    const { OcrAccuracy, recognize } = require('@napi-rs/system-ocr')
     const buffer = await loadOcrImage(file)
     const langs = isWin ? options?.langs : undefined
     const result = await recognize(buffer, OcrAccuracy.Accurate, langs)

src/main/utils/ocr.ts

@@ -1,8 +1,8 @@
 import { ImageFileMetadata } from '@types'
 import { readFile } from 'fs/promises'
-import sharp from 'sharp'
 
 const preprocessImage = async (buffer: Buffer): Promise<Buffer> => {
+  const sharp = require('sharp')
   return sharp(buffer)
     .grayscale() // 转为灰度
     .normalize()