Merge pull request #3242 from motioneye-project/beta

Release 0.43.1

Author: MichaIng

.github/workflows/docker.yml

@@ -21,7 +21,8 @@ jobs:
       - uses: docker/metadata-action@v5
         id: meta
         with:
-          images: | # add potential Docker Hub image
+          images: |
+            motioneyeproject/motioneye
             ghcr.io/${{ github.repository_owner }}/motioneye
           tags: |
             type=edge,branch=dev
@@ -35,12 +36,12 @@ jobs:
 
       - uses: docker/setup-buildx-action@v3
 
-      #- name: Login to Docker Hub
-      #  uses: docker/login-action@v3
-      #  if: github.event_name == 'push' && github.repository == 'motioneye-project/motioneye' && steps.meta.outputs.tags != null
-      #  with:
-      #    username: ${{ secrets.DOCKER_USERNAME }}
-      #    password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        if: github.event_name == 'push' && github.repository == 'motioneye-project/motioneye' && steps.meta.outputs.tags != null
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3

.github/workflows/pre-commit-autoupdate.yml

@@ -15,7 +15,7 @@ jobs:
   pre-commit-autoupdate:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         ref: dev
         # https://github.com/peter-evans/create-pull-request/issues/48

.github/workflows/pre-commit.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       with:
         python-version: '3.x'

.github/workflows/pypi_release.yml

@@ -9,7 +9,7 @@ jobs:
   release:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       with:
         python-version: '3.x'

.github/workflows/python_safety.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - run: echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf # error: externally-managed-environment
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: 3.x

.github/workflows/shellcheck.yml

@@ -19,10 +19,10 @@ jobs:
           command -v xz && exit 0
           sudo apt-get -q update
           sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends install xz-utils
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Download shellcheck
         run: |
-          curl -sSfLo shellcheck.tar.xz "$(curl -sSf 'https://api.github.com/repos/koalaman/shellcheck/releases/latest' | mawk -F\" '/"browser_download_url.*\.linux\.x86_64\.tar\.xz"/{print $4;exit}')"
+          curl -sSfLo shellcheck.tar.xz "$(curl -sSfH 'Authorization: Bearer ${{ github.token }}' 'https://api.github.com/repos/koalaman/shellcheck/releases/latest' | mawk -F\" '/"browser_download_url.*\.linux\.x86_64\.tar\.xz"/{print $4;exit}')"
           tar --wildcards --strip-components=1 -xf shellcheck.tar.xz '*/shellcheck'
           rm shellcheck.tar.xz
       - name: Run shellcheck
