diff --git a/.github/workflows/Package.yml b/.github/workflows/Package.yml index ea8003f..b450558 100644 --- a/.github/workflows/Package.yml +++ b/.github/workflows/Package.yml @@ -3,8 +3,8 @@ name: Auto generate exe on: push: branches: main - paths: - - 'rapid_videocr/**' + # paths: + # - 'rapid_videocr/**' jobs: create_release: @@ -12,12 +12,17 @@ jobs: outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} steps: + - name: get_cur_time + uses: srfrnk/current-time@master + id: get_cur_time + with: + format: YYYY-MM-DD-HH-mm-ss - name: create_release id: create_release uses: marvinpinto/action-automatic-releases@latest with: repo_token: ${{ secrets.GITHUB_TOKEN }} - automatic_release_tag: "latest" + automatic_release_tag: Draft-${{ steps.get_cur_time.outputs.formattedTime }} prerelease: false draft: true @@ -44,7 +49,7 @@ jobs: - name: Install env run: | - pip3 install pyqt5 pyinstaller tqdm rapidocr_onnxruntime get_pypi_latest_version + pip3 install pyqt5 pyinstaller tqdm rapidocr_onnxruntime>=1.2.8 get_pypi_latest_version - name: Run pyinstaller id: run_pyinstaller @@ -56,12 +61,16 @@ jobs: - if: matrix.os == 'windows-2022' name: zip the artifact dir into a zip + env: + ZIP_NAME: RapidVideOCR-${{ steps.run_pyinstaller.outputs.VERSION }}-${{ matrix.os }}-${{ runner.arch }}-no-installer.zip run: | - powershell Compress-Archive ${{ github.workspace }}\dist\RapidVideOCR ${{ github.workspace }}\dist\RapidVideOCR.zip + powershell Compress-Archive ${{ github.workspace }}\dist\RapidVideOCR ${{ github.workspace }}\dist\${{ env.ZIP_NAME }} - if: matrix.os != 'windows-2022' + env: + ZIP_NAME: RapidVideOCR-${{ steps.run_pyinstaller.outputs.VERSION }}-${{ matrix.os }}-${{ runner.arch }}-no-installer.zip run: | - zip -r $GITHUB_WORKSPACE/dist/RapidVideOCR.zip $GITHUB_WORKSPACE/dist/RapidVideOCR + zip -r $GITHUB_WORKSPACE/dist/${{ env.ZIP_NAME }} $GITHUB_WORKSPACE/dist/RapidVideOCR - name: Upload release asset id: upload-release-asset @@ -71,6 +80,6 @@ jobs: ZIP_NAME: RapidVideOCR-${{ steps.run_pyinstaller.outputs.VERSION }}-${{ matrix.os }}-${{ runner.arch }}-no-installer.zip with: upload_url: ${{ needs.create_release.outputs.upload_url }} - asset_path: dist/RapidVideOCR.zip + asset_path: dist/${{ env.ZIP_NAME }} asset_name: ${{ env.ZIP_NAME }} asset_content_type: application/zip diff --git a/ui/RapidVideOCR.spec b/ui/RapidVideOCR.spec index b353884..976192b 100644 --- a/ui/RapidVideOCR.spec +++ b/ui/RapidVideOCR.spec @@ -7,15 +7,28 @@ block_cipher = None package_name = 'rapidocr_onnxruntime' install_dir = Path(rapidocr_onnxruntime.__file__).resolve().parent -model_dir_map = (str(install_dir / 'models'), f'{package_name}/models') -yaml_path_map = (str(install_dir / '*.yaml'), package_name) +onnx_paths = list(install_dir.rglob('*.onnx')) +yaml_paths = list(install_dir.rglob('*.yaml')) + +onnx_add_data = [(str(v.parent), f'{package_name}/{v.parent.name}') + for v in onnx_paths] + +yaml_add_data = [] +for v in yaml_paths: + if package_name == v.parent.name: + yaml_add_data.append((str(v.parent / '*.yaml'), package_name)) + else: + yaml_add_data.append( + (str(v.parent / '*.yaml'), f'{package_name}/{v.parent.name}')) + +add_data = list(set(yaml_add_data + onnx_add_data)) a = Analysis( ['RapidVideOCR.py'], pathex=[], binaries=[], - datas=[], + datas=add_data, hiddenimports=[], hookspath=[], hooksconfig={},