Imdb watchlist fix

.github/.wordlist.txt

@@ -127,6 +127,7 @@ integrations
 ints
 io
 iteratively
+jd
 Jinja
 jkirkcaldy
 JohnFawkes
@@ -146,6 +147,7 @@ kuesel
 Launchd
 Letterboxd
 LGBTQ
+Limburgish
 linas
 Lingala
 linux
@@ -226,6 +228,7 @@ portainer
 Powershell
 pre
 prepend
+psutil
 PUID
 puid
 QNAP
@@ -258,6 +261,7 @@ Skywalker
 Sohjiro
 Sohjiro's
 sonarr
+ssl
 SSL
 StevenLu
 StevenLu's

.github/workflows/docker-develop.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-latest.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-nightly.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-version.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/increment-build.yml

@@ -1,20 +1,51 @@
 name: Increment Build
 
 on:
-  pull_request:
+  pull_request_target:
     branches: [nightly]
     types: [closed]
 
 jobs:
-  increment-build:
+
+  verify-changes:
     runs-on: ubuntu-latest
     if: github.base_ref == 'nightly' && github.event.pull_request.merged
+    outputs:
+      build: ${{ steps.list-changes.outputs.build }}
+    steps:
+
+      - name: Check Out Repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: nightly
+
+      - name: Get changes
+        id: get-changes
+        run: echo "files=$(git diff --name-only HEAD^ | xargs)" >> $GITHUB_OUTPUT
+
+      - name: List changed files
+        id: list-changes
+        run: |
+            for file in ${{ steps.get-changes.outputs.files }}; do
+                if [[ $file =~ ^(defaults|fonts|modules|kometa.py|requirements.txt|.dockerignore|Dockerfile).*$ ]] ; then
+                    echo "$file will trigger docker build"
+                    echo "build=true" >> $GITHUB_OUTPUT
+                else
+                    echo "$file will not trigger docker build"
+                fi
+            done
+
+  increment-build:
+    runs-on: ubuntu-latest
+    needs: [ verify-changes ]
     outputs:
       version: ${{ steps.update-version.outputs.version }}
       build-value: ${{ steps.update-version.outputs.build-value }}
       commit-msg: ${{ steps.update-version.outputs.commit-msg }}
       commit-hash: ${{ steps.update-version.outputs.commit-hash }}
       commit-short: ${{ steps.update-version.outputs.commit-short }}
+      pr-tag: ${{ steps.update-version.outputs.pr-tag }}
     steps:
 
       - name: Create App Token
@@ -34,12 +65,27 @@ jobs:
       - name: Update VERSION File
         id: update-version
         run: |
+            branch_name=${{ github.event.pull_request.head.ref }}
+            repo_name=${{ github.event.pull_request.head.repo.full_name }}
+            base_name="${repo_name%/*}"
+            if [[ "${branch_name}" =~ ^(master|develop|nightly)$ ]]; then 
+                pr_tag="${base_name}"
+            else
+                pr_tag="${branch_name}"
+            fi
+            echo "pr-tag=${pr_tag}" >> $GITHUB_OUTPUT
+
             value=$(cat VERSION)
             old_msg=$(git log -1 HEAD --pretty=format:%s)
             version="${value%-build*}"
 
             if [[ "$value" == *"-"* ]]; then
-                build_value="$((${value#*-build} + 1))"
+                value2="${value#*-build}"
+                if [[ "$value2" == *"."* ]]; then
+                    build_value="$((${value2%.*} + 1))"
+                else
+                    build_value="$((${value2} + 1))"
+                fi
             else
                 build_value="1"
             fi
@@ -60,35 +106,6 @@ jobs:
             git commit -m "${new_msg}" --amend
             git push origin nightly --force-with-lease
 
