fixed typo

This reverts commit 750dc265ca.

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.gitea/workflows/docker-build.yaml

@@ -1,70 +1,72 @@
-name: build + push containers to gitea (every) and docker (daily)
+name: push new builds to gitea, dockerhub
 
 on:
   push:
-    branches: [ "master" ]
-  schedule:
-    - cron: '0 0 * * 0'   # weekly check
+    branches: ["master"]
   workflow_dispatch:
 
 jobs:
-  dockerhub:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get current version
-        id: current
+      - name: Get youdis version
+        id: youdis
         run: |
-          CURRENT=$(cat version.txt || echo "none")
-          echo "version=$CURRENT" >> $GITHUB_OUTPUT
-
-      - name: check latest yt-dlp release
-        id: latest
-        run: |
-          LATEST=$(curl -s https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest | jq -r .tag_name || echo "error")
-          if [ "$LATEST" == "error" ]; then
-            echo "failed to fetch latest version" >&2
+          YOUDIS_VER=$(cat youdis-version.txt)
+          if [ -z "$YOUDIS_VER" ]; then
+            echo "youdis version empty" >&2
             exit 1
           fi
-          echo "yt-dlp version=$LATEST" >> $GITHUB_OUTPUT
+          echo "youdis-version=$YOUDIS_VER" >> $GITHUB_OUTPUT
+          echo "shortsha=${GITHUB_SHA::5}" >> $GITHUB_OUTPUT
 
-      - name: Update version file if changed
-        run: echo ${{ steps.latest.outputs.version }} > version.txt
-        if: ${{ steps.current.outputs.version != steps.latest.outputs.version }}
+      - name: Decide if build needed
+        id: check_build
+        run: |
+          SHOULD_BUILD=false
+          if [ "${{ steps.youdis.outputs.youdis-version }}" != "$(docker inspect --format='{{ index .Config.Labels "YOUDIS_VERSION" }}' eulaly/youdis:latest || echo none)" ]; then
+            SHOULD_BUILD=true
+          fi
+          echo "should_build=$SHOULD_BUILD" >> $GITHUB_OUTPUT
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push to Dockerhub
+        if: ${{ steps.check_build.outputs.should_build == 'true' }}
         uses: docker/build-push-action@v5
         with:
           push: true
           tags: |
             eulaly/youdis:latest
-            eulaly/youdis:${{ steps.latest.outputs.version }}
-        if: ${{ steps.current.outputs.version != steps.latest.outputs.version }}
+            eulaly/youdis:${{ steps.youdis.outputs.shortsha }}
+          labels: |
+            YOUDIS_VERSION=${{ steps.youdis.outputs.youdis-version }}
 
-  gitea:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to Gitea (local)
-        uses: docker/login-action@v2
+      - name: Login to Gitea
+        uses: docker/login-action@v3
         with:
           registry: git.hgsky.me
-          username: ${{ secrets.GITEA_USERNAME }}
-          password: ${{ secrets.GITEA_TOKEN }}
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.YOUDIS_PASSWORD }}
 
-      - name: Build and push to Gitea (all pushes)
+      - name: Build and push to Gitea
+        if: ${{ steps.check_build.outputs.should_build == 'true' }}
         uses: docker/build-push-action@v5
         with:
           push: true
           tags: |
-            git.hgsky.me/eulaly/youdis:latest
-            git.hgsky.me/eulaly/youdis:dev-${{ github.sha }}
+            git.hgsky.me/ben/youdis:latest
+            git.hgsky.me/ben/youdis:${{ steps.youdis.outputs.shortsha }}            
+          labels: |
+            YOUDIS_VERSION=${{ steps.youdis.outputs.youdis-version }}
+
+      - name: link container in gitea
+        run: |
+          curl -X POST -H "Authorization: token ${{ secrets.SUPER }}" https://git.hgsky.me/api/v1/packages/ben/container/youdis/-/link/youdis
  

.github/workflows/docker-build.yaml

