Fix firmware version check and update logic

Updated the firmware auto downloader workflow to improve release notes preparation and streamline version checking.

.github/workflows/firmware-autodl.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: 🐍 Setup Python and dependencies
+      - name: 🐍 Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.x'
@@ -31,49 +31,89 @@ jobs:
           cp hactool-linux hactool
           chmod +x hactool
 
-      - name: 🔍 Check firmware version (Switch 1 only)
+      - name: 🔍 Check firmware version (Switch 1 only, >=21.0.0 strict)
         id: version_check
+        shell: bash
         run: |
-          LATEST_TITLE=$(curl -s 'https://yls8.mtheall.com/ninupdates/feed.php' | \
+          set +e
-                         grep '<title>Switch ' | \
+
-                         grep -v '<title>Switch 2 ' | \
+          RSS=$(curl -sL --fail https://yls8.mtheall.com/ninupdates/feed.php)
+          CURL_STATUS=$?
+
+          if [ $CURL_STATUS -ne 0 ] || [ -z "$RSS" ]; then
+            echo "INFO: Impossible de récupérer le RSS."
+            echo "new_version=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # Extraire description Switch (ignore Switch 2)
+          DESCRIPTION=$(echo "$RSS" | grep -oE '<description>Switch [0-9]+\.[0-9]+\.[0-9]+' | \
+                        grep -v 'Switch 2' | \
                         head -n 1)
 
-          if [ -z "$LATEST_TITLE" ]; then
+          if [ -z "$DESCRIPTION" ]; then
-            echo "::error::Could not retrieve the firmware title for Switch 1 from the RSS feed."
+            echo "INFO: Aucun firmware Switch valide trouvé."
-            exit 1 
+            echo "new_version=false" >> $GITHUB_OUTPUT
+            exit 0
           fi
 
-          LATEST_VERSION=$(echo "$LATEST_TITLE" | grep -oP 'Switch \K[0-9.]+')
+          echo "Description détectée : $DESCRIPTION"
 
-          if [ -z "$LATEST_VERSION" ]; then
+          VERSION=$(echo "$DESCRIPTION" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
-            echo "::error::Failed to parse LATEST_VERSION from title: $LATEST_TITLE"
+
-            exit 1
+          if [ -z "$VERSION" ]; then
+            echo "INFO: Impossible d'extraire la version."
+            echo "new_version=false" >> $GITHUB_OUTPUT
+            exit 0
           fi
 
-          TAG_EXISTS=$(git ls-remote --tags origin $LATEST_VERSION)
+          MAJOR=$(echo "$VERSION" | cut -d. -f1)
 
-          if [ ! -z "$TAG_EXISTS" ]; then
+          # Autorise uniquement 21+
-            echo "INFO: Tag $LATEST_VERSION already exists on GitHub. Stopping workflow to avoid re-upload."
+          if [ "$MAJOR" -lt 21 ]; then
+            echo "INFO: Firmware $VERSION ignoré (<21.x)."
+            echo "new_version=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          echo "Version valide détectée : $VERSION"
+
+          HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            "https://api.github.com/repos/${{ github.repository }}/releases/tags/$VERSION")
+
+          if [ "$HTTP_STATUS" = "200" ]; then
+            echo "INFO: La release $VERSION existe déjà."
             echo "new_version=false" >> $GITHUB_OUTPUT
           else
-            echo "INFO: New version $LATEST_VERSION found! Preparing to download..."
+            echo "INFO: Nouvelle version $VERSION détectée !"
             echo "new_version=true" >> $GITHUB_OUTPUT
+            echo "firmware_version=$VERSION" >> $GITHUB_OUTPUT
           fi
-        shell: bash
+
+          set -e
 
       - name: 💻 Execute download script and capture changelog
         id: download
         if: steps.version_check.outputs.new_version == 'true'
         run: |
           python3 firmware_downloader.py | tee firmware_output.txt
-          
           FIRMWARE_VERSION=$(grep 'Folder: Firmware ' firmware_output.txt | awk '{print $NF}')
-          
           echo "firmware_version=$FIRMWARE_VERSION" >> $GITHUB_OUTPUT
-
           tail -n 4 firmware_output.txt > changelog_body.txt
 
+      - name: 🧹 Clean and zip firmware
+        if: steps.version_check.outputs.new_version == 'true'
+        run: |
+          VERSION="${{ steps.download.outputs.firmware_version }}"
+
+          find . -type f -name "*.nca.*" -delete
+
+          if [ -d "Firmware $VERSION" ]; then
+            rm -f "Firmware $VERSION.zip"
+            zip -rj "Firmware $VERSION.zip" "Firmware $VERSION/" -i "*.nca"
+          fi
+
       - name: 📝 Prepare Release Body
         id: prepare_body
         if: steps.version_check.outputs.new_version == 'true'
@@ -81,8 +121,12 @@ jobs:
         with:
           script: |
             const fs = require('fs');
+            if (fs.existsSync('changelog_body.txt')) {
               const changelogBody = fs.readFileSync('changelog_body.txt', 'utf8');
               core.setOutput('release_body', changelogBody);
+            } else {
+              core.setOutput('release_body', 'No changelog available.');
+            }
 
       - name: 📦 Create Tag and Release
         if: steps.version_check.outputs.new_version == 'true'
@@ -98,7 +142,6 @@ jobs:
             **Downloaded file details:**
             
             ${{ steps.prepare_body.outputs.release_body }}
-            
           files: |
             Firmware ${{ steps.download.outputs.firmware_version }}.zip
         env:

README.md

@@ -4,7 +4,11 @@ Firmware for the Nintendo Switch
 # Utility
 Firmware database for a discord bot
 
-<img width="787" height="819" alt="image" src="https://github.com/user-attachments/assets/e338a3f5-e54b-4ae0-be8c-524944f1855b" />
+<img width="618" height="670" alt="image" src="https://github.com/user-attachments/assets/279d9c21-0712-4ea8-927b-c6bb9789bb1b" />
+
+[![Discord](https://img.shields.io/discord/454099185416011776?label=Rejoindre%20le%20Discord&logo=discord&logoColor=white&style=for-the-badge)](https://discord.sighya.fr) <br>
+[![Dernière version](https://img.shields.io/github/v/release/THZoria/NX_Firmware?label=Dernière%20Version&color=05c09a&style=for-the-badge)](https://github.com/THZoria/NX_Firmware/releases/latest)
+[![Téléchargements](https://img.shields.io/github/downloads/THZoria/NX_Firmware/total?label=Téléchargements&color=blue&style=for-the-badge)](https://github.com/THZoria/NX_Firmware)
 
 # How to update a modified Switch / Under custom firmware