Merge 5bce8709af into a08c588df3

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [6.0.1-beta.2] 2025-11-10
+## Fixed
+- Python 3.14 error in finally block
+- Require Python version between 3.11 and 3.12
+
 ## [6.0.1-beta.1] 2025-11-05
 ## Fixed
 - UI not being constructed correctly if CHANGELOG.md was missing

dzgui.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 set -o pipefail
 
-version=6.0.1.beta-1
+src_path=$(realpath "$0")
+
+version=6.0.1.beta-2
 reference_branch="prerelease/6.0.1-beta.1"
 
 #CONSTANTS
@@ -219,9 +221,6 @@ default_steam_path="$default_steam_path"
 
 #Preferred Steam launch command (for Flatpak support)
 preferred_client="$preferred_client"
-
-#DZGUI source path
-src_path="$src_path"
 END
 }
 depcheck(){
@@ -240,8 +239,8 @@ depcheck(){
 check_pyver(){
     local pyver=$(python3 --version | awk '{print $2}')
     local minor=$(<<< $pyver awk -F. '{print $2}')
-    if [[ -z $pyver ]] || [[ ${pyver:0:1} -lt 3 ]] || [[ $minor -lt 10 ]]; then
+    if [[ -z $pyver ]] || [[ ${pyver:0:1} -lt 3 ]] || [[ $minor -lt 11 ]] || [[ $minor -gt 12 ]]; then
-        local msg="Requires Python >=3.10"
+        local msg="Requires Python 3.11 or 3.12"
         raise_error_and_quit "$msg"
     fi
     logger INFO "Found Python version: $pyver"
@@ -617,10 +616,10 @@ fetch_helpers_by_sum(){
     [[ -f "$config_file" ]] && source "$config_file"
     declare -A sums
     sums=(
-        ["funcs"]="2bac12c1bff5d6ad50161f174d57d029"
+        ["funcs"]="5d7d92b7b8a9c788b133ce5271a76553"
         ["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
         ["servers.py"]="ed442c3aecf33f777d59dcf53650d263"
-        ["ui.py"]="8a35ac263db8b812f30e04902c4e9603"
+        ["ui.py"]="2476397883a4272eaf940403ba5a6575"
         ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
         ["pefile.py"]="21531f2c0d9dfa5f110cf6779f9d22c0"
     )
@@ -985,10 +984,6 @@ varcheck(){
         create_config
         return 0
     fi
-    if [[ $src_path != $(realpath "$0") ]]; then
-        src_path=$(realpath "$0")
-        update_config
-    fi
 }
 is_dzg_downloading(){
     if [[ -d $steam_path ]] && [[ -d $steam_path/downloading/$aid ]]; then

helpers/funcs

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o pipefail
-version="6.0.1-beta.1"
+version="6.0.1-beta.2"
 
 #CONSTANTS
 aid=221100

helpers/ui.py

@@ -824,8 +824,7 @@ def query_history() -> list | None:
             rows = [row.rstrip("\n") for row in f]
     except OSError:
         rows = None
-    finally:
+    return rows
-        return rows
 
 
 def query_favorites() -> None | list: