quasarr 2.4.5__tar.gz → 2.4.7__tar.gz

{quasarr-2.4.5 → quasarr-2.4.7}/.github/workflows/Beta.yml

@@ -1,4 +1,4 @@
-name: Beta Docker Build
+name: Beta
 
 on:
   workflow_dispatch:
@@ -24,7 +24,6 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
-          # Fixed: Added glob to silence warning since you might not have uv.lock
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
       - name: Get Version
@@ -35,6 +34,10 @@ jobs:
   build-wheel:
     name: Build Wheel
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      attestations: write
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v5
@@ -47,6 +50,12 @@ jobs:
           cache-dependency-glob: "pyproject.toml"
       - name: Build wheel
         run: uv build
+
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-path: "dist/*.whl"
+
       - uses: actions/upload-artifact@v4
         with:
           name: wheel
@@ -66,26 +75,27 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
+
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
-      - uses: actions/cache@v4
-        with:
-          path: ~\AppData\Local\pyinstaller
-          key: ${{ runner.os }}-pyinstaller-${{ hashFiles('pyproject.toml') }}
-          restore-keys: ${{ runner.os }}-pyinstaller-
+
       - name: Disable Windows Defender
         shell: powershell
         run: Set-MpPreference -DisableRealtimeMonitoring $true
+
       - name: Install dependencies
         run: |
           uv sync --group build
+
       - name: Build exe
         run: |
+          uv run python -c "from PIL import Image; Image.open('Quasarr.png').save('Quasarr.ico')"
           uv run python quasarr/providers/version.py --create-version-file
-          uv run pyinstaller --clean --onefile -y --version-file "file_version_info.txt" "Quasarr.py" -n "quasarr-${{ needs.version.outputs.version }}-standalone-win64"
+          uv run pyinstaller --clean --onefile -y --version-file "file_version_info.txt" --icon "Quasarr.ico" "Quasarr.py" -n "quasarr-${{ needs.version.outputs.version }}-standalone-win64"
+
       - uses: actions/upload-artifact@v4
         with:
           name: exe-amd64
@@ -162,7 +172,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ version, build-docker-amd64, build-docker-arm64 ]
     steps:
-      # Fixed: Added setup-buildx-action to ensure 'imagetools' supports annotations correctly
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
@@ -171,20 +180,17 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Create and Push Manifests
         run: |
-          # 1. Define source tags
           TAG_AMD64="${{ needs.version.outputs.version }}-beta-amd64"
           TAG_ARM64="${{ needs.version.outputs.version }}-beta-arm64"
-          
-          # Fixed: Use shell variable directly and 'index:' prefix to strictly target the manifest list
           ANNOTATION="index:org.opencontainers.image.description=$DESCRIPTION"
           
-          # 2. Create manifest for GHCR :beta
+          # Manifest for :beta
           docker buildx imagetools create -t ${{ env.GHCR_ENDPOINT }}:beta \
             --annotation "$ANNOTATION" \
             ${{ env.GHCR_ENDPOINT }}:beta-amd64 \
             ${{ env.GHCR_ENDPOINT }}:beta-arm64
 
-          # 3. Create manifest for GHCR :version-beta
+          # Manifest for :version-beta
           docker buildx imagetools create -t ${{ env.GHCR_ENDPOINT }}:${{ needs.version.outputs.version }}-beta \
             --annotation "$ANNOTATION" \
             ${{ env.GHCR_ENDPOINT }}:${TAG_AMD64} \

{quasarr-2.4.5 → quasarr-2.4.7}/.github/workflows/Release.yml

@@ -33,7 +33,6 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
-          # Fixed: Added glob to silence warning
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
       - name: Get Version
@@ -44,6 +43,10 @@ jobs:
   build-wheel:
     name: Build Wheel
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      attestations: write
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v5
@@ -56,6 +59,10 @@ jobs:
           cache-dependency-glob: "pyproject.toml"
       - name: Build wheel
         run: uv build
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-path: "dist/*.whl"
       - uses: actions/upload-artifact@v4
         with:
           name: wheel