@@ -31,7 +31,7 @@ jobs:
           for i in "${!FILES[@]}"
           do
               [[ ${FILES[$i]##*/} =~ '.'[^.]*'sh'$ ]] && continue  # file has shell extension
-              [[ $(mawk 'NR==1 && $0 ~ /^#!.*sh([[:blank:]]|$)/{print;exit}' "${FILES[$i]}") ]] && continue  # file has shell shebang
+              [[ $(mawk '/^#!.*sh([[:blank:]]|$)/;{exit}' "${FILES[$i]}") ]] && continue  # file has shell shebang
               unset -v "FILES[$i]"  # else remove from array
           done
           ./shellcheck -xC -o all -e SC2244,SC2250,SC2312 "${FILES[@]}"

.github/workflows/test_python.yml

@@ -24,25 +24,19 @@ jobs:
     runs-on: ${{ matrix.dist }}
     name: "Test on ${{ matrix.dist }}"
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/setup-python@v6
-        with:
-          python-version: ${{ matrix.python }}
-      - if: matrix.dist == 'ubuntu-22.04' || matrix.dist == 'ubuntu-24.04'
-        run: sudo apt-mark hold grub-efi-amd64-signed # GRUB does not always find the drive it was configured for
       - name: Ubuntu Noble workarounds
         if: matrix.dist == 'ubuntu-24.04' || matrix.dist == 'ubuntu-24.04-arm'
         run: |
-          # new firefox package pre-installation script subprocess returned error exit status 1
-          sudo apt-get autopurge firefox
           # error: externally-managed-environment
           echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf
       # ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian.
       - run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq autopurge python3-pip python3-setuptools python3-wheel
       - run: sudo apt-get -q update
-      - run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq --no-install-recommends dist-upgrade
-      - run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq --no-install-recommends install
-             curl gcc ffmpeg libcurl4-openssl-dev libssl-dev motion v4l-utils
+      - run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq --no-install-recommends install curl ffmpeg motion v4l-utils
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python }}
       - run: python3 -m pip install --upgrade pip setuptools wheel
       - run: python3 -m pip install --upgrade build mypy pytest
       - run: python3 -m build

.github/workflows/ubuntu_build.yml

@@ -18,21 +18,15 @@ jobs:
     runs-on: ${{ matrix.dist }}
     name: "Test on ${{ matrix.dist }}"
     steps:
-      - if: matrix.dist == 'ubuntu-22.04' || matrix.dist == 'ubuntu-24.04'
-        run: sudo apt-mark hold grub-efi-amd64-signed # GRUB does not always find the drive it was configured for
       - name: Ubuntu Noble workarounds
         if: matrix.dist == 'ubuntu-24.04' || matrix.dist == 'ubuntu-24.04-arm'
         run: |
-          # new firefox package pre-installation script subprocess returned error exit status 1
-          sudo apt-get autopurge firefox
           # error: externally-managed-environment
           echo -e '[global]\nbreak-system-packages=true' | sudo tee /etc/pip.conf
       # ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian.
       - run: sudo DEBIAN_FRONTEND="noninteractive" apt-get -qq autopurge python3-pip python3-setuptools python3-wheel python3-dev
       - run: sudo apt-get -q update
-      - run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends dist-upgrade
-      - run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends install
-                  ca-certificates curl python3
+      - run: sudo DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends install ca-certificates curl python3
       - run: curl -sSfO 'https://bootstrap.pypa.io/get-pip.py'
       - run: sudo python3 get-pip.py
       - run: sudo python3 -m pip install --upgrade pip setuptools wheel

.github/workflows/update_locales.yml

@@ -27,23 +27,24 @@ jobs:
         sudo apt-get -q update
         sudo DEBIAN_FRONTEND='noninteractive' apt-get -qq --no-install-recommends install gettext
 
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         ref: ${{ github.head_ref }}
         # https://github.com/peter-evans/create-pull-request/issues/48
         token: ${{ secrets.GH_PAT }}
 
     - name: Generate backend template
       run: |
-        pybabel extract -F l10n/babel.cfg -o motioneye/locale/motioneye.pot motioneye/
-        # Remove trailing empty line to satisfy pre-commit
-        sed -i '${/^$/d}' motioneye/locale/motioneye.pot
+        pybabel extract --no-wrap -F l10n/babel.cfg -o motioneye/locale/motioneye.pot motioneye/
+        # Remove python-format flag, and trailing empty line to satisfy pre-commit
+        sed -i -e '/^#, python-format$/d' -e '${/^$/d}' motioneye/locale/motioneye.pot
 
     - name: Generate frontend template
       run: xgettext --no-wrap --from-code=UTF-8 -o motioneye/locale/motioneye.js.pot motioneye/static/js/*.js l10n/*.js
 
     - name: Generate frontend locales
       run: |
+        rm motioneye/static/js/motioneye.*.json
         for i in motioneye/locale/*/LC_MESSAGES/motioneye.js.po
         do
             lang=${i#motioneye/locale/}
@@ -52,12 +53,18 @@ jobs:
             l10n/po2json "$i" "motioneye/static/js/motioneye.$lang.json"
         done
 
+    - name: Cleanup backend locales
+      run: |
+        for i in motioneye/locale/*/LC_MESSAGES/motioneye.mo
+        do
+            [ -f "${i%mo}po" ] || rm "$i"
+        done
+
     - name: Commit changes
       run: |
-        git add -NA
-        git diff -I '^"POT-Creation-Date: ' --exit-code && exit 0
+        git add -A
+        git diff -I '^"POT-Creation-Date: ' --exit-code HEAD && exit 0
         git config user.name 'github-actions[bot]'
         git config user.email 'github-actions[bot]@users.noreply.github.com'
-        git add -A
         git commit -m 'Update translation files'
         git push

.gitignore

@@ -18,3 +18,4 @@ dropbox.keys
 .venv
 _traduko.jar
 .DS_Store
+*.egg-info