-  verify-changes:
-    runs-on: ubuntu-latest
-    needs: [ increment-build ]
-    outputs:
-      build: ${{ steps.list-changes.outputs.build }}
-    steps:
-
-      - name: Check Out Repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: nightly
-
-      - name: Get changes
-        id: get-changes
-        run: echo "files=$(git diff --name-only HEAD^ | xargs)" >> $GITHUB_OUTPUT
-
-      - name: List changed files
-        id: list-changes
-        run: |
-            for file in ${{ steps.get-changes.outputs.files }}; do
-                if [[ $file =~ ^(defaults|fonts|modules|kometa.py|requirements.txt|.dockerignore|Dockerfile).*$ ]] ; then
-                    echo "$file will trigger docker build"
-                    echo "build=true" >> $GITHUB_OUTPUT
-                else
-                    echo "$file will not trigger docker build"
-                fi
-            done
-
   docker-build-nightly:
     runs-on: ubuntu-latest
     needs: [ increment-build, verify-changes ]
@@ -117,7 +134,7 @@ jobs:
 
       - name: Build and Push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./
           file: ./Dockerfile
@@ -175,3 +192,16 @@ jobs:
           avatar_url: ${{ vars.BOT_IMAGE }}
           author: ${{ vars.REPO_NAME }} Nightly Release
           author_icon_url: ${{ vars.RELEASE_IMAGE }}
+
+  cleanup-tags:
+    runs-on: ubuntu-latest
+    needs: [ increment-build, verify-changes, docker-build-nightly, commit-notification ]
+    if: ${{ success() }}
+    steps:
+      - name: remove tag
+        run: |
+            HUB_TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d "{\"username\": \"${{ secrets.DOCKER_HUB_USERNAME }}\", \"password\": \"${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}\"}" https://hub.docker.com/v2/users/login/ | jq -r .token)
+            curl -i -X DELETE \
+            -H "Accept: application/json" \
+            -H "Authorization: JWT $HUB_TOKEN" \
+            https://hub.docker.com/v2/repositories/kometateam/kometa/tags/${{ needs.increment-build.outputs.pr-tag }}/

.github/workflows/release-develop.yml

@@ -2,6 +2,10 @@ name: Develop Release
 
 on:
   workflow_dispatch:
+    inputs:
+      build_number:
+        description: Choose the build number to push develop to.
+        default: 0
 
 jobs:
   release-develop:
@@ -23,10 +27,10 @@ jobs:
           fetch-depth: 0
 
       - name: Fast Forward Develop
+        id: forward
         run: |
             value=$(cat VERSION)
             develop_hash=$(git rev-parse HEAD)
-            next_build="${{ vars.DEVELOP_BUILD }}"
 
             if [[ "$value" == *"-"* ]]; then
                 develop_build="$((${value#*-build}))"
@@ -35,7 +39,6 @@ jobs:
             fi
 
             git checkout origin/nightly
-
             value=$(cat VERSION)
 
             if [[ "$value" == *"-"* ]]; then
@@ -46,16 +49,25 @@ jobs:
 
             echo "DEVELOP_BUILD: '${develop_build}'"
             echo "NIGHTLY_BUILD: '${nightly_build}'"
-            echo "NEXT_BUILD: '${next_build}'"
-
-            if (( next_build <= develop_build )); then
-                echo "::error::NEXT_BUILD variable (${next_build}) must be greater than DEVELOP_BUILD (${develop_build})"
+
+            if ! [[ ${{ github.event.inputs.build_number }} =~ ^[0-9]+$ ]]; then
+                echo "::error::BUILD_NUMBER (${{ github.event.inputs.build_number }}) must be a number"
                 exit 1
-            elif (( next_build > nightly_build )); then
-                echo "::error::NEXT_BUILD variable (${next_build}) must be less than or equal to NIGHTLY_BUILD (${nightly_build})"
+            elif [[ "${{ github.event.inputs.build_number }}" == "0" ]]; then
+                next_build="${nightly_build}"
+            elif (( ${{ github.event.inputs.build_number }} <= develop_build )); then
+                echo "::error::BUILD_NUMBER (${{ github.event.inputs.build_number }}) must be greater than DEVELOP_BUILD (${develop_build})"
                 exit 1
+            elif (( ${{ github.event.inputs.build_number }} > nightly_build )); then
+                echo "::error::BUILD_NUMBER (${{ github.event.inputs.build_number }}) must be less than or equal to NIGHTLY_BUILD (${nightly_build})"
+                exit 1
+            else
+                next_build="${{ github.event.inputs.build_number }}"
             fi
