Improve firmware download workflow and messages

Refactor firmware download workflow for clarity and accuracy.

.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'
@@ -28,39 +28,68 @@ jobs:
 
       - name: ⬇️ Setup hactool-linux
         run: |
+          if [ -f "hactool-linux" ]; then
             cp hactool-linux hactool
             chmod +x hactool
-          
-      - name: 🔍 Check firmware version (Switch 1 only)
-        id: version_check
-        run: |
-          LATEST_TITLE=$(curl -s 'https://yls8.mtheall.com/ninupdates/feed.php' | \
-                         grep '<title>Switch ' | \
-                         grep -v '<title>Switch 2 ' | \
-                         head -n 1)
-
-          if [ -z "$LATEST_TITLE" ]; then
-            echo "::error::Could not retrieve the firmware title for Switch 1 from the RSS feed."
-            exit 1 
+          else
+            echo "Warning: hactool-linux non trouvé."
           fi
 
-          LATEST_VERSION=$(echo "$LATEST_TITLE" | grep -oP 'Switch \K[0-9.]+')
+      - name: 🔍 Check firmware version (Switch 1 only, >=21.0.0 strict)
+        id: version_check
+        shell: bash
+        run: |
+          set +e
+
+          # Récupération du flux RSS
+          RSS=$(curl -sL --fail https://yls8.mtheall.com/ninupdates/feed.php)
+          if [ $? -ne 0 ] || [ -z "$RSS" ]; then
+            echo "ERROR: Impossible de récupérer le flux RSS."
+            echo "new_version=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # LOGIQUE DE DÉTECTION ROBUSTE :
+          # 1. On extrait les blocs <item> pour ne pas mélanger les données
+          # 2. On filtre uniquement ceux qui contiennent 'sys=hac' (Switch 1)
+          # 3. On extrait le numéro de version X.X.X
+          # 4. On trie par version (sort -V) et on prend la plus haute
+          
+          LATEST_VERSION=$(echo "$RSS" | tr -d '\n' | sed 's/<item>/\n<item>/g' | \
+            grep 'sys=hac' | \
+            grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | \
+            sort -V | tail -n 1)
 
           if [ -z "$LATEST_VERSION" ]; then
-            echo "::error::Failed to parse LATEST_VERSION from title: $LATEST_TITLE"
-            exit 1
+            echo "INFO: Aucun firmware Switch 1 trouvé."
+            echo "new_version=false" >> $GITHUB_OUTPUT
+            exit 0
           fi
 
-          TAG_EXISTS=$(git ls-remote --tags origin $LATEST_VERSION)
+          echo "Dernière version Switch 1 détectée : $LATEST_VERSION"
 
-          if [ ! -z "$TAG_EXISTS" ]; then
-            echo "INFO: Tag $LATEST_VERSION already exists on GitHub. Stopping workflow to avoid re-upload."
+          # Vérification du seuil (>= 21)
+          MAJOR=$(echo "$LATEST_VERSION" | cut -d. -f1)
+          if [ "$MAJOR" -lt 21 ]; then
+            echo "INFO: Version $LATEST_VERSION ignorée (seuil < 21)."
+            echo "new_version=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # Vérification si la release existe déjà
+          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/$LATEST_VERSION")
+
+          if [ "$HTTP_STATUS" = "200" ]; then
+            echo "INFO: La release $LATEST_VERSION existe déjà."
             echo "new_version=false" >> $GITHUB_OUTPUT
           else
-            echo "INFO: New version $LATEST_VERSION found! Preparing to download..."
+            echo "ACTION: Nouvelle version $LATEST_VERSION détectée !"
             echo "new_version=true" >> $GITHUB_OUTPUT
+            echo "firmware_version=$LATEST_VERSION" >> $GITHUB_OUTPUT
           fi
-        shell: bash
+          set -e
 
       - name: 💻 Execute download script and capture changelog
         id: download
@@ -68,11 +97,29 @@ jobs:
         run: |
           python3 firmware_downloader.py | tee firmware_output.txt
           
-          FIRMWARE_VERSION=$(grep 'Folder: Firmware ' firmware_output.txt | awk '{print $NF}')
+          # Extraction de la version confirmée par le script (nettoyage des retours chariot)
+          F_VER=$(grep 'Folder: Firmware ' firmware_output.txt | awk '{print $NF}' | tr -d '\r')
           
-          echo "firmware_version=$FIRMWARE_VERSION" >> $GITHUB_OUTPUT
+          if [ -z "$F_VER" ]; then
+            F_VER="${{ steps.version_check.outputs.firmware_version }}"
+          fi
           
-          tail -n 4 firmware_output.txt > changelog_body.txt
+          echo "firmware_version=$F_VER" >> $GITHUB_OUTPUT
+          tail -n 10 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"
+          else
+            echo "ERROR: Dossier Firmware $VERSION introuvable."
+            exit 1
+          fi
 
       - name: 📝 Prepare Release Body
         id: prepare_body
@@ -81,8 +128,12 @@ jobs:
         with:
           script: |
             const fs = require('fs');
-            const changelogBody = fs.readFileSync('changelog_body.txt', 'utf8');
-            core.setOutput('release_body', changelogBody);
+            let body = "Automatic download of official Nintendo Switch firmware.";
+            if (fs.existsSync('changelog_body.txt')) {
+              const changelog = fs.readFileSync('changelog_body.txt', 'utf8');
+              body += "\n\n**Changelog / Output:**\n```\n" + changelog + "\n```";
+            }
+            core.setOutput('release_body', body);
 
       - name: 📦 Create Tag and Release
         if: steps.version_check.outputs.new_version == 'true'
@@ -90,15 +141,7 @@ jobs:
         with:
           tag_name: ${{ steps.download.outputs.firmware_version }}
           name: Firmware ${{ steps.download.outputs.firmware_version }}
-          body: |
-            Automatic download of the official Nintendo Switch firmware version **${{ steps.download.outputs.firmware_version }}**.
-            
-            ---
-            
-            **Downloaded file details:**
-            
-            ${{ steps.prepare_body.outputs.release_body }}
-            
+          body: ${{ steps.prepare_body.outputs.release_body }}
           files: |
             Firmware ${{ steps.download.outputs.firmware_version }}.zip
         env:

README.md

@@ -6,6 +6,10 @@ Firmware database for a discord bot
 
 <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
 
 - Create a folder at the root of your microSD card and name it whatever you want.