From a2eb41c7d8275be7a34c4ce334321efbc663ff8a Mon Sep 17 00:00:00 2001 From: lvxvvv Date: Wed, 19 Feb 2025 22:12:54 -0300 Subject: [PATCH] fix: arnndn regression, pypi workflow incomplete --- .github/workflows/pypi.yml | 97 -------------------------------------- pyproject.toml | 2 +- src/audiotame/app.py | 8 ++-- src/audiotame/audiotame.sh | 13 ++--- 4 files changed, 9 insertions(+), 111 deletions(-) delete mode 100644 .github/workflows/pypi.yml diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml deleted file mode 100644 index f3a034a..0000000 --- a/.github/workflows/pypi.yml +++ /dev/null @@ -1,97 +0,0 @@ -name: Publish Python 🐍 distribution 📦 to PyPI - -on: - push: - tags: ['*'] - -jobs: - build: - name: Build distribution 📦 - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.x" - - name: Install pypa/build - run: >- - python3 -m - pip install - build - --user - - name: Build a binary wheel and a source tarball - run: python3 -m build - - name: Store the distribution packages - uses: actions/upload-artifact@v4 - with: - name: python-package-distributions - path: dist/ - - publish-to-pypi: - name: >- - Publish Python 🐍 distribution 📦 to PyPI - if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes - needs: - - build - runs-on: ubuntu-latest - environment: - name: pypi - url: https://pypi.org/p/${{ github.event.repository.name }} # Replace with your PyPI project name - permissions: - id-token: write # IMPORTANT: mandatory for trusted publishing - - steps: - - name: Download all the dists - uses: actions/download-artifact@v4 - with: - name: python-package-distributions - path: dist/ - - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - - github-release: - name: >- - Sign the Python 🐍 distribution 📦 with Sigstore - and upload them to GitHub Release - needs: - - publish-to-pypi - runs-on: ubuntu-latest - - permissions: - contents: write # IMPORTANT: mandatory for making GitHub Releases - id-token: write # IMPORTANT: mandatory for sigstore - - steps: - - name: Download all the dists - uses: actions/download-artifact@v4 - with: - name: python-package-distributions - path: dist/ - - name: Sign the dists with Sigstore - uses: sigstore/gh-action-sigstore-python@v3.0.0 - with: - inputs: >- - ./dist/*.tar.gz - ./dist/*.whl - - name: Create GitHub Release - env: - GITHUB_TOKEN: ${{ github.token }} - run: >- - gh release create - "$GITHUB_REF_NAME" - --repo "$GITHUB_REPOSITORY" - --notes "" - - name: Upload artifact signatures to GitHub Release - env: - GITHUB_TOKEN: ${{ github.token }} - # Upload to GitHub Release using the `gh` CLI. - # `dist/` contains the built packages, and the - # sigstore-produced signatures and certificates. - run: >- - gh release upload - "$GITHUB_REF_NAME" dist/** - --repo "$GITHUB_REPOSITORY" diff --git a/pyproject.toml b/pyproject.toml index 336f084..1a7cfe6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ audiotame = "audiotame.main:main" [project] name = "audiotame" -version = "0.1.5" +version = "0.1.7" #dynamic = ["version"] authors = [ { name="lvxvvv" }, diff --git a/src/audiotame/app.py b/src/audiotame/app.py index 804cc81..c95a6fe 100644 --- a/src/audiotame/app.py +++ b/src/audiotame/app.py @@ -95,7 +95,7 @@ def convert(input, format): input_stats_out=gr.Code(label="Input Stats", lines=5, max_lines=6) tamed_stats_out=gr.Code(label="Tamed Stats", lines=5, max_lines=6) - tamebtn = gr.Button("Tame") + tamebtn = gr.Button("Tame", variant="primary") def showstats(): return { statsrow: gr.Column(visible=True) } @@ -205,7 +205,7 @@ def clear_tame(): format = gr.Radio(["wav", "flac", "mp3", "m4b", "aac", "ogg", "wma", "aiff", "webm"], label="Convert to:") - convert_btn = gr.Button("Convert") + convert_btn = gr.Button("Convert", variant="primary") convert_btn.click(fn=convert, inputs=[audiofile, format], outputs=converted_audio) def clear_convert(): @@ -226,9 +226,9 @@ def clear_convert(): with gr.Row(equal_height=True): - statsbtn = gr.Button("Stats") + statsbtn = gr.Button("Stats", variant="primary") statsbtn.click(stats, audiofile, statsout) - acxbtn = gr.Button("ACX") + acxbtn = gr.Button("ACX", variant="primary") acxbtn.click(acx, audiofile, acxout) diff --git a/src/audiotame/audiotame.sh b/src/audiotame/audiotame.sh index db129f4..944a804 100755 --- a/src/audiotame/audiotame.sh +++ b/src/audiotame/audiotame.sh @@ -303,7 +303,7 @@ if [[ $SOX_DENOISE -eq 1 ]] && [[ $input_extension != "opus" ]]; then echo "No noise segments detected." fi else - echo "$SOX_DENOISE is $SOX_DENOISE" + echo "SOX_DENOISE is $SOX_DENOISE" echo "input_extension is $input_extension" echo "Not applying sox denoising" fi @@ -345,7 +345,6 @@ fi - if [[ -f "$audio_dir/.$base_name_no_ext-nosilence.$input_extension" ]]; then kitten_noise="$audio_dir/.$base_name_no_ext-nosilence.$input_extension" echo "$kitten_noise created" @@ -358,7 +357,7 @@ fi # May re-sample to 48khz echo "ARNNDN variable is $ARNNDN" if [[ $ARNNDN -eq 1 ]]; then - ffmpeg -i $kitten_noise -af arnndn=m=$audiotame_script_dir/arnndn-models/$ARNNDN_MODEL "$audio_dir/.$base_name_no_ext-arnndn.$input_extension" + ffmpeg -i $kitten_noise -af arnndn=m=$audiotame_script_dir/arnndn-models/$ARNNDN_MODEL "$audio_dir/.$base_name_no_ext-arnndn.$input_extension" -y fi @@ -377,12 +376,8 @@ fi if [[ $input_extension == "mp3" ]]; then - if command -v mp3gain >/dev/null 2>&1; then - cp "$kitten_prenorm" $audio_dir/.$base_name_no_ext-normalized.$input_extension - mp3gain -r -c $audio_dir/.$base_name_no_ext-normalized.$input_extension - else - echo "mp3gain is not installed. Skipping step" - fi + cp "$kitten_prenorm" $audio_dir/.$base_name_no_ext-normalized.$input_extension + mp3gain -r -c $audio_dir/.$base_name_no_ext-normalized.$input_extension else # ffmpeg-normalize sometimes re-samples to 192khz echo "Loudness target: $LOUD_TARGET"