Merge a8ae07931d into a08c588df3

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,10 +5,6 @@ labels: ["bug"]
 assignees:
   - aclist
 body:
-  - type: markdown
-    attributes:
-      value: |
-          ### WARNING: When posting log/config data, redact any sensitive information like API keys.
   - type: checkboxes
     id: kb
     attributes:

.github/ISSUE_TEMPLATE/trouble.yml

@@ -5,10 +5,6 @@ labels: ["troubleshooting"]
 assignees:
   - aclist
 body:
-  - type: markdown
-    attributes:
-      value: |
-          ### WARNING: When posting log/config data, redact any sensitive information like API keys.
   - type: dropdown
     id: device
     attributes:

.github/workflows/mirror.yml

@@ -8,7 +8,7 @@ jobs:
   mirror-to-codeberg:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: pixta-dev/repository-mirroring-action@v1

.gitignore

@@ -1,4 +1 @@
 tags
-__pycache__
-pre-commit
-tests/

CHANGELOG.md

@@ -1,105 +1,6 @@
 # Changelog
 
-## [6.0.6-beta.1] 2026-05-17
-## Changed
-- Update symlink hash logic to align with DZGUI 7 beta
-- Update A2S helper to latest commit
-
-## [6.0.5-beta.2] 2026-04-17
-## Changed
-- During server connection attempts, only download mods local to specific server
-
-## [6.0.5-beta.1] 2026-04-13
-## Fixed
-- Update A2S module checksums to support servers with missing description field
-## Changed
-- Bump version to reflect hotfixes on stable branch
-
-## [6.0.2-beta.5] 2026-04-12
-## Fixed
-- Use conditional logic when testing GLibUnix namespaces
-
-## [6.0.2-beta.4] 2026-04-10
-## Fixed
-- Use GLibUnix namespace when setting up SIGINT handling
-
-## [6.0.2-beta.3] 2026-01-26
-## Fixed
-- Raise error correctly from module
-
-## [6.0.2-beta.2] 2026-01-18
-## Fixed
-- Helpers not being downloaded (uncommented boilerplate)
-
-## [6.0.2-beta.1] 2026-01-18
-## Fixed
-- Do not spawn dialogs from inside of thread when fetching prereqs
-## Changed
-- Optimize time complexity of startup checks
-- Optimize coordinate calculation by using local records first
-- Rename some internal functions
-- Wrap entire startup process in dialog
-
-## [6.0.1-beta.1] 2026-01-16
-## Fixed
-- Explicitly use Python 3.13 when calling subprocesses
-
-## [6.0.0-beta.20] 2026-01-14
-## Fixed
-- Write cache file after wiping
-
-## [6.0.0-beta.19] 2026-01-14
-## Fixed
-- Steam Deck compatible script path expansion
-
-## [6.0.0-beta.18] 2026-01-14
-## Fixed
-- Update UI checksums
-
-## [6.0.0-beta.17] 2026-01-14
-## Added
-- More descriptive help dialogs when initial dependencies are missing
-
-## [6.0.0-beta.16] 2026-01-04
-## Fixed
-- Regression introduced in previous hotfix
-
-## [6.0.0-beta.15] 2025-12-27
-## Fixed
-- Path discovery during first-time setup when parsing filepaths with whitespaces
-- First-time setup dialog continuously triggering when DayZ install path had whitespaces in it
-
-## [6.0.0-beta.14] 2025-12-09
-## Fixed
-- Dialogs with newlines breaking output in log table
-
-## [6.0.0-beta.13] 2025-11-29
-## Fixed
-- Server filter panel not being hidden when entering other page contexts
-- Path to remote changelog being constructed incorrectly
-
-## [6.0.0-beta.12] 2025-11-14
-## Changed
-- Require Python 3.13
-## Fixed
-- Normalize beta version
-
-## [6.0.0-beta.11] 2025-11-13
-## Added
-- Support sandboxed flatpak
-
-## Changed
-- Preferred client from radio toggle to combobox
-
-## Fixed
-- Config file erroneously getting updated when populating settings menu
-
-## [6.0.0-beta.10] 2025-11-10
-## Fixed
-- Python 3.14 error in finally block
-- Require Python version between 3.11 and 3.12
-
-## [6.0.0-beta.9] 2025-11-05
+## [6.0.1-beta.1] 2025-11-05
 ## Fixed
 - UI not being constructed correctly if CHANGELOG.md was missing
 

CONTRIBUTING.md

@@ -8,7 +8,7 @@ If you are a developer, you can skip to the end.
 # Requesting help
 
 If you encounter a problem with DZGUI, you can submit tickets on the GitHub
