From c79cc5832ed7c34bd29be3f9692fb748daba402b Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Tue, 2 Jul 2024 14:27:37 +0900
Subject: [PATCH] fix: incomplete gametypes truncating list

---
 dzgui.sh      | 8 +++++---
 helpers/funcs | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dzgui.sh b/dzgui.sh
index ba9b059..6abde7b 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -o pipefail
 
-version=5.3.1-beta.1
+version=5.3.1-beta.2
 
 #CONSTANTS
 aid=221100
@@ -538,7 +538,7 @@ fetch_helpers_by_sum(){
         ["ui.py"]="f14772424461ec438579dec567db0634"
         ["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
         ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
-        ["funcs"]="37ae407ac397f6775f3a412e7adb7840"
+        ["funcs"]="718c3060b88041f5b99a1ce52b12642f"
     )
     local author="aclist"
     local repo="dztui"
@@ -655,7 +655,9 @@ find_default_path(){
     debian_path="$HOME/.steam/debian-installation"
     flatpak_path="$HOME/.var/app/com.valvesoftware.Steam/data/Steam"
 
-    for i in "$def_path" "$ubuntu_path" "$debian_path" "$flatpak_path"; do
+    #ubuntu path must precede default path because
+    #both exist on ubuntu systems, but only ubuntu path contains library data
+    for i in "$ubuntu_path" "$def_path" "$debian_path" "$flatpak_path"; do
         if [[ -d "$i" ]]; then
             default_steam_path="$i"
             return 0
diff --git a/helpers/funcs b/helpers/funcs
index 8146bd7..b36a30b 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -521,7 +521,7 @@ parse_server_json(){
     "\(if .gametype == null then "null" else (.gametype as $time|$time|test("[0-9]{2}:[0-9]{2}$") as $match|(if $match == true then ($time|scan("[0-9]{2}:[0-9]{2}$")) else "XXXX" end)) end)␞" +
     "\(.players)␞" +
     "\(.max_players)␞" +
-    "\(if .gametype == null then "0" else .gametype|split("lqs")[1]|split(",")[0] end)␞" +
+    "\(if .gametype == null then "0" elif .gametype|split("lqs")[1] == null then "0" else .gametype|split("lqs")[1]|split(",")[0] end)␞" +
     "\(.addr|split(":")[0]):\(if .gameport == null then "XXXX" else .gameport end)␞" +
     "\(.addr|split(":")[1])"
     ' | sort -k1