Merge branch 'cooker' into feat/godot

developer_toolbox/cook_okonomiyaki.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# List of branches to pull and merge
+branches=(
+  "cooker"
+  "feat/shadps4"
+  "feat/PortMaster"
+  "feat/steam-rom-manager"
+)
+
+# Get the current branch name
+current_branch=$(git branch --show-current)
+
+# Check if the current branch contains 'feat/' and 'okonomiyaki'
+if [[ $current_branch == feat/* && $current_branch == *okonomiyaki* ]]; then
+  echo "Current branch is $current_branch, proceeding with fetch, pull, and merge."
+
+  # Iterate through the list of branches
+  for branch in "${branches[@]}"; do
+    echo "Fetching $branch..."
+    git fetch origin $branch
+    
+    echo "Pulling $branch..."
+    git pull origin $branch
+    
+    echo "Merging $branch into $current_branch..."
+    if ! git merge origin/$branch; then
+      echo "Merge conflict detected while merging $branch!"
+      echo "Please resolve the conflict, then run 'git merge --continue' to finish the merge."
+      exit 1  # Exit the script due to conflict
+    fi
+  done
+else
+  echo "Current branch is not an okonomiyaki branch, quitting."
+  exit 1
+fi

functions/other_functions.sh

@@ -775,6 +775,15 @@ ponzu_remove() {
 }
 
 release_selector() {
+    # Show a progress bar
+    ( 
+        while true; do
+            echo "# Fetching all available releases from GitHub repositories... Please wait. This may take some time." ; sleep 1
+        done
+    ) | zenity --progress --title="Fetching Releases" --text="Fetching releases..." --pulsate --no-cancel --auto-close --width=500 --height=150 &
+    
+    progress_pid=$!  # save process PID to kill it later
+
     log d "Fetching releases from GitHub API for repository $cooker_repository_name"
     
     # Fetch the main release from the RetroDECK repository
@@ -783,6 +792,7 @@ release_selector() {
 
     if [[ -z "$main_release" ]]; then
         log e "Failed to fetch the main release"
+        kill $progress_pid  # kill the progress bar
         configurator_generic_dialog "Error" "Unable to fetch the main release. Please check your network connection or try again later."
         return 1
     fi
@@ -796,11 +806,12 @@ release_selector() {
     # Add the main release as the first entry in the release array
     local release_array=("Main Release" "$main_tag_name" "$main_human_readable_date")
 
-    # Fetch all releases from the Cooker repository
-    local releases=$(curl -s https://api.github.com/repos/$git_organization_name/$cooker_repository_name/releases)
+    # Fetch all releases (including draft and pre-release) from the Cooker repository
+    local releases=$(curl -s https://api.github.com/repos/$git_organization_name/$cooker_repository_name/releases?per_page=100)
 
     if [[ -z "$releases" ]]; then
         log e "Failed to fetch releases or no releases available"
+        kill $progress_pid  # kill the progress bar
         configurator_generic_dialog "Error" "Unable to fetch releases. Please check your network connection or try again later."
         return 1
     fi
@@ -809,15 +820,37 @@ release_selector() {
     while IFS= read -r release; do
         tag_name=$(echo "$release" | jq -r '.tag_name')
         published_at=$(echo "$release" | jq -r '.published_at')
+        draft=$(echo "$release" | jq -r '.draft')
+        prerelease=$(echo "$release" | jq -r '.prerelease')
 
-        # Convert published_at to human-readable format
+        # Classifying releases
+        if echo "$tag_name" | grep -q "PR"; then
+            status="Pull Request"
+        elif [[ "$draft" == "true" ]]; then
+            status="Draft"
+        elif [[ "$prerelease" == "true" ]]; then
+            status="Pre-release"
+        elif [[ "$cooker_repository_name" == *"Cooker"* ]]; then
+            status="Cooker"
+        else
+            status="Main"
+        fi
+
+        # Convert published_at to human-readable format, if available
+        if [[ "$published_at" != "null" ]]; then
             human_readable_date=$(date -d "$published_at" +"%d %B %Y %H:%M")
+        else
+            human_readable_date="Not published"
+        fi
 
         # Ensure fields are properly aligned for Zenity
-        release_array+=("Cooker Channel" "$tag_name" "$human_readable_date")
+        release_array+=("$status" "$tag_name" "$human_readable_date")
 
     done < <(echo "$releases" | jq -c '.[]' | sort -t: -k3,3r)
 
+    # kill the progress bar before opening the release list window
+    kill $progress_pid
+
     if [[ ${#release_array[@]} -eq 0 ]]; then
         configurator_generic_dialog "RetroDECK Updater" "No available releases found, exiting."
         log d "No available releases found"

net.retrodeck.retrodeck.yml

@@ -553,9 +553,12 @@ modules:
       - cp -r files/* "${FLATPAK_DEST}"
       - chmod +x "${FLATPAK_DEST}/bin/"*
     sources:
+      # Testing the new feat/update-3.1.0
       - type: archive
-        url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz
-        sha256: RETRODECKESDELATEST
+        url: https://github.com/RetroDECK/ES-DE/releases/download/feat%2Fupdate-3.1.0-170924.19/RetroDECK-ES-DE-Artifact.tar.gz
+        sha256: 21b937034be0381dab81b00ec0a9a95210b0610c1a3b66c5ab3b3b0aceae8654
+        #url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz
+        #sha256: RETRODECKESDELATEST
 
   - name: retrodeck-theme
     buildsystem: simple