From 90803ec13465c728bbe7ed2e7f9ac8c9c2ac47bd Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sun, 15 Sep 2024 20:18:33 +0900
Subject: [PATCH] RELEASE_SELECTOR: fixed PR not poresent + enhanced release
 labeling

---
 functions/other_functions.sh | 43 +++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/functions/other_functions.sh b/functions/other_functions.sh
index f8d6a012..b10bb705 100644
--- a/functions/other_functions.sh
+++ b/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
-        human_readable_date=$(date -d "$published_at" +"%d %B %Y %H:%M")
+        # 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"