@@ -1,44 +0,0 @@
-name: Check yt-dlp and rebuild if new
-on:
-  schedule:
-    - cron: '0 0 * * 0'
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get current version
-        id: current
-        run: |
-          CURRENT=$(cat version.txt || echo "none")
-          echo "version=$CURRENT" >> $GITHUB_OUTPUT
-
-      - name: Check latest version
-        id: latest
-        run: |
-          LATEST=$(curl -s https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest | jq -r .tag_name || echo "error")
-          if [ "$LATEST" == "error" ]; then
-            echo "failed to fetch latest version" >&2
-            exit 1
-          fi
-          echo "version=$LATEST" >> $GITHUB_OUTPUT
-
-      - name: Update version file if changed
-        run: echo ${{ steps.latest.outputs.version }} > version.txt
-        if: ${{ steps.current.outputs.version != steps.latest.outputs.version }}
-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push docker image
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          tags: eulaly/youdis:latest,eulaly/youdis:${{ steps.latest.outputs.version }}
-        if: ${{ steps.current.outputs.version != steps.latest.outputs.version }}

create-ytdlp-config.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-#copy yt-dlp.conf if missing
-mkdir -p /config
-if [ ! -f /config/yt-dlp.conf ]; then
-    cp /app/default-yt-dlp.conf /config/yt-dlp.conf
-fi
-
-exec "$@"

dockerfile

@@ -4,11 +4,13 @@ WORKDIR /app
 RUN apk update && \
     apk add --no-cache build-base ffmpeg && \
     rm -rf /var/cache/apk/*
-COPY requirements.txt requirements.txt
+COPY requirements.txt .
 RUN python3 -m pip install --no-cache-dir -r requirements.txt
-COPY youdis.py youdis.py
-COPY default-yt-dlp.conf /app/default-yt-dlp.conf
-COPY create-ytdlp-config.sh /app/create-ytdlp-config.sh
-RUN chmod 755 /app/create-ytdlp-config.sh
-ENTRYPOINT ["/app/create-ytdlp-config.sh"]
-CMD ["python3", "youdis.py"]
+
+COPY youdis.py default-yt-dlp.conf update-ytdlp.sh run-youdis.sh /app/
+RUN chmod +x /app/update-ytdlp.sh /app/run-youdis.sh
+
+COPY weekly-restart /etc/cron.d/
+RUN chmod 0644 /etc/cron.d/weekly-restart
+
+ENTRYPOINT ["/app/run-youdis.sh"]

run-youdis.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+#start crond in bg
+crond -l 2
+
+echo "checking for /config/yt-dlp.conf"
+#copy yt-dlp.conf if missing
+mkdir -p /config
+if [ ! -f /config/yt-dlp.conf ]; then
+    echo "yt-dlp.conf not found, setting default"
+    cp /app/default-yt-dlp.conf /config/yt-dlp.conf
+    echo "created yt-dlp.conf"
+fi
+
+python3 -m pip install --no-cache-dir --upgrade --pre "yt-dlp[default]"
+VERSION=$(python3 -m pip show yt-dlp 2>/dev/null | awk '/Version:/ {print $2}')
+echo "updated yt-dlp to $VERSION"
+
+echo "starting youdis"
+exec python3 /app/youdis.py

update-ytdlp.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+echo "updating yt-dlp"
+echo "killing youdis"
+pkill -f youdis.py || true
+python3 -m pip install --no-cache-dir --upgrade --pre "yt-dlp[default]"
+VERSION=$(python3 -m pip show yt-dlp 2>/dev/null | awk '/Version:/ {print $2}')
+
+echo "updated yt-dlp to $VERSION"
+echo "restarting youdis"
+python3 /app/youdis.py &

version.txt

@@ -1 +0,0 @@
-20250823-d707074

weekly-restart

@@ -0,0 +1 @@
+0 3 * * 0 root /app/update-ytdlp.sh

youdis-version.txt

@@ -0,0 +1 @@
+20250829-ec72c56