From e40c7f4f3eda4f8531af254d80708749307c7dc1 Mon Sep 17 00:00:00 2001 From: KenanZhu <3471685733@qq.com> Date: Fri, 20 Mar 2026 20:57:24 +0800 Subject: [PATCH] =?UTF-8?q?chore(*):=20=E9=99=8D=E4=BD=8E=20ddddocr=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BB=A5=E9=81=BF=E5=85=8D=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=89=93=E5=8C=85=E4=BD=93=E7=A7=AF=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=9B=9E=E6=BB=9A=E5=B7=A5=E4=BD=9C=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-test.yml | 18 ++++++++++++++---- .github/workflows/build.yml | 18 ++++++++++++++---- requirement.txt | Bin 1600 -> 1600 bytes 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 809148a..31da669 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -55,18 +55,28 @@ jobs: python -m pip install --upgrade pip pip install -r requirement.txt - - name: Copy ddddocr model files + - name: Solve ddddocr compatibility and copy model files run: | $ddddocrPath = python -c "import ddddocr, os; print(os.path.dirname(ddddocr.__file__))" Write-Host "ddddocr package location: $ddddocrPath" + $initFile = Join-Path $ddddocrPath "__init__.py" + if (Test-Path $initFile) { + Write-Host "Fixing ddddocr compatibility in: $initFile" + (Get-Content $initFile) -replace 'Image\.ANTIALIAS', 'Image.Resampling.LANCZOS' | Set-Content $initFile + Write-Host "✓ Fixed: Image.ANTIALIAS -> Image.Resampling.LANCZOS" + } else { + Write-Error "✗ ddddocr __init__.py not found" + exit 1 + } + if (-not (Test-Path "models")) { New-Item -ItemType Directory -Path "models" | Out-Null Write-Host "✓ Created models directory" } - $onnxSource = Join-Path $ddddocrPath "common_old.onnx" - $onnxDest = "models/common_old.onnx" + $onnxSource = Join-Path $ddddocrPath "common.onnx" + $onnxDest = "models/common.onnx" if (Test-Path $onnxSource) { Copy-Item $onnxSource $onnxDest -Force Write-Host "✓ Copied ONNX model from: $onnxSource" @@ -114,7 +124,7 @@ jobs: " pathex=[]," " binaries=[]," " datas=[" - " ('models\\common_old.onnx', 'ddddocr')," + " ('models\\common.onnx', 'ddddocr')," " ('src\\gui\\resources\\icons\\AutoLibrary_32x32.ico', 'gui\\resources\\icons')," " ]," " hiddenimports=[]," diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f54a2ea..cea2c05 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,18 +91,28 @@ jobs: python -m pip install --upgrade pip pip install -r requirement.txt - - name: Copy ddddocr model files + - name: Solve ddddocr compatibility and copy model files run: | $ddddocrPath = python -c "import ddddocr, os; print(os.path.dirname(ddddocr.__file__))" Write-Host "ddddocr package location: $ddddocrPath" + $initFile = Join-Path $ddddocrPath "__init__.py" + if (Test-Path $initFile) { + Write-Host "Fixing ddddocr compatibility in: $initFile" + (Get-Content $initFile) -replace 'Image\.ANTIALIAS', 'Image.Resampling.LANCZOS' | Set-Content $initFile + Write-Host "✓ Fixed: Image.ANTIALIAS -> Image.Resampling.LANCZOS" + } else { + Write-Error "✗ ddddocr __init__.py not found" + exit 1 + } + if (-not (Test-Path "models")) { New-Item -ItemType Directory -Path "models" | Out-Null Write-Host "✓ Created models directory" } - $onnxSource = Join-Path $ddddocrPath "common_old.onnx" - $onnxDest = "models/common_old.onnx" + $onnxSource = Join-Path $ddddocrPath "common.onnx" + $onnxDest = "models/common.onnx" if (Test-Path $onnxSource) { Copy-Item $onnxSource $onnxDest -Force Write-Host "✓ Copied ONNX model from: $onnxSource" @@ -150,7 +160,7 @@ jobs: " pathex=[]," " binaries=[]," " datas=[" - " ('models\\common_old.onnx', 'ddddocr')," + " ('models\\common.onnx', 'ddddocr')," " ('src\\gui\\resources\\icons\\AutoLibrary_32x32.ico', 'gui\\resources\\icons')," " ]," " hiddenimports=[]," diff --git a/requirement.txt b/requirement.txt index 5a95907538c96df1dbdd5a9dc4c01af2384d5537..711bb84d5b5e510cf3e3e8218c6743d04bbe3c7b 100644 GIT binary patch delta 16 XcmX@WbAV^UB~}9lJqELl*E3lGG57_F delta 16 XcmX@WbAV^UB~~*AJqE*#*E3lGG8F}j