fix Dockerfile

Reviewed-on: #42

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

@@ -23,14 +23,14 @@ 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
@@ -38,7 +38,7 @@ jobs:
 
       # Build and push the Docker image
       - name: Build and Push Docker Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .                    # Build context (current directory)
           file: ./Dockerfile            # Path to Dockerfile
@@ -75,8 +75,13 @@ jobs:
           git config --local user.signingkey ~/.ssh/id_ed25519
           git config --local gpg.format ssh
           git config --local commit.gpgsign true
-          git commit -a -m "yt-dlp-bot: deploy update to ${{ needs.build-and-push.outputs.sha_short }}"
-
+          
+          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:

.gitea/workflows/build-testing.yaml

@@ -1,49 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  push:
-    branches:
-      - v1-refactor
-
-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@v6
-
-      - name: Set outputs
-        id: vars
-        run: |
-          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      # Set up Docker Buildx for building the image
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        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
-        with:
-          registry: git.dubyatp.xyz
-          username: williamp
-          password: ${{ secrets.ACTIONS_TOKEN }}  # Personal Access Token for authentication
-
-      # Build and push the Docker image
-      - name: Build and Push Docker Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .                    # Build context (current directory)
-          file: ./Dockerfile            # Path to Dockerfile
-          platforms: "linux/amd64,linux/arm64"
-          push: true                    # Push to registry after building
-          tags: |
-            git.dubyatp.xyz/williamp/yt-dlp-bot:refactor-test-${{steps.vars.outputs.sha_short }}
-          # Tags the image with 'latest' and the commit SHA

app/ytdlp.go

@@ -154,7 +154,6 @@ func DownloadVideo(out_dir, temp_dir, url string, opts DownloadOptions, progress
 		SetExecutable(ytdlpBinary).
 		Paths(homePath).
 		Paths(tempPath).
-		RecodeVideo("mp4").
 		ProgressFunc(100*time.Millisecond, func(prog ytdlp.ProgressUpdate) {
 			if prog.Status == ytdlp.ProgressStatusFinished ||
 				prog.Status == ytdlp.ProgressStatusStarting ||

flake.nix

@@ -46,8 +46,11 @@
                         .venv/bin/pip install -r ./app/requirements.txt
                         source .venv/bin/activate
                     fi
+<<<<<<< HEAD
+=======
 
                     export YTDLP_BIN=${pkgs.lib.getExe pkgs.yt-dlp}
+>>>>>>> v1-refactor
                 '';
             };
         });