-[issue tracker](https://github.com/aclist/dztui/issues) under the
+(issue tracker)[https://github.com/aclist/dzgui-devel/issues] under the
 `troubleshooting` tag.
 
 # How can I help the project?
@@ -24,7 +24,7 @@ accordingly.
 
 ## Submitting a ticket
 
-Navigate to the GitHub [issue tracker](https://github.com/aclist/dztui/issues).
+Navigate to the GitHub (issue tracker)[https://github.com/aclist/dzgui-devel/issues].
 From there, follow the onscreen prompts. You will be asked questions such as:
 
 - What version are you using?
@@ -67,5 +67,5 @@ will be merged to `prerelease/<latest-version>`, then `testing`, and after a liv
 testing phase, to `stable` as well.
 
 It is recommended to follow
-[Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/), as this
+(Conventional Commits)[https://www.conventionalcommits.org/en/v1.0.0/], as this
 integrates well with tooling and helps the project review your code.

README.md

@@ -11,15 +11,6 @@ This overcomes certain limitations in the Linux client and helps prepare the gam
 - Concatenate launch options to pass to Steam
 - Connect to mod-enabled LAN servers
 
-## Design philosophy
-
-DZGUI follows a specific set of guidelines, enumerated below:
-
-- Provide a free and open-source tool under GPL
-- Do not use undocumented, third-party servers to aggregate data; no central "DZGUI" server
-- All connections go to Steam and DayZ servers directly; the tool should function in perpetuity without intermediary endpoints
-- Target Linux desktop and Steam deck specifically; not a cross-platform tool
-
 ## Setup and usage
 
 Refer to the documentation for installation and setup instructions:
@@ -27,6 +18,7 @@ Refer to the documentation for installation and setup instructions:
 - [GitHub](https://aclist.github.io/dzgui/index.html)
 - [Mirror (Codeberg)](https://aclist.codeberg.page)
 
+
 ![A screenshot of DZGUI](/images/example.png)
 
 ## Attribution

dzgui.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -o pipefail
 
-src_path="$(readlink -e "$0")"
-version=6.0.6-beta.1
+version=6.0.1.beta-1
+reference_branch="prerelease/6.0.1-beta.1"
 
 #CONSTANTS
 aid=221100
@@ -40,7 +40,6 @@ cols_file="$state_path/$prefix.cols.json"
 
 #CACHE FILES
 coords_file="$cache_path/$prefix.coords"
-src_path_file="$cache_path/$prefix.src"
 
 #legacy paths
 hist_file="$config_path/history"
@@ -117,7 +116,6 @@ setup_state_files(){
         done
         logger INFO "Wiped cache files"
     fi
-    echo "$src_path" > "$src_path_file"
 }
 print_config_vals(){
     local keys=(
@@ -139,10 +137,10 @@ print_config_vals(){
 
 }
 test_gobject(){
-    python3.13 -c "import gi"
+    python3 -c "import gi"
     if [[ ! $? -eq 0 ]]; then
         logger CRITICAL "Missing PyGObject"
-        quit_with_help_dialog "Requires PyGObject (python-gobject)"
+        fdialog "Requires PyGObject (python-gobject)"
         exit 1
     fi
     logger INFO "Found PyGObject in Python env"
@@ -221,14 +219,16 @@ 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(){
     for dep in "${!deps[@]}"; do
         if ! command -v "$dep" &> /dev/null; then
             local msg="Requires $dep >= ${deps[$dep]}"
-            echo "$msg"
-            exit 1
+            raise_error_and_quit "$msg"
         fi
     done
     local jqmsg="jq must be compiled with support for oniguruma"
@@ -237,31 +237,14 @@ depcheck(){
     [[ $? -ne 0 ]] && raise_error_and_quit "$jqmsg"
     logger INFO "Initial dependencies satisfied"
 }
-open_url(){
-    url="$1"
-    if [[ -n "$BROWSER" ]]; then
-        logger INFO "Opening '$url' in '$BROWSER'"
-        "$BROWSER" "$url"
-    else
-        logger INFO "Opening '$url' with xdg-open"
-        xdg-open "$url"
-    fi
-}
-quit_with_help_dialog(){
-    local sel
-    msg="$1"
-    help_button="Open help page"
-    url="https://aclist.github.io/dzgui/installation.html"
-    logger CRITICAL "$msg"
-    sel=$(zenity --info --extra-button="$help_button" --text="$msg")
-    [[ $sel == "$help_button" ]] && open_url "$url" &
-    exit 1
-}
 check_pyver(){
-    if [[ ! $(python3.13 --version) ]]; then
-        local msg="Requires Python 3.13"
-        quit_with_help_dialog "$msg"
+    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
+        local msg="Requires Python >=3.10"
+        raise_error_and_quit "$msg"
     fi
+    logger INFO "Found Python version: $pyver"
 }
 watcher_deps(){
     if [[ ! $(command -v wmctrl) ]] && [[ ! $(command -v xdotool) ]]; then
@@ -335,7 +318,6 @@ check_unmerged(){
     fi
 }
 check_version(){
-    echo "# Checking version"
     [[ -n $reference_branch ]] && return
     local version_url=$(format_version_url)
     local upstream=$(curl -Ls "$version_url" | awk -F= '/^version=/ {print $2}')
@@ -400,11 +382,10 @@ prompt_dl(){
 dl_changelog(){
     local mdbranch
     local md
-    source "$config_file"
     [[ $branch == "stable" ]] && mdbranch="dzgui"
     [[ $branch == "testing" ]] && mdbranch="testing"
-    local changelog="$url_prefix/${mdbranch}/CHANGELOG.md"
-    curl -Ls "$changelog" > "$state_path/CHANGELOG.md"
+    local md="$url_prefix/${mdbranch}/$file"
+    curl -Ls "$md" > "$state_path/CHANGELOG.md"
 }
 test_display_mode(){
     pgrep -a gamescope | grep -q "generate-drm-mode"
@@ -415,7 +396,6 @@ test_display_mode(){
     fi
 }
 check_architecture(){
-    echo "# Checking system architecture"
     local cpu=$(< /proc/cpuinfo awk -F": " '/AMD Custom APU [0-9]{4}$/ {print $2; exit}')
     read -a APU_MODEL <<< "$cpu"
     if [[ ${APU_MODEL[3]} != "0932" ]] && [[ ${APU_MODEL[3]} != "0405" ]]; then
@@ -432,7 +412,6 @@ check_architecture(){
     logger INFO "Setting architecture to 'Steam Deck'"
 }
 check_map_count(){
-    echo "# Checking map count"
     [[ $is_steam_deck -gt 0 ]] && return 0
     local map_count_file="/proc/sys/vm/max_map_count"
     local min_count=1048576
@@ -482,7 +461,6 @@ tdialog(){
     $steamsafe_zenity --info --text="$1" "${zenity_flags[@]}"
 }
 steam_deps(){
-    echo "# Checking Steam"
     local flatpak
     local steam
     [[ $(command -v flatpak) ]] && flatpak=$(flatpak list | grep valvesoftware.Steam)
@@ -491,15 +469,33 @@ steam_deps(){
         local msg="Found neither Steam nor Flatpak Steam"
         raise_error_and_quit "$msg"
         exit 1
+    elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then
+        [[ -n $preferred_client ]] && return 0
+        if [[ -z $preferred_client ]]; then
+            preferred_client="steam"
+        fi
+    elif [[ -n "$steam" ]]; then
+        preferred_client="steam"
+    else
+        preferred_client="flatpak"
     fi
+    update_config
+    logger INFO "Preferred client set to '$preferred_client'"
+}
+migrate_files(){
+    if [[ ! -f $config_path/dztuirc.oldapi ]]; then
+        cp $config_file $config_path/dztuirc.oldapi
+        logger INFO "Migrated old API file"
+    fi
+    [[ ! -f $hist_file ]] && return
+    rm $hist_file
+    logger INFO "Wiped old history file"
 }
 stale_symlinks(){
-    echo "# Cleaning stale symlinks"
     local game_dir="$steam_path/steamapps/common/DayZ"
-    readarray -t links < <(find "$game_dir" -xtype l)
-    for link in "${links[@]}"; do
-        logger DEBUG "Updating stale symlink '$link'"
-        unlink "$link"
+    for l in $(find "$game_dir" -xtype l); do
+        logger DEBUG "Updating stale symlink '$l'"
+        unlink "$l"
     done
 }
 
@@ -508,7 +504,7 @@ check_availability() {
         return 1
     fi
     local url=$1
-    local timeout_sec="1"
+    local timeout_sec="3"
     if [[ $2 ]]; then
         timeout_sec=$2
     fi
@@ -519,7 +515,6 @@ check_availability() {
 }
 
 local_latlon(){
-    echo "# Checking coordinates"
     if [[ -z $(command -v dig) ]]; then
         local url_ipecho="https://ipecho.net/plain"
         if ! check_availability "ipecho.net"; then
@@ -531,9 +526,6 @@ local_latlon(){
         # TODO : implement checking remote
         local local_ip=$(dig -4 +short myip.opendns.com @resolver1.opendns.com)
     fi
-    if calc_local_coords "$local_ip"; then
-        return 0
-    fi
     local url_ip_api="http://ip-api.com/json/$local_ip"
     if ! check_availability "ip-api.com"; then
         logger WARN "Failed to get local coordinates, ip-api.com service may be down."
@@ -548,7 +540,6 @@ local_latlon(){
 }
 
 lock(){
-    echo "# Setting up lock file"
     [[ ! -f $lock_file ]] && touch $lock_file
     local pid=$(cat $lock_file)
     ps -p $pid -o pid= >/dev/null 2>&1
@@ -567,12 +558,9 @@ get_hash(){
     md5sum "$1" | awk '{print $1}'
 }
 fetch_a2s(){
-    sum="d26da2fe03df2b95436f823f0496887b"
-    if [[ -d $helpers_path/a2s ]] && [[ $(get_hash "$helpers_path/a2s/info.py") == $sum ]]; then
-        logger INFO "A2S helper is current"
-        return 0
-    fi
-    local sha=b40eb24cdbb06ebd08272f224257fe5a81610e86
+    # this file is currently monolithic
+    [[ -d $helpers_path/a2s ]] && { logger INFO "A2S helper is current"; return 0; }
+    local sha=c7590ffa9a6d0c6912e17ceeab15b832a1090640
     local author="yepoleb"
     local repo="python-a2s"
     local url="https://github.com/$author/$repo/tarball/$sha"
@@ -586,13 +574,13 @@ fetch_a2s(){
     logger INFO "Updated A2S helper to sha '$sha'"
 }
 fetch_dzq(){
-    local sum="0d316badbb8d943c5f078e73862cac3e"
+    local sum="0a334e1e144e76e560419d155435c91e"
     local file="$helpers_path/a2s/dayzquery.py"
     if [[ -f $file ]] && [[ $(get_hash "$file") == $sum ]]; then
         logger INFO "DZQ is current"
         return 0
     fi
-    local sha="07483b88ed096327ebca752f5e177011b604d7fe"
+    local sha=a22a9f428cbe075d7dda62f78000296955eea92a
     local author="yepoleb"
     local repo="dayzquery"
     local url="https://raw.githubusercontent.com/$author/$repo/$sha/dayzquery.py"
@@ -629,12 +617,12 @@ fetch_helpers_by_sum(){
     [[ -f "$config_file" ]] && source "$config_file"
     declare -A sums
     sums=(
-        ["funcs"]="1cd26343cd68a5382e3377a9757497fa"
+        ["funcs"]="2bac12c1bff5d6ad50161f174d57d029"
         ["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
         ["servers.py"]="ed442c3aecf33f777d59dcf53650d263"
-        ["ui.py"]="cf52a3d5883afe02a013d8673df494fa"
+        ["ui.py"]="8a35ac263db8b812f30e04902c4e9603"
         ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
-        ["pefile.py"]="b452974a84bff1d821872fcebf59e380"
+        ["pefile.py"]="21531f2c0d9dfa5f110cf6779f9d22c0"
     )
     local author="aclist"
     local repo="dztui"
@@ -694,12 +682,15 @@ fetch_km_helper(){
 }
 get_response_code(){
     local url="$1"
-    curl --connect-timeout 3 -Ls -I -o /dev/null -w "%{http_code}" "$url"
+    curl -Ls -I -o /dev/null -w "%{http_code}" "$url"
+}
+raise_error_and_quit(){
+    echo "$1"
+    exit 1
 }
-
 fetch_ip_db(){
     parse_dl_url(){
-        curl --connect-timeout 3 -Ls "$url" \
+        curl -Ls "$url" \
         | grep "csv.gz" \
         | awk -F"['']" '{print $2}'
     }
@@ -715,9 +706,6 @@ fetch_ip_db(){
     fetch(){
         logger INFO "Triggering fetch routine"
         local url="$1"
-        local ip_file="${state_path}/ips.csv"
-        local base_file="${state_path}/${this_month}.csv.gz"
-        local extracted_file="${state_path}/${this_month}.csv"
 
         curl -Ls "$url" > "$base_file"
         if [[ $? -ne 0 ]]; then
@@ -737,7 +725,7 @@ fetch_ip_db(){
             logger WARN "Abnormal exit while parsing IPs"
             return
         fi
-        rm "${state_path}/${this_month}.csv"
+        rm "${state_path}/${month}.csv"
 
         readarray -t records < <(cat $ip_file | awk -F, 'NR==1 {print $1} END {print $1}')
         if [[ ${records[0]} != "0.0.0.0" ]] && [[ ${records[1]} != "224.0.0.0" ]]; then
@@ -752,57 +740,55 @@ fetch_ip_db(){
             rm "$ip_file"
         fi
 
-        echo "$this_month" > "$month_file"
-        logger INFO "Wrote '$this_month' to stub '$month_file'"
+        echo "$month" > "$month_file"
+        logger INFO "Wrote '$month' to stub '$month_file'"
         logger INFO "Updated '$ip_file'"
     }
 
-    check_remote(){
-        local url="$1"
-        local res=$(get_response_code "$url")
-        if [[ $res -ne 200 ]]; then
-            logger WARN "Failed to retrieve remote resource: '$url' ($res)"
-            return
-        fi
-        logger INFO "Resolved remote URL: '$url'"
-
-        # test dl url
-        local dl_url="$(parse_dl_url)"
-        local res=$(get_response_code "$dl_url")
-        if [[ $res -ne 200 ]]; then
-            logger WARN "Remote resource unavailable: '$dl_url' ($res)"
-            return
-        fi
-        logger INFO "Resolved download URL: '$dl_url'"
-        fetch "$dl_url"
-    }
-
     local url="https://db-ip.com/db/download/ip-to-city-lite"
-    month_file="${state_path}/.month"
-    this_month=$(date +%Y-%m)
+    local month_file="${state_path}/.month"
+    local ip_file="${state_path}/ips.csv"
+
+    # test main url
+    local res=$(get_response_code "$url")
+    if [[ $res -ne 200 ]]; then
+        logger WARN "Failed to retrieve remote resource: '$url' ($res)"
+        return
+    fi
+    logger INFO "Resolved remote URL: '$url'"
+
+    # test dl url
+    local dl_url="$(parse_dl_url)"
+    local res=$(get_response_code "$dl_url")
+    if [[ $res -ne 200 ]]; then
+        logger WARN "Remote resource unavailable: '$dl_url' ($res)"
+        return
+    fi
+    logger INFO "Resolved download URL: '$dl_url'"
+
+    local month=$(parse_dl_url_date "$dl_url")
+    local base_file="${state_path}/${month}.csv.gz"
+    local extracted_file="${state_path}/${month}.csv"
 
     # no stub file
     if [[ ! -f $month_file ]]; then
         logger WARN "No stub file '$month_file' present"
-        check_remote "$url"
-        return
-    fi
-
-    # if stub is same date, abort
-    local last_month=$(< "$month_file")
-    if [[ $last_month == "$this_month" ]]; then
-        logger INFO "Local stub '$last_month' is identical to remote, skipping"
+        fetch "$dl_url"
         return
     fi
 
     # local needs update
-    logger WARN "Local stub '$last_month' does not match '$this_month'"
-    check_remote "$url"
-    return
+    local last_month=$(< "$month_file")
+    if [[ $last_month != "$month" ]]; then
+        logger WARN "Local stub '$last_month' does not match remote stub '$month'"
+        fetch "$dl_url"
+        return
+    fi
 
+    # if stub is same date, abort
+    logger INFO "Local stub '$last_month' is identical to remote, skipping"
 }
 fetch_helpers(){
-    echo "# Checking helper files"
     fetch_a2s
     fetch_dzq
     fetch_km_helper
@@ -901,26 +887,12 @@ file_picker(){
 }
 find_library_folder(){
     local search_path="$1"
-    readarray -t paths < <(python3.13 "$helpers_path/vdf2json.py" -i "$1/steamapps/libraryfolders.vdf" \
-        | jq -r '.libraryfolders[]|select(.apps|has("221100")).path')
-    if [[ ! $? -eq 0 ]]; then
+    steam_path="$(python3 "$helpers_path/vdf2json.py" -i "$1/steamapps/libraryfolders.vdf" \
+        | jq -r '.libraryfolders[]|select(.apps|has("221100")).path')"
+    if [[ ! $? -eq 0 ]] || [[ -z $steam_path ]]; then
         logger WARN "Failed to parse Steam path using '$search_path'"
         return 1
     fi
-    if [[ ${#paths[@]} -eq 0 ]]; then
-        logger WARN "No valid VDF paths in '$search_path'"
-        return 1
-    fi
-    if [[ ${#paths[@]} -gt 1 ]]; then
-        for path in "${paths[@]}"; do
-            if [[ -d "$path" ]]; then
-                steam_path="$path"
-                break
-            fi
-        done
-    else
-        steam_path="${paths[0]}"
-    fi
     logger INFO "Steam path resolved to: $steam_path"
 }
 create_config(){
@@ -929,7 +901,6 @@ create_config(){
     unset default_steam_path
     unset steam_path
 
-    preferred_client="steam"
     while true; do
         local player_input="$($steamsafe_zenity \
             --forms \
@@ -990,7 +961,6 @@ create_config(){
     done
 }
 varcheck(){
-    echo "# Checking config file"
     local msg="Config file '$config_file' missing. Start first-time setup now?"
     local msg2="The Steam paths set in your config file appear to be invalid (DayZ was moved or uninstalled). Restart first-time setup now?"
     if [[ ! -f $config_file ]]; then
@@ -1004,7 +974,7 @@ varcheck(){
     source "$config_file"
     local workshop_dir="$steam_path/steamapps/workshop/content/$aid"
     local game_dir="$steam_path/steamapps/common/DayZ"
-    if [[ ! -d $steam_path ]] || [[ ! -d $game_dir ]] || [[ ! $(find "$game_dir" -type f) ]]; then
+    if [[ ! -d $steam_path ]] || [[ ! -d $game_dir ]] || [[ ! $(find $game_dir -type f) ]]; then
         logger WARN "DayZ path resolved to '$game_dir'"
         logger WARN "Workshop path resolved to '$workshop_dir'"
         qdialog "$msg2" "Yes" "Exit"
@@ -1015,16 +985,18 @@ varcheck(){
         create_config
         return 0
     fi
+    if [[ $src_path != $(realpath "$0") ]]; then
+        src_path=$(realpath "$0")
+        update_config
+    fi
 }
 is_dzg_downloading(){
-    echo "# Checking DayZ"
     if [[ -d $steam_path ]] && [[ -d $steam_path/downloading/$aid ]]; then
         logger WARN "DayZ may be scheduling updates"
         return 0
     fi
 }
 is_steam_running(){
-    echo "# Checking Steam"
     local res=$(ps aux | grep "steamwebhelper" | grep -v grep)
     if [[ -z $res ]]; then
         logger WARN "Steam may not be running"
@@ -1037,7 +1009,6 @@ get_response_code(){
     curl -Ls -I -o /dev/null -w "%{http_code}" "$url"
 }
 test_connection(){
-    echo "# Testing connection"
     declare -A hr
     local res1
     local res2
@@ -1071,7 +1042,6 @@ legacy_cols(){
     mv $cols_file.new $cols_file
 }
 stale_mod_signatures(){
-    echo "# Checking stale mods"
     [[ ! -f "$versions_file" ]] && return
     local workshop_dir="$steam_path/steamapps/workshop/content/$aid"
     if [[ -d $workshop_dir ]]; then
@@ -1085,48 +1055,18 @@ stale_mod_signatures(){
 
 }
 create_new_links(){
-    echo "# Setting up symlinks"
     "$func_helper" "update_symlinks"
 }
-calc_local_coords(){
-    local ip="$1"
-    [[ ! -f "$geo_helper" ]] && return 1
-
-    IFS="." read -ra split <<< "$ip"
-    [[ ${#split[@]} -ne 4 ]] && return 1
-
-    prefix="^${split[0]}.${split[1]}."
-    readarray -t res < <(grep "$prefix" "$geo_helper")
-
-    for address in "${res[@]}"; do
-        IFS="," read -ra fields <<< "$address"
-        upper="${fields[1]}"
-        IFS="." read -ra upper_digits <<< "$upper"
-        if [[ ${split[2]} -gt ${upper_digits[2]} ]]; then
-            continue
-        fi
-        if [[ ${split[2]} -eq ${upper_digits[2]} ]]; then
-            if [[ ${split[3]} -gt ${upper_digits[3]} ]]; then
-                continue
-            fi
-            if [[ ${split[3]} -eq ${upper_digits[3]} ]]; then
-                echo "${fields[-2]}" >> "$coords_file"
-                echo "${fields[-1]}" >> "$coords_file"
-                return 0
-            fi
-        fi
-        if [[ ${split[2]} -lt ${upper_digits[2]} ]]; then
-            echo "${fields[-2]}" >> "$coords_file"
-            echo "${fields[-1]}" >> "$coords_file"
-            return 0
-        fi
-    done
-    return 1
-}
 initial_setup(){
+    setup_dirs
+    setup_state_files
+    depcheck
+    check_pyver
+    test_gobject
+    watcher_deps
     check_architecture
     test_connection
-    fetch_helpers
+    fetch_helpers > >(pdialog "Checking helper files")
     varcheck
     source "$config_file"
     lock
@@ -1135,12 +1075,14 @@ initial_setup(){
     check_version
     check_map_count
     steam_deps
+    migrate_files
     stale_symlinks
     stale_mod_signatures
     create_new_links
     local_latlon
     is_steam_running
     is_dzg_downloading
+    print_config_vals
 }
 uninstall(){
     _full(){
@@ -1242,18 +1184,11 @@ main(){
 
     set_im_module
 
-    printf "Checking dependencies...\n"
-    setup_dirs
-    setup_state_files
-    depcheck
-    check_pyver
-    test_gobject
-    watcher_deps
-
-    initial_setup > >(pdialog "Initializing setup")
+    printf "Initializing setup...\n"
+    initial_setup
 
     printf "All OK. Kicking off UI...\n"
-    python3.13 "$ui_helper" "--init-ui" "$version" "$is_steam_deck"
+    python3 "$ui_helper" "--init-ui" "$version" "$is_steam_deck"
 
 }
 

helpers/funcs

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o pipefail
-version="6.0.5-beta.2"
+version="6.0.1-beta.1"
 
 #CONSTANTS
 aid=221100
@@ -51,7 +51,6 @@ _cache_binary="$cache_dir/$prefix.binary"
 _cache_coords="$cache_path/$prefix.coords"
 _cache_cooldown="$cache_path/$prefix.cooldown"
 _cache_lan="$cache_path/$prefix.lan"
-_cache_src_path="$cache_path/$prefix.src"
 
 #XDG
 freedesktop_path="$HOME/.local/share/applications"
@@ -88,14 +87,17 @@ steam_api_url="https://steamcommunity.com/dev/apikey"
 battlemetrics_api_url="https://www.battlemetrics.com/developers"
 bm_api="https://api.battlemetrics.com/servers"
 
-steam_cmd="$preferred_client"
+if [[ $preferred_client == "steam" ]]; then
+    steam_cmd="steam"
+else
+    steam_cmd="flatpak run com.valvesoftware.Steam"
+fi
 
 declare -A funcs=(
 ["Highlight stale"]="find_stale_mods"
 ["Change player name"]="update_config_val"
 ["Change Steam API key"]="update_config_val"
 ["Change Battlemetrics API key"]="update_config_val"
-["Change client"]="update_config_val"
 ["Change favorite server"]="add_record"
 ["Add server by IP"]="add_record"
 ["Add server by ID"]="add_record"
@@ -286,7 +288,7 @@ a2s(){
     local mode="$3"
     logger INFO "Querying '$ip:$qport' with mode '$mode'"
     local res
-    res=$(python3.13 "$query_helper" "$ip" "$qport" "$mode")
+    res=$(python3 "$query_helper" "$ip" "$qport" "$mode")
     if [[ $? -eq 1 ]]; then
         res=$(try_fallback "$ip" "$qport" "$mode")
         if [[ $? -eq 1 ]]; then
@@ -309,7 +311,7 @@ is_in_favs(){
 find_id(){
     local file="$default_steam_path/config/loginusers.vdf"
     [[ ! -f $file ]] && return 1
-    local res=$(python3.13 "$helpers_path/vdf2json.py" \
+    local res=$(python3 "$helpers_path/vdf2json.py" \
     -i "$file" \
     | jq -r '.users
         |to_entries[]
@@ -338,7 +340,7 @@ list_mods(){
             name=$(awk -F\" '/name/ {print $2}' "${dir}/meta.cpp")
             base_dir=$(basename $(readlink -f $game_dir/$symlink))
             size=$(du -s "$(readlink -f "$game_dir/$symlink")" | awk '{print $1}')
-            size=$(python3.13 -c "n=($size/1024) +.005; print(round(n,4))")
+            size=$(python3 -c "n=($size/1024) +.005; print(round(n,4))")
             LC_NUMERIC=C printf "%s$sep%s$sep%s$sep%3.3f\n" "$name" "$symlink" "$base_dir" "$size"
         done | sort -k1)
         # user may have manually pruned mods out-of-band
@@ -397,7 +399,6 @@ get_dist(){
         logger INFO "Distance: $dist km"
     fi
 }
-
 query_config(){
     [[ -n $2 ]] && local key=$2
     keys=(
@@ -423,7 +424,6 @@ query_config(){
         echo "${!i}"
     done
 }
-
 align_versions_file(){
     shift
     local mod="$1"
@@ -589,6 +589,9 @@ 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
 }
 format_version_url(){
@@ -642,7 +645,6 @@ download_new_version(){
         return 1
     fi
     local version_url="$(format_version_url)"
-    local src_path="$(< "$_cache_src_path")"
     mv "$src_path" "$src_path.old"
     curl -Ls "$version_url" > "$src_path"
     rc=$?
@@ -690,7 +692,6 @@ toggle(){
                 auto_install="1"
             else
                 auto_install=""
-                rm "$versions_file"
             fi
             ;;
         Toggle[[:space:]]debug[[:space:]]mode)
@@ -700,6 +701,13 @@ toggle(){
                 debug=""
             fi
             ;;
+        Toggle[[:space:]]Steam/Flatpak)
+            if [[ $preferred_client == "steam" ]]; then
+                preferred_client="flatpak"
+            else
+                preferred_client="steam"
+            fi
+            ;;
         Toggle[[:space:]]DZGUI[[:space:]]fullscreen[[:space:]]boot)
             if [[ $fullscreen == "true" ]]; then
                 fullscreen="false"
@@ -798,9 +806,6 @@ update_config_val(){
     local context="$1"
     local value="$2"
     case $1 in
-        "Change client")
-            key="preferred_client"
-            ;;
         "Change player name")
             key="name"
             if [[ -z "${value// }" ]]; then
@@ -826,6 +831,7 @@ update_config_val(){
     declare -n nr=$key
     nr="$value"
     update_config
+    echo "Updated the key '$key' to '$value'"
     return 80
 }
 show_log(){
@@ -930,19 +936,13 @@ query_defunct(){
     <<< "$result" awk '{print $2}'
 }
 encode(){
-    echo -n "$1" | md5sum | cut -c -8
+    echo "$1" | md5sum | cut -c -8
 }
 compare(){
     local modlist="$@"
     diff=$(comm -23 <(<<< "$modlist" sort -u) <(installed_mods | sort))
     echo "$diff"
 }
-unlink_all(){
-    readarray -t links < <(find "$game_dir" -maxdepth 1 -mindepth 1 -type l)
-    for link in "${links[@]}"; do
-        unlink "$link"
-    done
-}
 legacy_symlinks(){
     logger INFO "Removing legacy symlinks"
 
@@ -1033,10 +1033,7 @@ update_symlinks(){
     if [[ ! -d "$workshop_dir" ]]; then
         return
     fi
-    if [[ ! -d "$game_dir" ]]; then
-        return
-    fi
-    unlink_all
+    legacy_symlinks
     symlinks
 }
 try_fallback(){
@@ -1087,42 +1084,41 @@ try_connect(){
     local appid="$2"
     local binary="$3"
 
-    IFS=":" read -ra address <<< "$record"
-    local ip
-    local gameport
-    local qport
-    ip=${address[0]}
-    gameport=${address[1]}
-    qport=${address[2]}
+    local ip=$(<<< $record awk -F: '{print $1}')
+    local gameport=$(<<< $record awk -F: '{print $2}')
+    local qport=$(<<< $record awk -F: '{print $3}')
 
-    [[ $appid -eq $exp ]] && echo "$binary" > "$_cache_binary"
+    [[ $appid -eq $exp ]] && echo "$binary" > $_cache_binary
 
     local remote_mods
-    remote_mods=$(a2s "$ip" "$qport" rules)
+    remote_mods=$(a2s $ip $qport rules)
     if [[ $? -eq 1 ]]; then
         printf "Failed to fetch server modlist, possibly timed out"
         return 1
     fi
-    logger INFO "Server returned modlist: $(<<< "$remote_mods" tr '\n' ' ')"
-
-    local sanitized_mods
-    sanitized_mods=$(query_defunct "$remote_mods")
+    logger INFO "Server returned modlist: $(<<< $remote_mods tr '\n' ' ')"
+    local sanitized_mods=$(query_defunct "$remote_mods")
+    local diff=$(compare "$sanitized_mods")
 
     logger INFO "Connection attempt for $ip:$qport"
     update_history "$record"
 
-    case $auto_install in
-        "") install_mods "$sanitized_mods" "manual" ;;
-        1|2) install_mods "$sanitized_mods" "auto" ;;
-    esac
-
-    # NOTE: clean diff indicates that all requisite mods were downloaded
-    diff=$(compare "$sanitized_mods")
-    if [[ -z $diff ]]; then
-        launch "$ip" "$gameport" "$sanitized_mods" "$appid"
+    if [[ -n $auto_install ]]; then
+        logger INFO "Merging modlists"
+        diff=$(merge_modlists "$diff")
+        diff=$(query_defunct "$diff")
+    fi
+    if [[ -n $diff ]]; then
+        if [[ $(check_architecture) -eq 1 ]] && [[ $(test_display_mode) == "gm" ]]; then
+            printf "Use Desktop Mode to download mods on Steam Deck"
+            return 1
+        fi
+        case $auto_install in
+            "") manual_mod_install "$ip" "$gameport" "$diff" "$sanitized_mods" "" "$appid";;
+            1|2) manual_mod_install "$ip" "$gameport" "$diff" "$sanitized_mods" "auto" "$appid" ;;
+        esac
     else
-        printf "User aborted download process, or some mods may have failed to download. Try connecting again to resync."
-        exit 1
+        launch "$ip" "$gameport" "$sanitized_mods" "$appid"
     fi
 }
 check_architecture(){
@@ -1138,15 +1134,13 @@ force_update(){
         printf "Only available when mod auto-install is ON"
         return 1
     fi
-    # NOTE: forcibly regenerate signatures by removing file
     rm "$versions_file"
-    local mods
-    mods=$(ls -1 "$workshop_dir")
-    install_mods "$mods" "force"
+    local update=$(check_timestamps)
+    manual_mod_install "null" "null" "$update" "null" "force" "null"
     echo "Finished requesting mod updates."
     return 0
 }
-get_timestamps(){
+get_local_stamps(){
     readarray -t modlist < <(printf "%s\n" "$@")
     local max="${#modlist[@]}"
     _concat(){
@@ -1171,6 +1165,67 @@ update_stamps(){
         printf "%s\n" "${stamps[$i]}" >> $versions_file
     done
 }
+check_timestamps(){
+    readarray -t local_modlist < <(ls -1 $workshop_dir)
+    local max=${#local_modlist[@]}
+    logger INFO "Local mod count: $max"
+    [[ $max -eq 0 ]] && return 1
+    local local_stamps=$(get_local_stamps "${local_modlist[@]}")
+    if [[ -z $local_stamps ]]; then
+        logger WARN "Timestamp query returned empty response"
+        return 1
+    fi
+    local aligned=$(<<< "$local_stamps" jq -r '.response.publishedfiledetails[]|"\(.publishedfileid),\(.time_updated)"')
+    readarray -t remote_ids < <(<<< "$aligned" awk -F, '{print $1}')
+    readarray -t remote_times < <(<<< "$aligned" awk -F, '{print $2}')
+
+    if [[ ! -f $versions_file ]]; then
+        logger INFO "No prior versions file found, creating"
+        update_stamps "$aligned"
+        #force refresh all mods if versions file was missing
+        printf "%s\n" "${remote_ids[@]}"
+        return 0
+    fi
+
+    readarray -t old_ids < <(< $versions_file awk -F, '{print $1}')
+    readarray -t old_times < <(< $versions_file awk -F, '{print $2}')
+
+    declare -A remote_version
+    declare -A local_version
+
+    for((i = 0; i < ${#remote_ids[@]}; ++i)); do
+        remote_version[${remote_ids[$i]}]=${remote_times[$i]}
+    done
+
+    needs_update=()
+    for((i=0;i<${#old_ids[@]};i++)); do
+        local id=${old_ids[$i]}
+        local time=${old_times[$i]}
+        if [[ $time != ${remote_version[$id]} ]]; then
+                logger WARN "Mod '$id' timestamp '$time' != '${remote_version[$id]}'"
+                needs_update+=($id)
+        fi
+    done
+    printf "%s\n" "${needs_update[@]}"
+}
+merge_modlists(){
+    local diff="$1"
+    _sort(){
+        printf "%s\n" "$diff"
+        printf "%s\n" "${needs_update[@]}"
+    }
+    readarray -t needs_update < <(check_timestamps)
+    if [[ -z ${needs_update[@]} ]]; then
+        echo "$diff"
+        return 0
+    fi
+    if [[ -z "$diff" ]] && [[ ${#needs_update[@]} -gt 0 ]]; then
+        printf "%s\n" "${needs_update[@]}"
+    else
+        # remove duplicates
+        _sort | sort -u
+    fi
+}
 concat_mods(){
     readarray -t concat_arr <<< "$@"
     local id
@@ -1212,7 +1267,7 @@ launch(){
 
     if [[ $debug -eq 1 ]]; then
         local launch_options="$steam_cmd -applaunch $appid -connect=$ip:$gameport -nolauncher -nosplash -name=$name -skipintro -mod=$concat"
-        printf "Debug mode: these options would have been used to launch the game: %s" "$launch_options"
+        printf "Debug mode: these options would have been used to launch the game: $launch_options"
         return 0
     fi
     echo "$concat" > "$_cache_launch"
@@ -1248,121 +1303,75 @@ final_handshake(){
     printf "\n"
     return 6
 }
-watcher(){
-    local -n to_download="$1"
-    local -n signatures="$2"
-    local mode="$3"
-
-    declare -i i=0
-    local remote_time
-    local length
-    length=${#to_download[@]}
-    for mod in "${!to_download[@]}"; do
-        remote_time=${to_download[$mod]}
-        [[ -f $ex ]] && return 1
-        case $mode in
-            "auto" | "force")
-                $steam_cmd "steam://url/CommunityFilePage/${mod}+workshop_download_item ${aid} ${mod}"
-                echo "# Opening workshop page for ${mod}. If you see no progress, you may be out of disk space."
-                ;;
-            *)
-                $steam_cmd "steam://url/CommunityFilePage/${mod}"
-                echo "# Opening workshop page for ${mod}. If you see no progress after subscribing, try unsubscribing and resubscribing again until the download commences."
-                ;;
-        esac
-        sleep 1s
-        foreground
-
-        until [[ -d $downloads_dir/${mod} ]]; do
-            [[ -f $ex ]] && return 1
-            sleep 0.1s
-            # NOTE: fallback for instantaneous downloads
-            if [[ $mode == "auto" || $mode == "force" ]]; then
-                if [[ -d $workshop_dir/${mod} ]]; then
-                    break
-                fi
-            fi
-        done
-
-        foreground
-        case $mode in
-            "auto" | "force")
-                echo "# Steam is downloading ${mod} (mod $((i+1)) of ${length}). You do not need to manually Subscribe."
-                ;;
-            *)
-                echo "# Steam is downloading ${mod} (mod $((i+1)) of ${length})"
-                ;;
-        esac
-
-        until [[ -d $workshop_dir/${mod} ]]; do
-            [[ -f $ex ]] && return 1
-            sleep 0.1s
-        done
-
-        foreground
-        if [[ ! -v signatures["${mod}"] ]]; then
-            echo "$mod,$remote_time" >> "$versions_file"
-        else
-            sed -i "s/$mod,${signatures[$mod]}/$mod,$remote_time/" "$versions_file"
-        fi
-        echo "# ${mod} moved to mods dir"
-        i+=1
-    done
-    echo "100"
-}
-install_mods(){
-    local sanitized_mods="$1"
-    local mode="$2"
+manual_mod_install(){
+    local ip="$1"
+    local gameport="$2"
+    local diff="$3"
+    local sanitized_mods="$4"
+    local mode="$5"
+    local appid="$6"
     local ex="$state_path/dzg.watcher"
 
-    [[ -f $ex ]] && rm "$ex"
+    readarray -t stage_mods <<< "$diff"
+    [[ -f $ex ]] && rm $ex
 
-    if [[ -f "$versions_file" ]]; then
-        readarray -t local_mods < "$versions_file"
-    else
-        local_mods=()
+    _watcher(){
+        for((i=0;i<${#stage_mods[@]};i++)); do
+            [[ -f $ex ]] && return 1
+
+            if [[ $mode == "auto" ]] || [[ $mode == "force" ]]; then
+                $steam_cmd "steam://url/CommunityFilePage/${stage_mods[$i]}+workshop_download_item $aid ${stage_mods[$i]}"
+                echo "# Opening workshop page for ${stage_mods[$i]}. If you see no progress, you may be out of disk space."
+            else
+                $steam_cmd "steam://url/CommunityFilePage/${stage_mods[$i]}"
+                echo "# Opening workshop page for ${stage_mods[$i]}. If you see no progress after subscribing, try unsubscribing and resubscribing again until the download commences."
+            fi
+            sleep 1s
+            foreground
+
+            until [[ -d $downloads_dir/${stage_mods[$i]} ]]; do
+                [[ -f $ex ]] && return 1
+                sleep 0.1s
+                if [[ -d $workshop_dir/${stage_mods[$i]} ]]; then
+                    break
+                fi
+            done
+
+            foreground
+            if [[ $mode == "auto" ]] || [[ $mode == "force" ]]; then
+                echo "# Steam is downloading ${stage_mods[$i]} (mod $((i+1)) of ${#stage_mods[@]}). You do not need to manually Subscribe."
+            else
+                echo "# Steam is downloading ${stage_mods[$i]} (mod $((i+1)) of ${#stage_mods[@]})"
+            fi
+            until [[ -d $workshop_dir/${stage_mods[$i]} ]]; do
+                [[ -f $ex ]] && return 1
+                sleep 0.1s
+            done
+
+            foreground
+            echo "# ${stage_mods[$i]} moved to mods dir"
+        done
+        echo "100"
+    }
+    _watcher > >($steamsafe_zenity --pulsate --progress --auto-close --title="DZG Watcher" --width=500 2>/dev/null; rc=$?; [[ $rc -eq 1 ]] && touch $ex)
+
+    if [[ $mode == "force" ]]; then
+        rm "$versions_file"
+        check_timestamps
+        return 0
     fi
 
-    declare -A mod_signatures
-    local local_id
-    local local_time
-    for mod in "${local_mods[@]}"; do
-        IFS="," read -ra fields <<< "$mod"
-        local_id="${fields[0]}"
-        local_time="${fields[1]}"
-        mod_signatures[$local_id]=$local_time
-    done
-
-    readarray -t remote_mods <<< "$sanitized_mods"
-    declare -A download
-    local remote_timestamps
-    local remote_id
-    local remote_time
-    remote_timestamps=$(get_timestamps "${remote_mods[@]}")
-    for mod in $(<<< "$remote_timestamps" jq -r '.response.publishedfiledetails[]|"\(.publishedfileid),\(.time_updated)"'); do
-        IFS="," read -ra fields <<< "$mod"
-        remote_id="${fields[0]}"
-        remote_time="${fields[1]}"
-
-        # NOTE: mod is not present in versions file
-        if [[ ! -v mod_signatures["$remote_id"] ]]; then
-            download["$remote_id"]=$remote_time
-            continue
+    local diff=$(compare "$sanitized_mods")
+    if [[ -z $diff ]]; then
+        if [[ $mode == "auto" ]]; then
+            rm "$versions_file"
+            check_timestamps
         fi
-        # NOTE: mod timestamp is out of date
-        local_time="${mod_signatures["$remote_id"]}"
-        if [[ $remote_time != "$local_time" ]]; then
-            download["$remote_id"]=$remote_time
-            continue
-        fi
-    done
-
-    [[ ${#download[@]} -lt 1 ]] && return
-    if [[ $(check_architecture) -eq 1 ]] && [[ $(test_display_mode) == "gm" ]]; then
-        printf "Use Desktop Mode to download mods on Steam Deck"
+        launch "$ip" "$gameport" "$sanitized_mods" "$appid"
+    else
+        printf "User aborted download process, or some mods may have failed to download. Try connecting again to resync."
         exit 1
     fi
-    watcher download mod_signatures "$mode" > >($steamsafe_zenity --pulsate --progress --auto-close --title="DZG Watcher" --width=500 2>/dev/null; rc=$?; [[ $rc -eq 1 ]] && touch "$ex")
 }
 test_display_mode(){
     pgrep -a gamescope | grep -q "generate-drm-mode"

helpers/pefile.py

@@ -295,7 +295,7 @@ def get_dayz_version(file: Path) -> DayZVersion | Exception:
     try:
         version = get_version(file)
     except Exception as e:
-        raise e
+        return e
     patch = str(version.build) + str(version.revision)
     dz_vers = DayZVersion(version.major, version.minor, int(patch))
     return dz_vers

helpers/ui.py

@@ -19,7 +19,7 @@ from collections.abc import Callable
 from concurrent.futures import wait
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
-from typing import Literal, Self, Any, TYPE_CHECKING
+from typing import Literal, Self, Any
 
 import servers as Servers  # noqa E402
 import pefile as PeFile  # noqa E402
@@ -32,16 +32,12 @@ from pefile import (
 )
 from pefile import VersionMatch
 
-if TYPE_CHECKING:
-    from servers import Prereqs
-
 locale.setlocale(locale.LC_ALL, "")
 
 import gi  # noqa E402
 
 gi.require_version("Gtk", "3.0")
-gi.require_version("GLibUnix", "2.0")
-from gi.repository import Gtk, GLib, GLibUnix, Gdk, GObject, Pango  # noqa E402
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango  # noqa E402
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=708676
 warnings.filterwarnings("ignore", ".*g_value_get_int", Warning)
@@ -828,7 +824,8 @@ def query_history() -> list | None:
             rows = [row.rstrip("\n") for row in f]
     except OSError:
         rows = None
-    return rows
+    finally:
+        return rows
 
 
 def query_favorites() -> None | list:
@@ -854,7 +851,9 @@ def call_out(command: str, *args: str) -> subprocess.CompletedProcess:
     arg_ar = []
     for i in args:
         arg_ar.append(i)
-    logger.info(f"Context '{name}' calling subprocess '{command}' with args '{arg_ar}'")
+    logger.info(
+        f"Context '{name}' calling subprocess '{command}' with args '{arg_ar}'"
+    )
     proc = subprocess.run(
         ["/usr/bin/env", "bash", funcs, command] + arg_ar,
         capture_output=True,
@@ -868,19 +867,20 @@ def spawn_dialog(msg: str, mode: Popup) -> bool:
     dialog = GenericDialog(msg, mode)
     response = dialog.run()
     dialog.destroy()
-    clean_msg = msg.replace("\n", " ")
 
     match response:
         case Gtk.ResponseType.OK:
-            logger.info(f"User confirmed dialog with message '{clean_msg}'")
+            logger.info(f"User confirmed dialog with message '{msg}'")
             return False
         case Gtk.ResponseType.CANCEL | Gtk.ResponseType.DELETE_EVENT:
-            logger.info(f"User aborted dialog with message '{clean_msg}'")
+            logger.info(f"User aborted dialog with message '{msg}'")
             return True
     return False
 
 
-def process_shell_return_code(msg: str, code: int, original_input: RowType) -> None:
+def process_shell_return_code(
+    msg: str, code: int, original_input: RowType
+) -> None:
     logger.info(
         f"Processing return code '{code}' for the input "
         f"'{original_input}', returned message '{msg}'"
@@ -907,7 +907,9 @@ def process_shell_return_code(msg: str, code: int, original_input: RowType) -> N
             spawn_dialog("Invalid Steam API key, reverting", Popup.NOTIFY)
             App.notebook.settings.revert(Preferences.STEAM)
         case 79:  # failed settings update (bm)
-            spawn_dialog("Invalid Battlemetrics API key, reverting", Popup.NOTIFY)
+            spawn_dialog(
+                "Invalid Battlemetrics API key, reverting", Popup.NOTIFY
+            )
             App.notebook.settings.revert(Preferences.BM)
         case 80:  # pop toast after successful settings change
             config_vals.clear()
@@ -973,7 +975,9 @@ def call_on_thread(
     if state:
         wait_dialog = GenericDialog(msg, Popup.WAIT)
         wait_dialog.show_all()
-        thread = threading.Thread(target=_background, args=(subproc, args, wait_dialog))
+        thread = threading.Thread(
+            target=_background, args=(subproc, args, wait_dialog)
+        )
         thread.start()
     else:
         """
@@ -998,14 +1002,18 @@ def process_tree_option(choice: RowType) -> None:
         record = App.treeview.get_record_string()
         wait_msg = command.dict["wait_msg"]
         show_wait_dialog = True
-        call_on_thread(show_wait_dialog, cmd_string, wait_msg, record, choice=choice)
+        call_on_thread(
+            show_wait_dialog, cmd_string, wait_msg, record, choice=choice
+        )
         return
 
     # modlist highlight stale action
     if context == WindowContext.TABLE_MODS and command == RowType.HIGHLIGHT:
         wait_msg = command.dict["wait_msg"]
         show_wait_dialog = True
-        call_on_thread(show_wait_dialog, cmd_string, wait_msg, "", choice=choice)
+        call_on_thread(
+            show_wait_dialog, cmd_string, wait_msg, "", choice=choice
+        )
         return
 
     if command == RowType.CHANGELOG:
@@ -1019,7 +1027,13 @@ def process_tree_option(choice: RowType) -> None:
             return
 
         record = str_to_record(record)
-        prepare_connection(command, record)
+        thread_new_with_dialog(
+            App.treeview.prepare_connection,
+            parse_shell_output,
+            "Querying server",
+            command,
+            [record],
+        )
         return
 
     match command.dict["type"]:
@@ -1047,50 +1061,48 @@ def parse_shell_output(proc: subprocess.CompletedProcess, row: RowType):
     process_shell_return_code(msg, proc.returncode, row)
 
 
-def prepare_connection(rowtype: RowType, record: Record) -> None:
-    def background(rowtype: RowType, record: Record) -> None:
-        def cleanup() -> None:
-            App.treeview.wait_dialog.destroy()
-            # NOTE: When using RowType.CONN_BY_IP, the gameport needs to be interpolated
-            record.gameport = prereqs.gameport
-            addr = record_to_str(record)
+def thread_new_with_dialog(
+    func: Callable,
+    callback: Callable | None,
+    msg: str,
+    row: RowType | None,
+    args: list,
+) -> None:
+    """
+    Pop a GenericDialog transient to App.treeview and
+    call a function on a thread, with optional callback.
+    Chiefly used for connection-related subprocesses.
 
-            if proceed is False:
-                spawn_dialog(msg, Popup.NOTIFY)
-                return
-            if msg != "":
-                res = spawn_dialog(msg, Popup.CONFIRM)
-                if res is False:
-                    try_connect(addr, str(prereqs.appid), str(pefile_path), rowtype)
-            else:
-                try_connect(addr, str(prereqs.appid), str(pefile_path), rowtype)
+    After completion, the dialog is destroyed in the main event loop
+    and additional exception handling occurs.
 
-        proceed, msg, pefile_path, prereqs = App.treeview.get_prereqs(record)
-        GLib.idle_add(cleanup)
+    This is intended as a bridge between legacy shell methods and the UI.
+    A more abstracted version of call_on_thread() for when extra threaded
+    processing occurs before calls to shell subprocesses.
+    """
 
-    msg = "Checking prerequisites"
-    App.treeview.dialog_show(msg)
-    thread = threading.Thread(target=background, args=(rowtype, record))
-    thread.start()
-
-
-def try_connect(addr: str, appid: str, path: str, row: RowType) -> None:
-    def background(addr, appid, path):
+    def background(*args):
         def cleanup():
             App.treeview.dialog_hide()
-            parse_shell_output(proc, row)
+            if exception is not None:
+                spawn_dialog(str(exception), Popup.NOTIFY)
+                process_user_input(row)
+                return
+            if callback is not None and proc is not None:
+                callback(proc, row)
 
+        exception = None
+        proc = None
         try:
-            proc = call_out("try_connect", addr, appid, path)
+            proc = func(*args)
         except Exception as e:
-            logger.critical(e)
+            exception = e
             GLib.idle_add(cleanup)
             return
         GLib.idle_add(cleanup)
 
-    msg = "Querying server"
     App.treeview.dialog_show(msg)
-    thread = threading.Thread(target=background, args=(addr, appid, path))
+    thread = threading.Thread(target=background, args=(args))
     thread.start()
 
 
@@ -1130,32 +1142,27 @@ def record_to_str(record: Record) -> str:
 
 
 def connect_by_ip(enum: RowType, response: str) -> None:
-    try:
+    def _prep(response: str) -> None:
         record = Servers.validate_ip(response)
-    except Exception as e:
-        spawn_dialog(str(e), Popup.NOTIFY)
-        return
-    prepare_connection(enum, record)
+        proc = App.treeview.prepare_connection(record)
+        return proc
+
+    thread_new_with_dialog(
+        _prep, parse_shell_output, "Querying IP", enum, [response]
+    )
+    return
 
 
 def connect_by_id(enum: RowType, response: str, key: str) -> None:
     def _prep(key: str, response: str) -> None:
-        def cleanup() -> None:
-            App.treeview.dialog_hide()
-            prepare_connection(enum, record)
+        record = Servers.query_bm_api(key, response)
+        proc = App.treeview.prepare_connection(record)
+        return proc
 
-        try:
-            record = Servers.query_bm_api(key, response)
-        except Exception as e:
-            spawn_dialog(str(e), Popup.NOTIFY)
-            App.treeview.dialog_hide()
-            return
-        GLib.idle_add(cleanup)
-
-    msg = "Validating ID"
-    App.treeview.dialog_show(msg)
-    thread = threading.Thread(target=_prep, args=(key, response))
-    thread.start()
+    thread_new_with_dialog(
+        _prep, parse_shell_output, "Querying API", enum, [key, response]
+    )
+    return
 
 
 def process_user_input(enum: RowType) -> None:
@@ -1166,7 +1173,9 @@ def process_user_input(enum: RowType) -> None:
     if enum == RowType.CONN_BY_ID:
         key = query_config("api_key")[0]
         if len(key) == 0:
-            spawn_dialog("No Battlemetrics API key is set; see Options", Popup.NOTIFY)
+            spawn_dialog(
+                "No Battlemetrics API key is set; see Options", Popup.NOTIFY
+            )
             return
 
     user_entry = EntryDialog(prompt, Popup.ENTRY, link_label)
@@ -1187,7 +1196,9 @@ def process_user_input(enum: RowType) -> None:
 
     show_wait_dialog = True
     wait_msg = "Working"
-    call_on_thread(show_wait_dialog, cmd_string, wait_msg, response, choice=enum)
+    call_on_thread(
+        show_wait_dialog, cmd_string, wait_msg, response, choice=enum
+    )
     return
 
 
@@ -1275,7 +1286,9 @@ class OuterWindow(Gtk.Window):
             logger.info(f"Using default window size {w},{h}")
             self.set_default_size(w, h)
 
-    def _on_delete_event(self, window: "OuterWindow", event: Gdk.EventKey) -> None:
+    def _on_delete_event(
+        self, window: "OuterWindow", event: Gdk.EventKey
+    ) -> None:
         self.halt_proc_and_quit()
 
     def halt_proc_and_quit(self) -> None:
@@ -1342,7 +1355,8 @@ class RightPanel(Gtk.Box):
         self.pack_start(self.filters_vbox, False, False, 0)
 
         debug_tooltip = (
-            "Used to perform a dry run without\n" "actually connecting to a server"
+            "Used to perform a dry run without\n"
+            "actually connecting to a server"
         )
         ping_tooltip = (
             "Refresh the ping for visible servers.\n"
@@ -1411,7 +1425,8 @@ class RightPanel(Gtk.Box):
             rows = ModelManager.get_filtered()
             with ThreadPoolExecutor(100) as executor:
                 futures = [
-                    executor.submit(Servers.ping, i, row) for i, row in enumerate(rows)
+                    executor.submit(Servers.ping, i, row)
+                    for i, row in enumerate(rows)
                 ]
                 wait(futures)
                 for future in futures:
@@ -1472,8 +1487,6 @@ class ButtonBox(Gtk.Box):
         context = button.type
         logger.info(f"User clicked '{context}'")
 
-        App.grid.right_panel.filters_vbox.set_visible(False)
-
         if context == ButtonType.EXIT:
             logger.info("Normal user exit")
             save_res_and_quit()
@@ -1787,7 +1800,9 @@ class ModelManagerSingleton:
 
 
 class TreeView(Gtk.TreeView):
-    __gsignals__ = {"on_distcalc_started": (GObject.SignalFlags.RUN_FIRST, None, ())}
+    __gsignals__ = {
+        "on_distcalc_started": (GObject.SignalFlags.RUN_FIRST, None, ())
+    }
 
     def __init__(self):
         super().__init__()
@@ -1906,7 +1921,9 @@ class TreeView(Gtk.TreeView):
         if self.current_proc and self.current_proc.is_alive():
             self.current_proc.terminate()
 
-    def _delete_note(self, button: Gtk.Button, user_entry: Gtk.Box, addr: str) -> None:
+    def _delete_note(
+        self, button: Gtk.Button, user_entry: Gtk.Box, addr: str
+    ) -> None:
         box = button.get_parent()
         dialog = box.get_parent()
         try:
@@ -1998,7 +2015,9 @@ class TreeView(Gtk.TreeView):
             model.remove(it)
 
         block_signals()
-        thread = threading.Thread(target=ModelManager.resync_model, args=(addr, qport))
+        thread = threading.Thread(
+            target=ModelManager.resync_model, args=(addr, qport)
+        )
         thread.start()
 
     def remove_from_history(self) -> None:
@@ -2022,12 +2041,16 @@ class TreeView(Gtk.TreeView):
         if hasattr(TreeView, menu_item.action):
             func = getattr(TreeView, menu_item.action)
             msg = (
-                f"User clicked context menu '{menu_item.get_label()}', " f"calls {func}"
+                f"User clicked context menu '{menu_item.get_label()}', "
+                f"calls {func}"
             )
             logger.info(msg)
             func(self)
         else:
-            msg = f"Context menu function for '{menu_item.action}' " f"does not exist"
+            msg = (
+                f"Context menu function for '{menu_item.action}' "
+                f"does not exist"
+            )
             u_msg = (
                 f"Something went wrong when accessing the method "
                 f"'{menu_item.action}'"
@@ -2068,7 +2091,9 @@ class TreeView(Gtk.TreeView):
             return True
         return False
 
-    def _on_button_release(self, widget: Gtk.Widget, event: Gdk.EventButton) -> None:
+    def _on_button_release(
+        self, widget: Gtk.Widget, event: Gdk.EventButton
+    ) -> None:
         if event.type is Gdk.EventType.BUTTON_RELEASE and event.button != 3:
             return
 
@@ -2152,7 +2177,9 @@ class TreeView(Gtk.TreeView):
         if event.type is Gdk.EventType.KEY_PRESS and event.keyval is Gdk.KEY_l:
             if self.is_selection_empty():
                 return
-            self.menu.popup_at_widget(widget, Gdk.Gravity.CENTER, Gdk.Gravity.WEST)
+            self.menu.popup_at_widget(
+                widget, Gdk.Gravity.CENTER, Gdk.Gravity.WEST
+            )
         else:
             self.menu.popup_at_pointer(event)
         self.menu.select_first(False)
@@ -2166,7 +2193,9 @@ class TreeView(Gtk.TreeView):
             return None
         call_out("start_cooldown", "", "")
 
-        thread = threading.Thread(target=self._background_player_count, args=())
+        thread = threading.Thread(
+            target=self._background_player_count, args=()
+        )
         thread.start()
 
     def get_current_iter(self) -> Gtk.TreeIter | None:
@@ -2181,7 +2210,9 @@ class TreeView(Gtk.TreeView):
 
         context = App.treeview.get_subpage_label()
         row_sel = self.get_value_at_index(0)
-        logger.info(f"Tree selection for context '{context}' changed to '{row_sel}'")
+        logger.info(
+            f"Tree selection for context '{context}' changed to '{row_sel}'"
+        )
 
         if self.current_proc and self.current_proc.is_alive():
             self.current_proc.terminate()
@@ -2239,7 +2270,9 @@ class TreeView(Gtk.TreeView):
         self.set_cursor(path)
         return None
 
-    def _on_keypress(self, treeview: Gtk.TreeView, event: Gdk.EventKey) -> bool | None:
+    def _on_keypress(
+        self, treeview: Gtk.TreeView, event: Gdk.EventKey
+    ) -> bool | None:
         keyname = Gdk.keyval_name(event.keyval)
         grid = App.grid
         if event.state is Gdk.ModifierType.CONTROL_MASK:
@@ -2294,7 +2327,9 @@ class TreeView(Gtk.TreeView):
                     return False
         return None
 
-    def _on_key_release(self, treeview: Gtk.TreeView, event: Gdk.EventKey) -> None:
+    def _on_key_release(
+        self, treeview: Gtk.TreeView, event: Gdk.EventKey
+    ) -> None:
         """
         Suppresses spamming on keydown
         """
@@ -2409,7 +2444,10 @@ class TreeView(Gtk.TreeView):
         params = Servers.params
         serv = []
         with ThreadPoolExecutor() as executor:
-            futures = [executor.submit(job, key, APPID_DAYZ, param) for param in params]
+            futures = [
+                executor.submit(job, key, APPID_DAYZ, param)
+                for param in params
+            ]
             wait(futures)
             for future in futures:
                 res = future.result()
@@ -2431,7 +2469,10 @@ class TreeView(Gtk.TreeView):
 
     def _dump_lan(self, port: int) -> list | None:
         with ThreadPoolExecutor() as executor:
-            futures = [executor.submit(Servers.test_ip, i, port) for i in range(1, 256)]
+            futures = [
+                executor.submit(Servers.test_ip, i, port)
+                for i in range(1, 256)
+            ]
             wait(futures)
             servers = []
             for future in futures:
@@ -2450,8 +2491,6 @@ class TreeView(Gtk.TreeView):
     def _dump_servers(self, ips: list) -> list | None:
         if len(ips) == 0:
             return []
-        # NOTE: block malformed records
-        ips = [ip for ip in ips if len(ip.split(":")) == 3 and ip.split(":")[2] != ""]
         with ThreadPoolExecutor() as executor:
             futures = [
                 executor.submit(
@@ -2556,7 +2595,9 @@ class TreeView(Gtk.TreeView):
         ModelManager.set_store(App.treeview.get_model())
         App.treeview.set_model(None)
 
-        thread = threading.Thread(target=ModelManager.filter, args=(mode, *args))
+        thread = threading.Thread(
+            target=ModelManager.filter, args=(mode, *args)
+        )
         thread.start()
 
     def _background_quad(self, dialog: "GenericDialog", mode: RowType) -> None:
@@ -2715,9 +2756,13 @@ class TreeView(Gtk.TreeView):
         self.initialize_columns()
         self.set_selection_mode(Gtk.SelectionMode.SINGLE)
 
-        self.wait_dialog = GenericDialog("Fetching server metadata", Popup.WAIT)
+        self.wait_dialog = GenericDialog(
+            "Fetching server metadata", Popup.WAIT
+        )
         self.wait_dialog.show_all()
-        thread = threading.Thread(target=self._query_servers, args=(mode, port))
+        thread = threading.Thread(
+            target=self._query_servers, args=(mode, port)
+        )
         thread.start()
 
     def _format_float(
@@ -2896,7 +2941,9 @@ class TreeView(Gtk.TreeView):
     def get_view(self):
         return self.view
 
-    def get_prereqs(self, record: Record) -> tuple[bool, str, str | None, "Prereqs"]:
+    def prepare_connection(
+        self, record: Record
+    ) -> subprocess.CompletedProcess | None:
         """
         Always called on a thread with a dialog on the transient parent window
         """
@@ -2904,39 +2951,50 @@ class TreeView(Gtk.TreeView):
         if prereqs.appid is None:
             logger.warning(f"Query to '{record.ip}:{record.qport}' timed out")
             msg = "Timed out when querying server, check IP or try again later"
-            return (False, msg, None, prereqs)
+            spawn_dialog(msg, Popup.NOTIFY)
+            return None
 
         build = "DayZ" if prereqs.appid == APPID_DAYZ else "DayZ Experimental"
         steam_path = query_config("default_steam_path")[0]
 
         if len(steam_path) < 1:
-            logger.critical("Config file has no value set for 'default_steam_path'")
+            logger.critical(
+                "Config file has no value set for 'default_steam_path'"
+            )
             msg = "Local Steam installation is not set, possibly malformed config file."
-            return (False, msg, None, prereqs)
+            spawn_dialog(msg, Popup.NOTIFY)
+            return None
 
         try:
             pefile_path = PeFile.get_pefile_path(steam_path, prereqs.appid)
         except AppNotInstalledError:
-            logger.critical(f"'{prereqs.appid}' not found in user's libraryfolders")
+            logger.critical(
+                f"'{prereqs.appid}' not found in user's libraryfolders"
+            )
             msg = (
                 f"This server is running {build}. You can install "
                 f"{build} by searching for it in your Steam library. "
                 f"If you recently installed {build} or moved it to a different drive, "
                 "restart Steam to allow these changes to synchronize, then try again."
             )
-            return (False, msg, None, prereqs)
+            spawn_dialog(msg, Popup.NOTIFY)
+            return None
         except AppMovedError:
-            logger.critical(f"Library folder synch error for '{prereqs.appid}'")
+            logger.critical(
+                f"Library folder synch error for '{prereqs.appid}'"
+            )
             msg = (
                 f"Steam is reporting that {build} is installed at a non-existent location. "
                 f"If you recently installed {build} or moved it to a different drive, "
                 "restart Steam to allow these changes to synchronize, then try again."
             )
-            return (False, msg, None, prereqs)
+            spawn_dialog(msg, Popup.NOTIFY)
+            return None
         except (VDFLoadError, PeFileError, Exception) as e:
             logger.critical(e)
             msg = "Steam settings or DayZ installation may be corrupted. Try restarting Steam."
-            return (False, msg, None, prereqs)
+            spawn_dialog(msg, Popup.NOTIFY)
+            return None
 
         try:
             local_vers = PeFile.get_dayz_version(pefile_path)
@@ -2948,7 +3006,7 @@ class TreeView(Gtk.TreeView):
             local_vers = None
 
         try:
-            remote_vers = PeFile.dayz_version_from_str(prereqs)
+            remote_vers = PeFile.dayz_version_from_str(prereqs.version)
         except Exception:
             remote_vers = None
 
@@ -2961,15 +3019,18 @@ class TreeView(Gtk.TreeView):
                         f"This server is running a newer build ({prereqs.version}) of {build} than "
                         f"your local version. You may be unable to connect. Proceed anyway?"
                     )
-                    return (True, msg, pefile_path, prereqs)
+                    res = spawn_dialog(msg, Popup.CONFIRM)
+                    if res is True:
+                        return None
                 case VersionMatch.LOCAL_NEWER:
                     msg = (
                         f"This server is running an out-of-date build ({prereqs.version}) of {build}. "
                         "You may be unable to connect. Proceed anyway?"
                     )
-                    return (True, msg, pefile_path, prereqs)
+                    res = spawn_dialog(msg, Popup.CONFIRM)
+                    if res is True:
+                        return None
                 case VersionMatch.SAME_VERSION:
-                    return (True, "", pefile_path, prereqs)
                     pass
 
         if prereqs.password is True:
@@ -2977,9 +3038,19 @@ class TreeView(Gtk.TreeView):
                 "This server is password-protected and you will be "
                 "prompted when connecting. Do you want to proceed?"
             )
-            return (True, msg, pefile_path, prereqs)
+            res = spawn_dialog(msg, Popup.CONFIRM)
+            if res is True:
+                return None
 
-        return (True, "", pefile_path, prereqs)
+        """
+        When using RowType.CONN_BY_IP, the gameport needs to be interpolated
+        """
+        record.gameport = prereqs.gameport
+        addr = record_to_str(record)
+        proc = call_out(
+            "try_connect", addr, str(prereqs.appid), str(pefile_path)
+        )
+        return proc
 
     @signal_emission
     @update_window_labels
@@ -3049,7 +3120,13 @@ class TreeView(Gtk.TreeView):
                 record = self.get_record()
                 if record is None:
                     return
-                prepare_connection(None, record)
+                thread_new_with_dialog(
+                    self.prepare_connection,
+                    parse_shell_output,
+                    "Querying server",
+                    None,
+                    [record],
+                )
             case _:  # any other non-server option from the main menu
                 process_tree_option(output)
 
@@ -3134,7 +3211,7 @@ class GenericDialog(Gtk.MessageDialog):
         self.outer.set_margin_end(30)
 
     def _on_dialog_delete(
-        self, response_id: Gtk.ResponseType, event: Gdk.Event
+            self, response_id: Gtk.ResponseType, event: Gdk.Event
     ) -> Literal[True]:
         """
         Prevent manual dialog destruction
@@ -3213,7 +3290,9 @@ class LanDialog(Gtk.MessageDialog):
         self.connect("delete-event", self.restore_context)
 
         self.entry.connect("insert-text", self._on_text_typed)
-        self.entry.get_property("buffer").connect("deleted-text", self._on_text_deleted)
+        self.entry.get_property("buffer").connect(
+            "deleted-text", self._on_text_deleted
+        )
 
     def _validate(self, text: str) -> None:
         if self._is_invalid(text):
@@ -3329,7 +3408,9 @@ class DetailsDialog(GenericDialog):
         for i, column_title in enumerate(["Item", "Details"]):
             renderer = Gtk.CellRendererText(xalign=0)
             if i == 0:
-                column = Gtk.TreeViewColumn(column_title, renderer, text=i, weight=2)
+                column = Gtk.TreeViewColumn(
+                    column_title, renderer, text=i, weight=2
+                )
             else:
                 column = Gtk.TreeViewColumn(column_title, renderer, text=i)
             column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
@@ -3345,8 +3426,12 @@ class DetailsDialog(GenericDialog):
         scrollable_message = Gtk.ScrolledWindow()
         desc = Gtk.Label(label="Server message", valign=Gtk.Align.START)
         add_class(desc, "details-heading")
-        box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER)
-        self.description = Gtk.Label(justify=Gtk.Justification.CENTER, wrap=True)
+        box = Gtk.Box(
+            orientation=Gtk.Orientation.VERTICAL, halign=Gtk.Align.CENTER
+        )
+        self.description = Gtk.Label(
+            justify=Gtk.Justification.CENTER, wrap=True
+        )
         sep = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)
         sep.set_margin_bottom(10)
         for el in desc, sep, self.description:
@@ -3384,7 +3469,9 @@ class DetailsDialog(GenericDialog):
         self.run()
         self.destroy()
 
-    def _background(self, dialog: "GenericDialog", ip: str, qport: int) -> None:
+    def _background(
+        self, dialog: "GenericDialog", ip: str, qport: int
+    ) -> None:
         response = Servers.details(self.ip, self.qport)
         if response.success:
             for row in response.data:
@@ -3441,7 +3528,9 @@ class ModDialog(GenericDialog):
 
         wait_dialog = GenericDialog("Fetching modlist", Popup.WAIT)
         wait_dialog.show_all()
-        thread = threading.Thread(target=self._background, args=(wait_dialog, record))
+        thread = threading.Thread(
+            target=self._background, args=(wait_dialog, record)
+        )
         thread.start()
 
     def _background(self, dialog: "GenericDialog", record: str) -> None:
@@ -3466,7 +3555,9 @@ class ModDialog(GenericDialog):
         self.view.set_model(modlist_store)
         GLib.idle_add(_load)
 
-    def _parse_modlist_rows(self, data: subprocess.CompletedProcess) -> bool | int:
+    def _parse_modlist_rows(
+        self, data: subprocess.CompletedProcess
+    ) -> bool | int:
         lines = data.stdout.splitlines()
         hits = len(lines)
         reader = csv.reader(lines, delimiter=delimiter)
@@ -3496,7 +3587,9 @@ class ModDialog(GenericDialog):
 
 
 class LinkDialog(GenericDialog):
-    def __init__(self, text: str, link: str | None, command: RowType, uid: str = ""):
+    def __init__(
+        self, text: str, link: str | None, command: RowType, uid: str = ""
+    ):
         super().__init__(text, Popup.NOTIFY)
 
         text = textwrap.dedent(text)
@@ -3709,27 +3802,12 @@ class Options(Gtk.Box):
             "Always fullscreen",
             Preferences.WINDOW,
         )
-
-        # TODO: gray out options if not available on system
-        client_store = Gtk.ListStore(str, str)
-        client_store.append(["steam", "steam"])
-        client_store.append(["flatpak", "flatpak run com.valvesoftware.Steam"])
-        client_store.append(
-            [
-                "flatpak (container)",
-                "flatpak-spawn --host flatpak run com.valvesoftware.Steam",
-            ]
+        self.steam_toggle = self.make_binary_radio(
+            "Steam", "Flatpak (experimental)", Preferences.CLIENT
         )
 
-        renderer_text = Gtk.CellRendererText(ellipsize=Pango.EllipsizeMode.END)
-        self.client_combo = Gtk.ComboBox.new_with_model(client_store)
-        self.client_combo.set_halign(Gtk.Align.START)
-        self.client_combo.pack_start(renderer_text, True)
-        self.client_combo.connect("changed", self._on_client_changed)
-        self.client_combo.add_attribute(renderer_text, "text", 0)
-
         pref_rows = [
-            [LeftLabel("Steam client"), self.client_combo],
+            [LeftLabel("Steam client"), self.steam_toggle],
             [LeftLabel("Window size at boot"), self.fullscreen_toggle],
             [LeftLabel("Player name"), self.player_box],
         ]
@@ -3743,7 +3821,8 @@ class Options(Gtk.Box):
         self.force_button.set_sensitive(False)
 
         msg = (
-            "Manual: prompt to subscribe to mods in Steam. " "Auto: unmanned downloads."
+            "Manual: prompt to subscribe to mods in Steam. "
+            "Auto: unmanned downloads."
         )
         eb = InfoEventBox(msg)
 
@@ -3802,7 +3881,9 @@ class Options(Gtk.Box):
             self.make_frame(mods_grid, "Mods"),
             self.make_frame(version_grid, "Version"),
         ]:
-            grid.attach(frame, col, row, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT)
+            grid.attach(
+                frame, col, row, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT
+            )
             row += 1
 
         self.scrollable = Gtk.ScrolledWindow(vexpand=True)
@@ -3848,7 +3929,9 @@ class Options(Gtk.Box):
 
         return box
 
-    def _on_field_activated(self, entry: Gtk.Entry, context: Preferences) -> None:
+    def _on_field_activated(
+        self, entry: Gtk.Entry, context: Preferences
+    ) -> None:
         text = entry.get_text()
         button = entry.sibling
         if not self._is_valid_text(text, context):
@@ -3869,7 +3952,9 @@ class Options(Gtk.Box):
         for record in rows:
             col = 1
             for el in record:
-                grid.attach(el, col, row, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT)
+                grid.attach(
+                    el, col, row, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT
+                )
                 col += 1
             row += 1
         return grid
@@ -3907,25 +3992,20 @@ class Options(Gtk.Box):
         show_wait_dialog = True
         call_on_thread(show_wait_dialog, cmd, wait_msg, "")
 
-    def _on_client_changed(self, combo: Gtk.ComboBox) -> None:
-        # prevent triggering on initial init
-        if App.treeview.subpage is not RowType.OPTIONS:
-            return
-        ind = combo.get_active()
-        mod = combo.get_model()
-        client = mod[ind][1]
-        call_bash_func("Change client", client)
-
     def _on_branch_changed(self, combo: Gtk.ComboBoxText) -> None:
         # prevent triggering on initial init
         if App.treeview.subpage is not RowType.OPTIONS:
             return
         process_toggle(RowType.TGL_BRANCH)
 
-    def _on_radio_toggled(self, button: Gtk.RadioButton, context: Preferences) -> None:
-        if App.treeview.subpage is not RowType.OPTIONS:
+    def _on_radio_toggled(
+        self, button: Gtk.RadioButton, context: Preferences
+    ) -> None:
+        if App.treeview.subpage is None:
             return
         match context:
+            case Preferences.CLIENT:
+                toggle = RowType.TGL_STEAM
             case Preferences.INSTALL:
                 toggle = RowType.TGL_INSTALL
                 state = button.get_group()[0].get_active()
@@ -4047,9 +4127,11 @@ class Options(Gtk.Box):
             radio = 0
         self.mod_install_toggle.get_children()[radio].set_active(True)
 
-        for ind, row in enumerate(self.client_combo.get_model()):
-            if row[1] == client:
-                self.client_combo.set_active(ind)
+        if client == "flatpak":
+            radio = 1
+        else:
+            radio = 0
+        self.steam_toggle.get_children()[radio].set_active(True)
 
         if fullscreen == "true":
             radio = 1
@@ -4066,14 +4148,18 @@ class Options(Gtk.Box):
                 field[1].get_children()[1].set_sensitive(False)
 
         try:
-            pe_file_path = PeFile.get_pefile_path(default_steam_path, APPID_DAYZ)
+            pe_file_path = PeFile.get_pefile_path(
+                default_steam_path, APPID_DAYZ
+            )
             vers = PeFile.get_dayz_version(pe_file_path)
             dayz_version = PeFile.dayz_version_to_str(vers)
         except Exception:
             dayz_version = "-"
 
         try:
-            exp_file_path = PeFile.get_pefile_path(default_steam_path, APPID_DAYZ_EXP)
+            exp_file_path = PeFile.get_pefile_path(
+                default_steam_path, APPID_DAYZ_EXP
+            )
             vers = PeFile.get_dayz_version(exp_file_path)
             dayz_exp_version = PeFile.dayz_version_to_str(vers)
         except Exception:
@@ -4182,7 +4268,9 @@ class KeybindingsDialog(Gtk.Box):
                 if not sep:
                     grid.attach(desc, col, row, w, h)
                 else:
-                    grid.attach_next_to(desc, sep, Gtk.PositionType.BOTTOM, w, h)
+                    grid.attach_next_to(
+                        desc, sep, Gtk.PositionType.BOTTOM, w, h
+                    )
                     row += 1
                     sep = None
                 grid.attach_next_to(frame, desc, Gtk.PositionType.RIGHT, w, h)
@@ -4190,7 +4278,9 @@ class KeybindingsDialog(Gtk.Box):
             l_spacer = Gtk.Label(label="")
             r_spacer = Gtk.Label(label="")
             grid.attach(l_spacer, col, row + 1, w, h)
-            grid.attach_next_to(r_spacer, l_spacer, Gtk.PositionType.RIGHT, w, h)
+            grid.attach_next_to(
+                r_spacer, l_spacer, Gtk.PositionType.RIGHT, w, h
+            )
             row += 1
         return grid
 
@@ -4199,7 +4289,9 @@ class KeybindingsDialog(Gtk.Box):
         col = 0
         w = 1
         h = 1
-        sidebar = Gtk.Grid(row_homogeneous=True, orientation=Gtk.Orientation.VERTICAL)
+        sidebar = Gtk.Grid(
+            row_homogeneous=True, orientation=Gtk.Orientation.VERTICAL
+        )
         for cat in categories:
             label = Gtk.Label(label=cat)
             add_class(label, "left-label")
@@ -4219,7 +4311,9 @@ class KeybindingsDialog(Gtk.Box):
         column = 1
         w = 1
         h = 1
-        sidebar = self.build_sidebar(["Servers", "Navigation", "Vim-style keys"])
+        sidebar = self.build_sidebar(
+            ["Servers", "Navigation", "Vim-style keys"]
+        )
         separator = Gtk.Separator()
         keys_box = self.build_keys(items)
 
@@ -4437,7 +4531,9 @@ class Statusbar(Gtk.Statusbar):
 
         players_pretty = pluralize("players", players)
         hits_pretty = pluralize("matches", hits)
-        formatted = f"Found {hits:n} {hits_pretty} with {players:n} {players_pretty}"
+        formatted = (
+            f"Found {hits:n} {hits_pretty} with {players:n} {players_pretty}"
+        )
         suffix = "| Distance: calculating..."
 
         if players == 0:
@@ -4489,7 +4585,9 @@ class Grid(Gtk.Grid):
         self.breadcrumbs = Gtk.Label(label="Main menu", halign=Gtk.Align.START)
 
         self.attach(self.notebook, 0, 0, 3, 1)
-        self.attach_next_to(self.breadcrumbs, self.notebook, Gtk.PositionType.TOP, 3, 1)
+        self.attach_next_to(
+            self.breadcrumbs, self.notebook, Gtk.PositionType.TOP, 3, 1
+        )
         self.attach_next_to(
             self.statusbar, self.notebook, Gtk.PositionType.BOTTOM, 3, 1
         )
@@ -4551,23 +4649,11 @@ class App(Gtk.Application):
         )
         self.win.add_accel_group(accel)
 
-        self.setup_signals()
+        GLib.unix_signal_add(
+            GLib.PRIORITY_DEFAULT, signal.SIGINT, self._catch_sigint
+        )
         Gtk.main()
 
-    def setup_signals(self) -> None:
-        SIGNAL_ADD = "signal_add"
-        SIGNAL_ADD_FULL = "signal_add_full"
-        try:
-            if SIGNAL_ADD in dir(GLibUnix):
-                func = GLibUnix.signal_add
-            elif SIGNAL_ADD_FULL in dir(GLibUnix):
-                func = GLibUnix.signal_add_full
-            else:
-                func = GLib.unix_signal_add
-            func(GLib.PRIORITY_DEFAULT, signal.SIGINT, self._catch_sigint)
-        except Exception as e:
-            logger.critical(e)
-
     def _catch_sigint(self) -> None:
         self.win.halt_proc_and_quit()
 
@@ -4652,7 +4738,9 @@ class ModSelectionPanel(Gtk.Box):
 
     def toggle_select_stale_button(self, state: bool) -> None:
         if state:
-            button = Gtk.Button(label="Select stale", margin_start=10, margin_end=10)
+            button = Gtk.Button(
+                label="Select stale", margin_start=10, margin_end=10
+            )
             text = "Bulk selects all currently highlighted mods"
             button.set_tooltip_text(text)
             button.connect("clicked", self._on_button_clicked)
@@ -4772,7 +4860,9 @@ class FilterPanel(Gtk.Box):
         self.keyword_entry = Gtk.Entry()
         self.keyword_entry.set_placeholder_text("Filter by keyword")
         self.keyword_entry.connect("activate", self._on_keyword_enter)
-        self.keyword_entry.connect("key-press-event", self._on_keyword_keypress)
+        self.keyword_entry.connect(
+            "key-press-event", self._on_keyword_keypress
+        )
 
         completion = Gtk.EntryCompletion(inline_completion=True)
         completion.set_text_column(0)
@@ -4840,7 +4930,9 @@ class FilterPanel(Gtk.Box):
             state = self.default_filters[label]
             check.set_active(state)
 
-    def _on_map_entry_keypress(self, entry: Gtk.Entry, event: Gdk.EventKey) -> None:
+    def _on_map_entry_keypress(
+        self, entry: Gtk.Entry, event: Gdk.EventKey
+    ) -> None:
         match event.keyval:
             case Gdk.KEY_Return:
                 text = entry.get_text()
@@ -4883,7 +4975,9 @@ class FilterPanel(Gtk.Box):
         App.treeview.grab_focus()
         return False
 
-    def _on_keyword_keypress(self, entry: Gtk.Entry, event: Gdk.EventKey) -> bool:
+    def _on_keyword_keypress(
+        self, entry: Gtk.Entry, event: Gdk.EventKey
+    ) -> bool:
         match event.keyval:
             case Gdk.KEY_Up:
                 return True
@@ -4894,7 +4988,9 @@ class FilterPanel(Gtk.Box):
                 return True
         return False
 
-    def _on_combo_keypress(self, combo: Gtk.ComboBox, event: Gdk.EventKey) -> bool:
+    def _on_combo_keypress(
+        self, combo: Gtk.ComboBox, event: Gdk.EventKey
+    ) -> bool:
         match event.keyval:
             case Gdk.KEY_Down:
                 self.maps_combo.popup()