@@ -75,26 +82,27 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
+
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
-      - uses: actions/cache@v4
-        with:
-          path: ~\AppData\Local\pyinstaller
-          key: ${{ runner.os }}-pyinstaller-${{ hashFiles('pyproject.toml') }}
-          restore-keys: ${{ runner.os }}-pyinstaller-
+
       - name: Disable Windows Defender
         shell: powershell
         run: Set-MpPreference -DisableRealtimeMonitoring $true
+
       - name: Install dependencies
         run: |
           uv sync --group build
+
       - name: Build exe
         run: |
+          uv run python -c "from PIL import Image; Image.open('Quasarr.png').save('Quasarr.ico')"
           uv run python quasarr/providers/version.py --create-version-file
-          uv run pyinstaller --clean --onefile -y --version-file "file_version_info.txt" "Quasarr.py" -n "quasarr-${{ needs.version.outputs.version }}-standalone-win64"
+          uv run pyinstaller --clean --onefile -y --version-file "file_version_info.txt" --icon "Quasarr.ico" "Quasarr.py" -n "quasarr-${{ needs.version.outputs.version }}-standalone-win64"
+
       - uses: actions/upload-artifact@v4
         with:
           name: exe-amd64
@@ -183,7 +191,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ version, build-docker-amd64, build-docker-arm64 ]
     steps:
-      # Fixed: Added setup-buildx-action
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
@@ -196,29 +203,23 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Create and Push Manifests
         run: |
-          # 1. Define source tags
           TAG_AMD64="${{ needs.version.outputs.version }}-amd64"
           TAG_ARM64="${{ needs.version.outputs.version }}-arm64"
-          # Fixed: Added index: prefix and using shell variable
           ANNOTATION="index:org.opencontainers.image.description=$DESCRIPTION"
           
-          # 2. Create manifest for DockerHub :latest
           docker buildx imagetools create -t ${{ env.ENDPOINT }}:latest \
             ${{ env.ENDPOINT }}:latest-amd64 \
             ${{ env.ENDPOINT }}:latest-arm64
 
-          # 3. Create manifest for DockerHub :version
           docker buildx imagetools create -t ${{ env.ENDPOINT }}:${{ needs.version.outputs.version }} \
             ${{ env.ENDPOINT }}:${TAG_AMD64} \
             ${{ env.ENDPOINT }}:${TAG_ARM64}
 
-          # 4. Create manifest for GHCR :latest
           docker buildx imagetools create -t ${{ env.GHCR_ENDPOINT }}:latest \
             --annotation "$ANNOTATION" \
             ${{ env.GHCR_ENDPOINT }}:latest-amd64 \
             ${{ env.GHCR_ENDPOINT }}:latest-arm64
 
-          # 5. Create manifest for GHCR :version
           docker buildx imagetools create -t ${{ env.GHCR_ENDPOINT }}:${{ needs.version.outputs.version }} \
             --annotation "$ANNOTATION" \
             ${{ env.GHCR_ENDPOINT }}:${TAG_AMD64} \
@@ -234,6 +235,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
+
       - uses: actions/download-artifact@v4
         with:
           name: wheel