-
+
+            echo "NEXT_BUILD: '${next_build}'"
+            echo "build=next_build" >> $GITHUB_OUTPUT
+
             while : ; do
                 value=$(cat VERSION)
 
@@ -86,7 +98,7 @@ jobs:
         if: success()
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
-          title: "${{ vars.REPO_NAME }} develop pushed to Build ${{ vars.DEVELOP_BUILD }}: ${{ vars.TEXT_SUCCESS }}"
+          title: "${{ vars.REPO_NAME }} develop pushed to Build ${{ steps.forward.outputs.build }}: ${{ vars.TEXT_SUCCESS }}"
           url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: ${{ vars.COLOR_SUCCESS }}
           username: ${{ vars.BOT_NAME }}
@@ -100,7 +112,7 @@ jobs:
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
           message: ${{ vars.BUILD_FAILURE_ROLE }}
-          title: "${{ vars.REPO_NAME }} develop pushed to Build ${{ vars.DEVELOP_BUILD }}: ${{ vars.TEXT_FAILURE }}"
+          title: "${{ vars.REPO_NAME }} develop pushed to Build ${{ steps.forward.outputs.build }}: ${{ vars.TEXT_FAILURE }}"
           url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: ${{ vars.COLOR_FAILURE }}
           username: ${{ vars.BOT_NAME }}

.github/workflows/release-master.yml

@@ -2,6 +2,15 @@ name: Master Release
 
 on:
   workflow_dispatch:
+    inputs:
+      release_type:
+        type: choice
+        description: Choose which type of release to perform.
+        options:
+          - major
+          - minor
+          - patch
+        default: patch
 
 jobs:
   release-master:
@@ -26,21 +35,25 @@ jobs:
         run: |
             value=$(cat VERSION)
             version="${value%-build*}"
-            next_version="${{ vars.NEXT_VERSION }}"
             echo "CURRENT_VERSION: '${version}'"
-            echo "NEXT_VERSION: '${next_version}'"
+            IFS='.' read -r MAJOR MINOR PATCH <<< "$version"
 
-            if [[ "$version" == "$next_version" ]]; then
-                echo "::error::NEXT_VERSION variable (${next_version}) must be incremented"
-                exit 1
+            if [[ "${{ github.event.inputs.release_type }}" == "major" ]]; then
+                NEW_VERSION="$((MAJOR+1)).0.0"
+            elif [[ "${{ github.event.inputs.release_type }}" == "minor" ]]; then
+                NEW_VERSION="${MAJOR}.$((MINOR+1)).0"
+            else
+                NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH+1))"
             fi
 
-            echo "$next_version" > "VERSION"
+            echo "NEW_VERSION='${NEW_VERSION}'"
+            echo "new_ver=$NEW_VERSION" >> $GITHUB_OUTPUT
+            echo "$NEW_VERSION" > "VERSION"
 
             git config --local user.email "[email protected]"
             git config --local user.name "GitHub Action"
             git add VERSION
-            git commit -m "Kometa Release ${next_version}"
+            git commit -m "Kometa Release ${NEW_VERSION}"
             git push origin nightly
             git push origin refs/heads/nightly:refs/heads/develop
             git push origin refs/heads/nightly:refs/heads/main
@@ -50,7 +63,7 @@ jobs:
         if: success()
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
-          title: "${{ vars.REPO_NAME }} master release ${{ vars.NEXT_VERSION }}: ${{ vars.TEXT_SUCCESS }}"
+          title: "${{ vars.REPO_NAME }} master release ${{ steps.release.outputs.new_ver }}: ${{ vars.TEXT_SUCCESS }}"
           url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: ${{ vars.COLOR_SUCCESS }}
           username: ${{ vars.BOT_NAME }}
@@ -64,7 +77,7 @@ jobs:
         with:
           webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
           message: ${{ vars.BUILD_FAILURE_ROLE }}
-          title: "${{ vars.REPO_NAME }} master release ${{ vars.NEXT_VERSION }}: ${{ vars.TEXT_FAILURE }}"
+          title: "${{ vars.REPO_NAME }} master release ${{ steps.release.outputs.new_ver }}: ${{ vars.TEXT_FAILURE }}"
           url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }}
           color: ${{ vars.COLOR_FAILURE }}
           username: ${{ vars.BOT_NAME }}