chore(deps): update docker/setup-buildx-action action to v4

Reviewed-on: #40

.gitea/workflows/build-and-push.yaml

@@ -9,10 +9,12 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest  # Use a runner with Docker support
     container: ghcr.io/catthehacker/ubuntu:act-latest  # Image with Docker pre-installed
+    outputs:
+      sha_short: ${{ steps.vars.outputs.sha_short }}
     steps:
       # Checkout the repository code
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set outputs
         id: vars
@@ -21,18 +23,18 @@ jobs:
 
       # Set up Docker Buildx for building the image
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
         with:
           driver: remote
           endpoint: 'tcp://buildkitd:1234'
 
       # Log in to the Gitea container registry
       - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: git.dubyatp.xyz
           username: williamp
-          password: ${{ secrets.REGISTRY_TOKEN }}  # Personal Access Token for authentication
+          password: ${{ secrets.ACTIONS_TOKEN }}  # Personal Access Token for authentication
 
       # Build and push the Docker image
       - name: Build and Push Docker Image
@@ -46,3 +48,43 @@ jobs:
             git.dubyatp.xyz/williamp/yt-dlp-bot:latest
             git.dubyatp.xyz/williamp/yt-dlp-bot:${{steps.vars.outputs.sha_short }}
           # Tags the image with 'latest' and the commit SHA
+
+  deploy-on-green:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+    steps:
+      - name: Checkout target repository
+        uses: actions/checkout@v6
+        with:
+          repository: infrastructure/core-apps
+          token: ${{ secrets.ACTIONS_TOKEN }}
+          ref: main
+
+      - name: Update image tag in deployment.yaml
+        uses: mikefarah/yq@master
+        with:
+          cmd: yq eval '.spec.template.spec.containers[0].image = "git.dubyatp.xyz/williamp/yt-dlp-bot:${{ needs.build-and-push.outputs.sha_short }}"' -i yt-dlp-bot/deployment.yaml
+
+      - name: Commit changes
+        run: |
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          git config --local user.email "actions@noreply.dubyatp.xyz"
+          git config --local user.name "actions[bot]"
+          git config --local user.signingkey ~/.ssh/id_ed25519
+          git config --local gpg.format ssh
+          git config --local commit.gpgsign true
+          
+          if [ -n "$(git status --porcelain)" ]; then
+            git commit -a -m "yt-dlp-bot: deploy update to ${{ needs.build-and-push.outputs.sha_short }}"
+          else
+            echo "No changes to commit, skipping..."
+          fi
+          exit 0
+      - name: Push changes
+        uses: ad-m/github-push-action@v1.0.0
+        with:
+          github_token: ${{ secrets.ACTIONS_TOKEN }}
+          repository: infrastructure/core-apps
+          branch: main

Dockerfile

@@ -1,6 +1,6 @@
-FROM python:3.13.5-alpine3.22
+FROM python:3.14.3-alpine3.22
 COPY ./app /app
 WORKDIR /app
-RUN apk add ffmpeg
+RUN apk add ffmpeg deno
 RUN pip install -r requirements.txt
 CMD ["python", "/app/main.py"]

app/main.py

@@ -126,16 +126,29 @@ class DownloadVideo(ui.View):
 
         worker_task = asyncio.create_task(progress_worker(msg))
 
+        error = None
+
         async def progress_callback(percent):
             await progress_queue.put(percent)
         
-        await asyncio.to_thread(
-            ytdlp.download_video, self.url, format_string, out_path, temp_path, progress_callback, asyncio.get_event_loop()
-        )
+        loop = asyncio.get_running_loop()
+        def threaded_download():
+            nonlocal error
+            try:
+                ytdlp.download_video( 
+                    self.url, format_string, out_path, temp_path, progress_callback, loop
+                    )
+            except Exception as e:
+                error = e
+        await asyncio.to_thread(threaded_download)
 
         stop_event.set()
         await worker_task
 
+        if error:
+            await msg.edit(content=f"❌ Download failed: {error}")
+            return
+
         # Show completion and summary
         await msg.edit(content="✅ Download complete!\n"
         )

app/requirements.txt

@@ -1,3 +1,3 @@
-discord.py==2.5.2
-python-dotenv==1.1.1
-yt-dlp==2025.6.30
+discord.py==2.7.1
+python-dotenv==1.2.2
+yt-dlp==2026.3.3

app/ytdlp.py

@@ -2,7 +2,9 @@ import yt_dlp
 import asyncio
 
 def get_formats(url: str):
-    ydl = yt_dlp.YoutubeDL()
+    ydl = yt_dlp.YoutubeDL(params={
+        'remote_components': ['ejs:github']
+    })
     info = ydl.extract_info(url, download=False)
 
     video_options = []
@@ -10,7 +12,7 @@ def get_formats(url: str):
 
     for fmt in info['formats']:
         # Video-only
-        if fmt.get('vcodec') != 'none' and fmt.get('acodec') == 'none':
+        if fmt.get('vcodec') != 'none' and fmt.get('acodec') == 'none' and fmt.get('__needs_testing') == None:
             video_options.append({
                 'height': fmt.get('height'),
                 'resolution': fmt.get('resolution'),
@@ -19,7 +21,7 @@ def get_formats(url: str):
                 'tbr': fmt.get('tbr'),
             })
         # Audio-only
-        elif fmt.get('acodec') != 'none' and fmt.get('vcodec') == 'none':
+        elif fmt.get('acodec') != 'none' and fmt.get('vcodec') == 'none' and fmt.get('__needs_testing') == None:
             audio_options.append({
                 'format': fmt.get('format'),
                 'format_id': fmt.get('format_id'),

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1751498133,
-        "narHash": "sha256-QWJ+NQbMU+NcU2xiyo7SNox1fAuwksGlQhpzBl76g1I=",
+        "lastModified": 1770537093,
+        "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d55716bb59b91ae9d1ced4b1ccdea7a442ecbfdb",
+        "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
         "type": "github"
       },
       "original": {

flake.nix

@@ -25,14 +25,26 @@
                     pkgs.python314
                     pkgs.virtualenv
                     pkgs.ffmpeg_6
+                    pkgs.deno
+                    pkgs.go
+                    pkgs.yt-dlp
                 ];
                 shellHook = ''
+                    if [ -f .env ]; then
+                        set -a
+                        source .env
+                        set +a
+                    fi
+
                     if [ ! -d .venv ]; then
                         echo "Creating Python virtual environment in .venv"
                         python3 -m venv .venv
                     fi
-                    .venv/bin/pip install -r ./app/requirements.txt
-                    source .venv/bin/activate 
+
+                    if compgen -G "app/*.py" > /dev/null; then
+                        .venv/bin/pip install -r ./app/requirements.txt
+                        source .venv/bin/activate
+                    fi
                 '';
             };
         });