@@ -242,6 +244,17 @@ jobs:
         with:
           name: exe-amd64
           path: ./exe-amd64
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+          cache-dependency-glob: "pyproject.toml"
+
+      - name: Publish to PyPI
+        if: ${{ !inputs.skip_pypi }}
+        run: uv publish ./wheel/* --token ${{ secrets.PYPI_TOKEN }}
+
       - name: Generate changelog
         id: changelog
         uses: metcalfc/changelog-generator@v4.6.2
@@ -256,7 +269,10 @@ jobs:
             echo -e "\n$PR_BODY" >> .github/Changelog.md
           fi
       - name: Append changelog
-        run: echo -e "\n${{ steps.changelog.outputs.changelog }}" >> .github/Changelog.md
+        run: |
+          echo -e "\n${{ steps.changelog.outputs.changelog }}" >> .github/Changelog.md
+          echo -e "\n[Attestation](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/attestations)" >> .github/Changelog.md
+
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
@@ -264,9 +280,3 @@ jobs:
           artifactErrorsFailBuild: true
           bodyFile: ".github/Changelog.md"
           tag: v.${{ needs.version.outputs.version }}
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-      - name: Upload to PyPI
-        if: ${{ !inputs.skip_pypi }}
-        run: |
-          uv run --with twine --with packaging python -m twine upload ./wheel/* -u __token__ -p ${{ secrets.PYPI_TOKEN }}

{quasarr-2.4.5 → quasarr-2.4.7}/.gitignore

@@ -4,8 +4,8 @@
 *.pyc
 *.bak
 
-# Build Tools
-venv
+# Virtual Environment by uv
+uv.lock
 .venv
 
 # PyCharm

{quasarr-2.4.5 → quasarr-2.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.4.5
+Version: 2.4.7
 Summary: Quasarr connects JDownloader with Radarr, Sonarr and LazyLibrarian. It also decrypts links protected by CAPTCHAs.
 Author-email: rix1337 <rix1337@users.noreply.github.com>
 License-File: LICENSE
@@ -281,7 +281,7 @@ Image access is limited to [active monthly GitHub sponsors](https://github.com/u
 3. Copy the **API Key** value
 4. Use this value for the `QUASARR_API_KEY` environment variable
 
-> **Note:** The API key is required for SponsorsHelper to communicate securely with Quasarr. Without it, all requests
+> **Note:** The API Key is required for SponsorsHelper to communicate securely with Quasarr. Without it, all requests
 > will be rejected with a 401/403 error.
 
 ---
@@ -320,7 +320,7 @@ docker run -d \
 | Parameter                       | Description                                                                           |
 |---------------------------------|---------------------------------------------------------------------------------------|
 | `QUASARR_URL`                   | Local URL of Quasarr (e.g., `http://192.168.0.1:8080`)                                |
-| `QUASARR_API_KEY`               | Your Quasarr API key (found in Quasarr web UI under "API Settings")                   |
+| `QUASARR_API_KEY`               | Your Quasarr API Key (found in Quasarr web UI under "API Settings")                   |
 | `DEATHBYCAPTCHA_TOKEN`          | [DeathByCaptcha](https://deathbycaptcha.com/register?refid=6184288242b) account token |
 | `GITHUB_TOKEN`                  | Classic GitHub PAT with the scopes listed above                                       |
 | `FLARESOLVERR_URL`              | Local URL of [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr)             |

{quasarr-2.4.5 → quasarr-2.4.7}/README.md

@@ -263,7 +263,7 @@ Image access is limited to [active monthly GitHub sponsors](https://github.com/u
 3. Copy the **API Key** value
 4. Use this value for the `QUASARR_API_KEY` environment variable
 
-> **Note:** The API key is required for SponsorsHelper to communicate securely with Quasarr. Without it, all requests
+> **Note:** The API Key is required for SponsorsHelper to communicate securely with Quasarr. Without it, all requests
 > will be rejected with a 401/403 error.
 
 ---
@@ -302,7 +302,7 @@ docker run -d \
 | Parameter                       | Description                                                                           |
 |---------------------------------|---------------------------------------------------------------------------------------|
 | `QUASARR_URL`                   | Local URL of Quasarr (e.g., `http://192.168.0.1:8080`)                                |
-| `QUASARR_API_KEY`               | Your Quasarr API key (found in Quasarr web UI under "API Settings")                   |
+| `QUASARR_API_KEY`               | Your Quasarr API Key (found in Quasarr web UI under "API Settings")                   |
 | `DEATHBYCAPTCHA_TOKEN`          | [DeathByCaptcha](https://deathbycaptcha.com/register?refid=6184288242b) account token |
 | `GITHUB_TOKEN`                  | Classic GitHub PAT with the scopes listed above                                       |
 | `FLARESOLVERR_URL`              | Local URL of [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr)             |

{quasarr-2.4.5 → quasarr-2.4.7}/docker/Dockerfile

@@ -12,7 +12,10 @@ COPY --from=uv /uv /usr/local/bin/uv
 
 # install local package
 COPY dist/*.whl /tmp/
-RUN uv tool install /tmp/*.whl --force && rm /tmp/*.whl
+
+# Updated: Added cache mount for uv to speed up installation
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv tool install /tmp/*.whl --force && rm /tmp/*.whl
 
 # Ensure the binary is in the PATH
 ENV PATH="/root/.local/bin:$PATH"

{quasarr-2.4.5 → quasarr-2.4.7}/pyproject.toml

@@ -37,4 +37,5 @@ packages = ["quasarr"]
 [dependency-groups]
 build = [
     "pyinstaller>=6.0.0",
+    "pillow>=12.0.0",
 ]

{quasarr-2.4.5 → quasarr-2.4.7}/quasarr/__init__.py

@@ -212,7 +212,7 @@ def run():
 
         print('Setup instructions: "https://github.com/rix1337/Quasarr?tab=readme-ov-file#instructions"')
         print(f'URL: "{shared_state.values['internal_address']}"')
-        print(f'API key: "{api_key}" (without quotes)')
+        print(f'API Key: "{api_key}" (without quotes)')
 
         if external_address != internal_address:
             print(f'External URL: "{shared_state.values["external_address"]}"')

{quasarr-2.4.5 → quasarr-2.4.7}/quasarr/api/__init__.py

@@ -175,7 +175,7 @@ def get_api(shared_state_dict, shared_state_lock):
                     </div>
 
                     <p style="margin-top: 15px;">
-                        {render_button("Regenerate API key", "secondary", {"onclick": "confirmRegenerateApiKey()"})}
+                        {render_button("Regenerate API Key", "secondary", {"onclick": "confirmRegenerateApiKey()"})}
                     </p>
                 </div>
             </details>
@@ -440,7 +440,7 @@ def get_api(shared_state_dict, shared_state_lock):
                 if (copyKeyBtn) {{
                     copyKeyBtn.onclick = function() {{
                         copyToClipboard(apiInput.value, copyKeyBtn, function() {{
-                            // Re-hide the API key after copying
+                            // Re-hide the API Key after copying
                             apiInput.type = 'password';
                             toggleBtn.innerText = 'Show';
                         }});
@@ -462,8 +462,8 @@ def get_api(shared_state_dict, shared_state_lock):
 
             function confirmRegenerateApiKey() {{
                 showModal(
-                    'Regenerate API key?', 
-                    'Are you sure you want to regenerate the API key? This will invalidate the current key.', 
+                    'Regenerate API Key?', 
+                    'Are you sure you want to regenerate the API Key? This will invalidate the current key.', 
                     `<button class="btn-secondary" onclick="closeModal()">Cancel</button>
                      <button class="btn-primary" onclick="location.href='/regenerate-api-key'">Regenerate</button>`
                 );
@@ -477,6 +477,6 @@ def get_api(shared_state_dict, shared_state_lock):
     @app.get('/regenerate-api-key')
     def regenerate_api_key():
         shared_state.generate_api_key()
-        return render_success(f'API key replaced!', 5)
+        return render_success(f'API Key replaced!', 5)
 
     Server(app, listen='0.0.0.0', port=shared_state.values["port"]).serve_forever()

{quasarr-2.4.5 → quasarr-2.4.7}/quasarr/providers/auth.py

@@ -319,9 +319,9 @@ def require_api_key(func):
     def decorated(*args, **kwargs):
         api_key = Config('API').get('key')
         if not request.query.apikey:
-            return abort(401, "Missing API key")
+            return abort(401, "Missing API Key")
         if request.query.apikey != api_key:
-            return abort(403, "Invalid API key")
+            return abort(403, "Invalid API Key")
         return func(*args, **kwargs)
 
     return decorated

{quasarr-2.4.5 → quasarr-2.4.7}/quasarr/providers/shared_state.py

@@ -7,10 +7,11 @@ import os
 import re
 import time
 import traceback
-import unicodedata
 from datetime import datetime, timedelta, date
 from urllib import parse
 
+import unicodedata
+
 import quasarr
 from quasarr.providers.log import info, debug
 from quasarr.providers.myjd_api import Myjdapi, TokenExpiredException, RequestTimeoutException, MYJDException, Jddevice
@@ -74,7 +75,7 @@ def set_files(config_path):
 def generate_api_key():
     api_key = os.urandom(32).hex()
     Config('API').save("key", api_key)
-    info(f'API key replaced with: "{api_key}!"')
+    info(f'API Key replaced with: "{api_key}!"')
     return api_key
 
 

{quasarr-2.4.5 → quasarr-2.4.7}/quasarr/providers/version.py

@@ -5,7 +5,7 @@
 import re
 import sys
 
-__version__ = "2.4.5"
+__version__ = "2.4.7"
 
 
 def get_version():