From 9fe300cfe4c8bb9a6de0b7818a08744e2f2bae7e Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sun, 17 Dec 2023 11:23:45 +0900
Subject: [PATCH 001/122] chore: bump version
---
CHANGELOG.md | 8 ++++++--
dzgui.sh | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 187a866..db81c5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
# Changelog
## [4.1.0] 2023-12-03
+
+This update adds support for DayZ servers running on a local area network. To connect or add to your server list, supply the server IP and query port in the format IP:PORT.
+
+Support for Steam Deck Game Mode has also been restored, with a new dialog format that allows for virtual keyboard input. This should allow you to enter text in form fields by activating the Steam button + X. In addition, you can unlock the mouse and keyboard input when launching DZGUI through Steam by using an internal binding provided by Steam Deck: long-press the three dots button on the right of the device for three seconds to toggle the input state. This allows you to use mouse and keyboard-style bindings on Game Mode and vice versa.
+
### Added
- Virtual keyboard support for text entry fields on Steam Deck Game Mode
- Validate and connect to LAN server IPs
@@ -19,8 +24,7 @@
## [4.0.1] 2023-11-22
### Fixed
-- Emergency hotfix to remove build artifacts leaking into main script: if you updated DZGUI from 3.3.18 to 4.0.0 between 2023-11-22 15:00:02 and 2023-11-22 15:03:37 GMT, there is a small chance it
- will be unable to launch correctly. If so, please follow the instructions on the manual to reinstall.
+- Emergency hotfix to remove build artifacts leaking into main script: if you updated DZGUI from 3.3.18 to 4.0.0 between 2023-11-22 15:00:02 and 2023-11-22 15:03:37 GMT, there is a small chance it will be unable to launch correctly. If so, please follow the instructions on the manual to reinstall.
## [4.0.0] 2023-11-22
diff --git a/dzgui.sh b/dzgui.sh
index c6b3a75..e1a8085 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=4.1.0.rc-8
+version=4.2.0.rc-1
aid=221100
game="dayz"
From b4301c6635f472ce13e57e3dcae6853a092b9a0a Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Mon, 18 Dec 2023 12:17:38 +0900
Subject: [PATCH 002/122] chore: backports
---
CHANGELOG.md | 7 ++++++-
dzgui.sh | 36 +++++++++++++++++++-----------------
2 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db81c5d..67cfc88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
# Changelog
-## [4.1.0] 2023-12-03
+## [4.1.1] 2023-12-18
+### Fixed
+
+- News marquee not showing
+
+## [4.1.0] 2023-12-17
This update adds support for DayZ servers running on a local area network. To connect or add to your server list, supply the server IP and query port in the format IP:PORT.
diff --git a/dzgui.sh b/dzgui.sh
index e1a8085..708fd90 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -40,31 +40,33 @@ version_file="$config_path/versions"
steamsafe_zenity="/usr/bin/zenity"
update_last_seen(){
- mv $config_file ${config_path}dztuirc.old
- nr=$(awk '/seen_news=/ {print NR}' ${config_path}dztuirc.old)
- seen_news="seen_news=\"$sum\""
- awk -v "var=$seen_news" -v "nr=$nr" 'NR==nr {$0=var}{print}' ${config_path}dztuirc.old > $config_file
- source $config_file
+ local news_sum="$1"
+ seen_news="$news_sum"
+ update_config
}
check_news(){
logger INFO "${FUNCNAME[0]}"
- echo "# Checking news"
[[ $branch == "stable" ]] && news_url="$stable_url/news"
[[ $branch == "testing" ]] && news_url="$testing_url/news"
local result=$(curl -Ls "$news_url")
- sum=$(echo -n "$result" | md5sum | awk '{print $1}')
+ local sum=$(echo -n "$result" | md5sum | awk '{print $1}')
+ printf "%s\n%s\n" "$result" "$sum"
logger INFO "News: $result"
}
print_news(){
+ readarray -t news_result < <(check_news)
+ local news_marquee=${news_result[0]}
+ local news_sum=${news_result[1]}
+ local hchar
+ local news
logger INFO "${FUNCNAME[0]}"
- if [[ $sum == $seen_news || -z $result ]]; then
- hchar=""
- news=""
- else
- hchar="─"
- news="$result\n$(awk -v var="$hchar" 'BEGIN{for(c=0;c<90;c++) printf var;}')\n"
- update_last_seen
- fi
+ if [[ $news_sum == $seen_news ]] || [[ -z $news_marquee ]]; then
+ return 1
+ fi
+ hchar="─"
+ news="$news_marquee\n$(awk -v var="$hchar" 'BEGIN{for(c=0;c<90;c++) printf var;}')\n"
+ update_last_seen "$news_sum"
+ echo "$news"
}
declare -A deps
@@ -998,7 +1000,8 @@ set_header(){
local switch="$1"
logger INFO "${FUNCNAME[0]}"
logger INFO "Header mode is $1"
- print_news
+ local news
+ news=$(print_news)
[[ $auto_install -eq 2 ]] && install_mode="auto"
[[ $auto_install -eq 1 ]] && install_mode="headless"
[[ $auto_install -eq 0 ]] && install_mode=manual
@@ -2117,7 +2120,6 @@ initial_setup(){
stale_symlinks
init_items
setup
- check_news
echo "100"
}
main(){
From d41082b1d4f67ef6f9f845351d4b51a00eefc708 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 13:39:04 +0900
Subject: [PATCH 003/122] feat: GTK UI
---
dzgui.sh | 2703 +++++++++++--------------------------------
helpers/funcs | 1200 +++++++++++++++++++
helpers/query_v2.py | 75 ++
helpers/ui.py | 1635 ++++++++++++++++++++++++++
4 files changed, 3598 insertions(+), 2015 deletions(-)
create mode 100644 helpers/funcs
create mode 100644 helpers/query_v2.py
create mode 100644 helpers/ui.py
diff --git a/dzgui.sh b/dzgui.sh
index 708fd90..ece043f 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,163 +1,177 @@
#!/usr/bin/env bash
-
set -o pipefail
-version=4.2.0.rc-1
+version="4.2.0.rc-1"
+src_path=$(realpath "$0")
+
+#CONSTANTS
aid=221100
game="dayz"
+app_name="dzgui"
+app_name_upper="DZGUI"
workshop="steam://url/CommunityFilePage/"
-api="https://api.battlemetrics.com/servers"
sd_res="--width=1280 --height=800"
-config_path="$HOME/.config/dztui/"
-config_file="${config_path}dztuirc"
-hist_file="${config_path}history"
-tmp=/tmp/dzgui.tmp
-fifo=/tmp/table.tmp
-debug_log="$PWD/DZGUI_DEBUG.log"
-separator="%%"
-check_config_msg="Check config values and restart."
-issues_url="https://github.com/aclist/dztui/issues"
-url_prefix="https://raw.githubusercontent.com/aclist/dztui"
-stable_url="$url_prefix/dzgui"
-testing_url="$url_prefix/testing"
-releases_url="https://github.com/aclist/dztui/releases/download/browser"
-help_url="https://aclist.github.io/dzgui/dzgui"
-sponsor_url="https://github.com/sponsors/aclist"
+steamsafe_zenity="/usr/bin/zenity"
+zenity_flags=("--width=500" "--title=DZGUI")
+declare -A deps
+deps=([awk]="5.1.1" [curl]="7.80.0" [jq]="1.6" [tr]="9.0" [$steamsafe_zenity]="3.42.1")
+
+#CONFIG
+config_path="$HOME/.config/dztui"
+config_file="$config_path/dztuirc"
+
+#PATHS
+state_path="$HOME/.local/state/$app_name"
+cache_path="$HOME/.cache/$app_name"
+share_path="$HOME/.local/share/$app_name"
+script_path="$share_path/dzgui.sh"
+helpers_path="$share_path/helpers"
+
+#LOGS
+log_path="$state_path/logs"
+debug_log="$log_path/DZGUI_DEBUG.log"
+
+#STATE FILES
+prefix="dzg"
+history_file="$state_path/$prefix.history"
+versions_file="$state_path/$prefix.versions"
+lock_file="$state_path/$prefix.lock"
+
+#CACHE FILES
+coords_file="$cache_path/$prefix.coords"
+
+#legacy paths
+hist_file="$config_path/history"
+version_file="$config_path/versions"
+
+#XDG
freedesktop_path="$HOME/.local/share/applications"
-sd_install_path="$HOME/.local/share/dzgui"
-helpers_path="$sd_install_path/helpers"
+
+#HELPERS
+ui_helper="$helpers_path/ui.py"
geo_file="$helpers_path/ips.csv"
km_helper="$helpers_path/latlon"
sums_path="$helpers_path/sums.md5"
-scmd_file="$helpers_path/scmd.sh"
+func_helper="$helpers_path/funcs"
+
+#URLS
+author="aclist"
+repo="dztui"
+url_prefix="https://raw.githubusercontent.com/$author/$repo"
+stable_url="$url_prefix/dzgui"
+testing_url="$url_prefix/testing"
+releases_url="https://github.com/$author/$repo/releases/download/browser"
km_helper_url="$releases_url/latlon"
-db_file="$releases_url/ips.csv.gz"
-sums_url="$testing_url/helpers/sums.md5"
-scmd_url="$testing_url/helpers/scmd.sh"
-vdf2json_url="$testing_url/helpers/vdf2json.py"
-forum_url="https://github.com/aclist/dztui/discussions"
-version_file="$config_path/versions"
-steamsafe_zenity="/usr/bin/zenity"
+geo_file_url="$releases_url/ips.csv.gz"
+#TODO: normalize
+vdf2json_url="$stable_url/helpers/vdf2json.py"
+#TODO: move adoc to index
+help_url="https://$author.github.io/dzgui/dzgui"
+sponsor_url="https://github.com/sponsors/$author"
-update_last_seen(){
- local news_sum="$1"
- seen_news="$news_sum"
- update_config
+logger(){
+ local date="$(date "+%F %T,%3N")"
+ local tag="$1"
+ local string="$2"
+ local self="${BASH_SOURCE[0]}"
+ local caller="${FUNCNAME[1]}"
+ local line="${BASH_LINENO[0]}"
+ printf "%s␞%s␞%s::%s()::%s␞%s\n" "$date" "$tag" "$self" "$caller" "$line" "$string" >> "$debug_log"
}
-check_news(){
- logger INFO "${FUNCNAME[0]}"
- [[ $branch == "stable" ]] && news_url="$stable_url/news"
- [[ $branch == "testing" ]] && news_url="$testing_url/news"
- local result=$(curl -Ls "$news_url")
- local sum=$(echo -n "$result" | md5sum | awk '{print $1}')
- printf "%s\n%s\n" "$result" "$sum"
- logger INFO "News: $result"
+setup_dirs(){
+ for dir in "$state_path" "$cache_path" "$share_path" "$helpers_path" "$freedesktop_path" "$config_path" "$log_path"; do
+ if [[ ! -d $dir ]]; then
+ mkdir -p "$dir"
+ fi
+ done
}
-print_news(){
- readarray -t news_result < <(check_news)
- local news_marquee=${news_result[0]}
- local news_sum=${news_result[1]}
- local hchar
- local news
- logger INFO "${FUNCNAME[0]}"
- if [[ $news_sum == $seen_news ]] || [[ -z $news_marquee ]]; then
- return 1
+setup_state_files(){
+ if [[ -f "$debug_log" ]]; then
+ rm "$debug_log" && touch $debug_log
+ logger INFO "Initializing DZGUI version $version"
+ fi
+ if [[ -f "$version_file" ]]; then
+ mv "$version_file" "$versions_file" &&
+ logger INFO "Migrating legacy version file"
+ fi
+ # wipe cache files
+ local path="$cache_path"
+ if find "$path" -mindepth 1 -maxdepth 1 | read; then
+ for file in $path/*; do
+ rm "$file"
+ done
+ logger INFO "Wiped cache files"
fi
- hchar="─"
- news="$news_marquee\n$(awk -v var="$hchar" 'BEGIN{for(c=0;c<90;c++) printf var;}')\n"
- update_last_seen "$news_sum"
- echo "$news"
}
+print_config_vals(){
+ local keys=(
+ "branch"
+ "seen_news"
+ "name"
+ "fav_server"
+ "fav_label"
+ "auto_install"
+ "steam_path"
+ "default_steam_path"
+ "preferred_client"
+ )
+ for i in "${keys[@]}"; do
+ logger INFO "Read key '$i': '${!i}'"
+ done
+ if [[ ${#ip_list[@]} -lt 1 ]]; then
+ logger WARN "No IPs in saved server list"
+ fi
-declare -A deps
-deps=([awk]="5.1.1" [curl]="7.80.0" [jq]="1.6" [tr]="9.0" [$steamsafe_zenity]="3.42.1" [fold]="9.0")
-changelog(){
- build(){
- local mdbranch
- case "$branch" in
- "stable")
- mdbranch="dzgui"
- ;;
- *)
- mdbranch="testing"
- ;;
- esac
- local md="https://raw.githubusercontent.com/aclist/dztui/${mdbranch}/CHANGELOG.md"
- prefix="This window can be scrolled."
- echo $prefix
- echo ""
- curl -Ls "$md"
- }
- build | $steamsafe_zenity --text-info $sd_res --title="DZGUI" 2>/dev/null
}
-
-depcheck(){
- for dep in "${!deps[@]}"; do
- command -v "$dep" 2>&1>/dev/null || (printf "Requires %s >=%s\n" "$dep" ${deps[$dep]}; exit 1)
- done
+test_gobject(){
+ python3 -c "import gi"
+ if [[ ! $? -eq 0 ]]; then
+ logger CRITICAL "Missing PyGObject"
+ fdialog "Requires PyGObject"
+ exit 1
+ fi
+ logger INFO "Found PyGObject in Python env"
}
-watcher_deps(){
- logger INFO "${FUNCNAME[0]}"
- if [[ ! $(command -v wmctrl) ]] && [[ ! $(command -v xdotool) ]]; then
- echo "100"
- warn "Missing dependency: requires 'wmctrl' or 'xdotool'.\nInstall from your system's package manager."
- logger ERROR "Missing watcher dependencies"
- exit 1
- fi
+update_config(){
+ # handling for legacy files
+ [[ -z $branch ]] && branch="stable"
+ [[ -f $config_file ]] && mv $config_file ${config_file}.old
+ write_config > $config_file && return 90 || return 1
+ logger INFO "Updated config file at '$config_file'"
}
-init_items(){
- #array order determines menu selector; this is destructive
- #change favorite index affects setup() and add_by_fav()
-items=(
- "[Connect]"
- " Server browser"
- " My servers"
- " Quick connect to favorite server"
- " Connect by ID"
- " Connect by IP"
- " Recent servers (last 10)"
- "[Manage servers]"
- " Add server by ID"
- " Add server by IP"
- " Add favorite server"
- " Delete server"
- "[Options]"
- " List installed mods"
- " View changelog"
- " Advanced options"
- "[Help]"
- " Help file ⧉"
- " Report bug ⧉"
- " Forum ⧉"
- " Sponsor ⧉"
- " Hall of fame ⧉"
- )
+setup_steam_client(){
+ local flatpak
+ local steam
+ local steam_cmd
+ [[ -n $preferred_client ]] && return 0
+ [[ $(command -v flatpak) ]] && flatpak=$(flatpak list | grep valvesoftware.Steam)
+ steam=$(command -v steam)
+ if [[ -z "$steam" ]] && [[ -z "$flatpak" ]]; then
+ raise_error_and_quit "Requires Steam or Flatpak Steam"
+ elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then
+ preferred_client="steam"
+ elif [[ -n "$steam" ]]; then
+ preferred_client="steam"
+ else
+ steam_cmd="flatpak run com.valvesoftware.Steam"
+ fi
+ update_config && logger INFO "Preferred client set to '$steam_cmd'" || return 1
}
-warn(){
- logger WARN "$1"
- $steamsafe_zenity --info --title="DZGUI" --text="$1" --width=500 --icon-name="dialog-warning" 2>/dev/null
-}
-info(){
- $steamsafe_zenity --info --title="DZGUI" --text="$1" --width=500 2>/dev/null
-}
-set_api_params(){
- logger INFO "${FUNCNAME[0]}"
- response=$(curl -s "$api" -H "Authorization: Bearer "$api_key"" -G -d "sort=-players" \
- -d "filter[game]=$game" -d "filter[ids][whitelist]=$list_of_ids")
- list_response=$response
- first_entry=1
+print_ip_list(){
+ [[ ${#ip_list[@]} -eq 0 ]] && return 1
+ printf "\t\"%s\"\n" "${ip_list[@]}"
}
write_config(){
-cat <<-END
+cat <<-END
#Path to DayZ installation
steam_path="$steam_path"
-#Your unique API key
+#Battlemetrics API key
api_key="$api_key"
#Favorited server IP:PORT array
ip_list=(
- $(print_ip_list)
+$(print_ip_list)
)
#Favorite server to fast-connect to (limit one)
@@ -192,1945 +206,604 @@ default_steam_path="$default_steam_path"
#Preferred Steam launch command (for Flatpak support)
preferred_client="$preferred_client"
- END
+
+#DZGUI source path
+src_path="$src_path"
+END
+}
+depcheck(){
+ for dep in "${!deps[@]}"; do
+ command -v "$dep" 2>&1>/dev/null
+ if [[ $? -eq 1 ]]; then
+ local msg="Requires $dep >= ${deps[$dep]}"
+ raise_error_and_quit "$msg"
+ fi
+ done
+ logger INFO "Initial dependencies satisfied"
+}
+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
+ 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
+ raise_error_and_quit "Missing dependency: requires 'wmctrl' or 'xdotool'"
+ exit 1
+ fi
+ logger INFO "Found DZG Watcher dependencies"
+}
+format_version_url(){
+ echo FORMAT
+ case "$branch" in
+ "stable")
+ version_url="$stable_url/dzgui.sh"
+ ;;
+ "testing")
+ version_url="$testing_url/dzgui.sh"
+ ;;
+ esac
+ echo "$version_url"
}
write_desktop_file(){
-cat <<-END
+cat <<-END
[Desktop Entry]
Version=1.0
Type=Application
Terminal=false
-Exec=$sd_install_path/dzgui.sh
-Name=DZGUI
-Comment=dzgui
-Icon=$sd_install_path/dzgui
+Exec=$share_path/dzgui.sh
+Name=$app_name_upper
+Comment=$appname
+Icon=$share_path/$appname
Categories=Game
- END
+END
}
freedesktop_dirs(){
- mkdir -p "$sd_install_path"
- mkdir -p "$freedesktop_path"
- curl -s "$version_url" > "$sd_install_path/dzgui.sh"
- chmod +x "$sd_install_path/dzgui.sh"
- img_url="$testing_url/images"
- for i in dzgui grid.png hero.png logo.png; do
- curl -s "$img_url/$i" > "$sd_install_path/$i"
- done
- write_desktop_file > "$freedesktop_path/dzgui.desktop"
- if [[ $is_steam_deck -eq 1 ]]; then
- write_desktop_file > "$HOME/Desktop/dzgui.desktop"
- fi
-}
-find_library_folder(){
- logger INFO "${FUNCNAME[0]}"
- logger INFO "User picked directory: '$1'"
- steam_path="$(python3 "$helpers_path/vdf2json.py" -i "$1/steamapps/libraryfolders.vdf" | jq -r '.libraryfolders[]|select(.apps|has("221100")).path')"
- logger INFO "Steam path resolved to: $steam_path"
-}
-file_picker(){
- logger INFO "${FUNCNAME[0]}"
- local path=$($steamsafe_zenity --file-selection --directory 2>/dev/null)
- logger INFO "File picker path resolve to: $path"
- if [[ -z "$path" ]]; then
- logger INFO "Path was empty"
- return
- else
- default_steam_path="$path"
- find_library_folder "$default_steam_path"
- fi
-}
-create_config(){
- logger INFO "${FUNCNAME[0]}"
- check_pyver
- write_to_config(){
- mkdir -p $config_path
- write_config > $config_file
- info "Config file created at $config_file."
- source $config_file
- }
- while true; do
- player_input="$($steamsafe_zenity --forms --add-entry="Player name (required for some servers)" --add-entry="Steam API key" --add-entry="BattleMetrics API key (optional)" --title="DZGUI" --text="DZGUI" $sd_res --separator="@" 2>/dev/null)"
- #explicitly setting IFS crashes $steamsafe_zenity in loop
- #and mapfile does not support high ascii delimiters
- #so split fields with newline
- readarray -t args < <(echo "$player_input" | sed 's/@/\n/g')
- name="${args[0]}"
- steam_api="${args[1]}"
- api_key="${args[2]}"
-
- [[ -z $player_input ]] && exit
- if [[ -z $steam_api ]]; then
- warn "Steam API key cannot be empty"
- continue
- elif [[ $(test_steam_api) -eq 1 ]]; then
- warn "Invalid Steam API key"
- continue
- fi
- if [[ -n $api_key ]] && [[ $(test_bm_api $api_key) -eq 1 ]]; then
- warn "Invalid BM API key"
- continue
- fi
- while true; do
- logger INFO "steamsafe_zenity is $steamsafe_zenity"
- if [[ -n $steam_path ]]; then
- write_to_config
- return
- fi
- find_default_path
- find_library_folder "$default_steam_path"
- if [[ -z $steam_path ]]; then
- logger WARN "Steam path was empty"
- zenity --question --text="DayZ not found or not installed at the chosen path." --ok-label="Choose path manually" --cancel-label="Exit"
- if [[ $? -eq 0 ]]; then
- logger INFO "User selected file picker"
- file_picker
- else
- exit
- fi
- else
- write_to_config
- return
- fi
- done
- done
-
-}
-err(){
- printf "[ERROR] %s\n" "$1"
-}
-varcheck(){
- if [[ ! -d $steam_path ]] || [[ ! -d $game_dir ]]; then
- echo 1
- fi
-}
-run_depcheck(){
- logger INFO "${FUNCNAME[0]}"
- if [[ -n $(depcheck) ]]; then
- echo "100"
- logger ERROR "Missing dependencies, quitting"
- $steamsafe_zenity --warning --ok-label="Exit" --title="DZGUI" --text="$(depcheck)"
- exit
- fi
-}
-logger(){
- local date="$(date "+%F %T")"
- local tag="$1"
- local string="$2"
- printf "[%s] [%s] %s\n" "$date" "$tag" "$string" >> "$debug_log"
-}
-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
- warn "Requires python >=3.10" &&
- exit
- fi
-}
-run_varcheck(){
- logger INFO "${FUNCNAME[0]}"
- source $config_file
- workshop_dir="$steam_path/steamapps/workshop/content/$aid"
- game_dir="$steam_path/steamapps/common/DayZ"
- if [[ $(varcheck) -eq 1 ]]; then
- $steamsafe_zenity --question --cancel-label="Exit" --text="Malformed config file. This is probably user error.\nStart first-time setup process again?" --width=500 2>/dev/null
- code=$?
- if [[ $code -eq 1 ]]; then
- logger ERROR "Malformed config vars"
- exit
- else
- create_config
- fi
- fi
-}
-config(){
- logger INFO "${FUNCNAME[0]}"
- if [[ ! -f $config_file ]]; then
- logger WARN "Config file missing"
- logger INFO "steamsafe_zenity is $steamsafe_zenity"
- $steamsafe_zenity --width=500 --info --text="Config file not found. Click OK to proceed to first-time setup." 2>/dev/null
- code=$?
- logger INFO "Return code $code"
- #TODO: prevent progress if user hits ESC
- if [[ $code -eq 1 ]]; then
- exit
- else
- create_config
- fi
- else
- source $config_file
- fi
-
-}
-steam_deck_mods(){
- until [[ -z $diff ]]; do
- next=$(echo -e "$diff" | head -n1)
- $steamsafe_zenity --question --ok-label="Open" --cancel-label="Cancel" --title="DZGUI" --text="Missing mods. Click [Open] to open mod $next in Steam Workshop and subscribe to it by clicking the green Subscribe button. After the mod is downloaded, return to this menu to continue validation." --width=500 2>/dev/null
- rc=$?
- if [[ $rc -eq 0 ]]; then
- echo "[DZGUI] Opening ${workshop}$next"
- $steam_cmd steam://url/CommunityFilePage/$next 2>/dev/null &
- $steamsafe_zenity --info --title="DZGUI" --ok-label="Next" --text="Click [Next] to continue mod check." --width=500 2>/dev/null
- else
- return 1
- fi
- compare
- done
-}
-test_display_mode(){
- pgrep -a gamescope | grep -q "generate-drm-mode"
- if [[ $? -eq 0 ]]; then
- echo gm
- else
- echo dm
- fi
-}
-foreground(){
- if [[ $(command -v wmctrl) ]]; then
- wmctrl -a "DZG Watcher"
- else
- local window_id=$(xdotool search --name "DZG Watcher")
- xdotool windowactivate $window_id
- fi
-}
-manual_mod_install(){
- local ip="$1"
- local gameport="$2"
-
- local ex="/tmp/dzc.tmp"
- [[ -f $ex ]] && rm $ex
- watcher(){
- readarray -t stage_mods <<< "$diff"
- for((i=0;i<${#stage_mods[@]};i++)); do
- [[ -f $ex ]] && return 1
- local downloads_dir="$steam_path/steamapps/workshop/downloads/$aid"
- local workshop_dir="$steam_path/steamapps/workshop/content/$aid"
- $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."
- 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
- echo "# Steam is downloading ${stage_mods[$i]} (mod $((i+1)) of ${#stage_mods[@]})"
- 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"
+ local version_url=$(format_version_url)
+ local img_url="$stable_url/images"
+ curl -s "$version_url" > "$script_path"
+ chmod +x "$script_path"
+ for i in dzgui grid.png hero.png logo.png; do
+ curl -s "$img_url/$i" > "$share_path/$i"
done
- echo "100"
- }
- watcher > >($steamsafe_zenity --pulsate --progress --auto-close --title="DZG Watcher" --width=500 2>/dev/null; rc=$?; [[ $rc -eq 1 ]] && touch $ex)
- compare
- if [[ -z $diff ]]; then
- passed_mod_check > >($steamsafe_zenity --pulsate --progress --auto-close --width=500 2>/dev/null)
- launch "$ip" "$gameport"
- else
- return 1
+ write_desktop_file > "$freedesktop_path/$appname.desktop"
+ [[ $is_steam_deck -eq 0 ]] && return
+ write_desktop_file > "$HOME/Desktop/$appname.desktop"
+}
+legacy_vars(){
+ local suffix="fav"
+ local hr_msg="Config file contains values based on old API. Please update and re-run setup."
+ local msg="Config file contains legacy API value: '$suffix'"
+ if [[ -n $fav ]]; then
+ logger WARN "$msg"
+ fdialog "$hr_msg"
+ exit 1
fi
-}
-encode(){
- echo "$1" | md5sum | cut -c -8
-}
-stale_symlinks(){
- logger INFO "${FUNCNAME[0]}"
- for l in $(find "$game_dir" -xtype l); do
- unlink $l
- done
-}
-legacy_symlinks(){
- for d in "$game_dir"/*; do
- if [[ $d =~ @[0-9]+-.+ ]]; then
- unlink "$d"
- fi
- done
- for d in "$workshop_dir"/*; do
- local id=$(awk -F"= " '/publishedid/ {print $2}' "$d"/meta.cpp | awk -F\; '{print $1}')
- local encoded_id=$(echo "$id" | awk '{printf("%c",$1)}' | base64 | sed 's/\//_/g; s/=//g; s/+/]/g')
- if [[ -h "$game_dir/@$encoded_id" ]]; then
- unlink "$game_dir/@$encoded_id"
- fi
- done
-}
-symlinks(){
- for d in "$workshop_dir"/*; do
- id=$(awk -F"= " '/publishedid/ {print $2}' "$d"/meta.cpp | awk -F\; '{print $1}')
- encoded_id=$(encode "$id")
- mod=$(awk -F\" '/name/ {print $2}' "$d"/meta.cpp | sed -E 's/[^[:alpha:]0-9]+/_/g; s/^_|_$//g')
- link="@$encoded_id"
- if [[ -h "$game_dir/$link" ]]; then
- :
- else
- printf "[DZGUI] Creating symlink for $mod\n"
- ln -fs "$d" "$game_dir/$link"
- fi
- done
-}
-passed_mod_check(){
- echo "[DZGUI] Passed mod check"
- echo "# Preparing symlinks"
- legacy_symlinks
- symlinks
- echo "100"
-
-}
-auto_mod_install(){
- local ip="$1"
- local gameport="$2"
- popup 300
- rc=$?
- if [[ $rc -eq 1 ]]; then
- manual_mod_install "$ip" "$gameport"
- return
+ if [[ -n $whitelist ]]; then
+ suffix="whitelist"
+ logger WARN "$msg"
+ fdialog "$hr_msg"
+ exit 1
fi
- log="$default_steam_path/logs/content_log.txt"
- [[ -f "/tmp/dz.status" ]] && rm "/tmp/dz.status"
- touch "/tmp/dz.status"
- console_dl "$diff" &&
- $steam_cmd steam://open/downloads && 2>/dev/null 1>&2
- foreground
- until [[ -z $(comm -23 <(printf "%s\n" "${modids[@]}" | sort) <(ls -1 $workshop_dir | sort)) ]]; do
- local missing=$(comm -23 <(printf "%s\n" "${modids[@]}" | sort) <(ls -1 $workshop_dir | sort) | wc -l)
- echo "# Downloaded $((${#modids[@]}-missing)) of ${#modids[@]} mods. ESC cancels"
- done | $steamsafe_zenity --pulsate --progress --title="DZG Watcher" --auto-close --no-cancel --width=500 2>/dev/null
- compare
- [[ $force_update -eq 1 ]] && { unset force_update; return; }
- if [[ -z $diff ]]; then
- check_timestamps
- passed_mod_check > >($steamsafe_zenity --pulsate --progress --title="DZGUI" --auto-close --width=500 2>/dev/null)
- launch "$ip" "$gameport"
- else
- manual_mod_install "$ip" "$gameport"
- fi
-}
-get_local_stamps(){
- concat(){
- for ((i=0;i<$max;i++)); do
- echo "publishedfileids[$i]=${local_modlist[$i]}&"
- done | awk '{print}' ORS=''
- }
- payload(){
- echo -e "itemcount=${max}&$(concat)"
- }
- post(){
- curl -s -X POST -H "Content-Type:application/x-www-form-urlencoded" \
- -d "$(payload)" 'https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1/?format=json'
- }
- post
-}
-update_stamps(){
- for((i=0;i<${#local_modlist[@]};i++)); do
- mod=${local_modlist[$i]}
- stamp=${stamps[$i]}
- printf "%s\t%s\n" "$mod" "$stamp" >> $version_file
- done
-}
-check_timestamps(){
- readarray -t local_modlist < <(ls -1 $workshop_dir)
- max=${#local_modlist[@]}
- [[ $max -eq 0 ]] && return
- readarray -t stamps < <(get_local_stamps | jq -r '.response.publishedfiledetails[].time_updated')
- if [[ ! -f $version_file ]]; then
- update_stamps
- return
- else
- needs_update=()
- for((i=0;i<${#local_modlist[@]};i++)); do
- mod=${local_modlist[$i]}
- stamp=${stamps[$i]}
- if [[ ! $(awk -v var=$mod '$1 == var' $version_file) ]]; then
- echo -e "$mod\t$stamp" >> $version_file
- elif [[ $(awk -v var=$mod -v var2=$stamp '$1 == var && $2 == var2' $version_file) ]]; then
- :
- else
- awk -v var=$mod -v var2=$stamp '$1 == var {$2=var2;print $1"\t"$2; next;};{print}' $version_file > $version_file.new
- mv $version_file.new $version_file
- needs_update+=($mod)
- fi
- done
- fi
-}
-merge_modlists(){
- echo "# Aligning modlists"
- [[ $force_update -eq 1 ]] && echo "# Checking mod versions"
- check_timestamps
- if [[ -z "$diff" ]] && [[ ${#needs_update[@]} -gt 0 ]]; then
- diff=$(printf "%s\n" "${needs_update[@]}")
- elif [[ -z "$diff" ]] && [[ ${#needs_update[@]} -eq 0 ]]; then
- diff=
- elif [[ -n "$diff" ]] && [[ ${#needs_update[@]} -eq 0 ]]; then
- :
- else
- diff="$(printf "%s\n%s\n" "$diff" "${needs_update[@]}")"
- fi
- [[ $force_update -eq 1 ]] && echo "100"
-}
-update_history(){
- local ip="$1"
- local gameport="$2"
- local qport="$3"
- [[ -n $(grep "$ip:$gameport:$qport" $hist_file) ]] && return
- if [[ -f $hist_file ]]; then
- old=$(tail -n9 "$hist_file")
- old="$old\n"
- fi
- echo -e "${old}${ip}:${gameport}:${qport}" > "$hist_file"
-}
-connect(){
- local ip=$1
- local gameport=$2
- local qport=$3
- logger INFO "Querying $ip:$gameport:$qport"
- connect_dialog(){
- echo "# Querying modlist"
- local remote
- remote=$(a2s "$ip" "$qport" rules)
- if [[ $? -eq 1 ]]; then
- echo "100"
- popup 1200
- return 1
- fi
- logger INFO "Server returned modlist: $(<<< $remote tr '\n' ' ')"
- echo "# Checking for defunct mods"
- query_defunct "$remote"
- }
- (connect_dialog "$ip" "$qport") | pdialog
- rc=$?
- [[ $rc -eq 1 ]] && return
- readarray -t newlist < /tmp/dz.modlist
- compare
- [[ $auto_install -eq 2 ]] && merge_modlists > >(pdialog)
- if [[ -n $diff ]]; then
- if [[ $is_steam_deck -eq 1 ]] && [[ $(test_display_mode) == "gm" ]]; then
- popup 1400
- return 1
- fi
- case $auto_install in
- 1|2) auto_mod_install "$ip" "$gameport" ;;
- *) manual_mod_install "$ip" "$gameport" ;;
- esac
- else
- passed_mod_check > >(pdialog)
- update_history "$ip" "$gameport" "$qport"
- launch "$ip" "$gameport" "$qport"
- fi
-}
-update_config(){
- mv $config_file ${config_file}.old
- write_config > $config_file
- source $config_file
-}
-prepare_ip_list(){
- local res="$1"
- local ct=$(<<< "$res" jq '[.response.servers[]]|length' 2>/dev/null)
- if [[ -n $ct ]]; then
- for((i=0;i<$ct;i++));do
- readarray -t json_arr < <(<<< $res jq --arg i $i -r '[.response.servers[]][($i|tonumber)]|"\(.name)\n\(.addr)\n\(.players)\n\(.max_players)\n\(.gameport)\n\(.gametype)"')
- local name=${json_arr[0]}
- local addr=${json_arr[1]}
- local ip=$(<<< $addr awk -F: '{print $1}')
- local qport=$(<<< $addr awk -F: '{print $2}')
- local current=${json_arr[2]}
- local max=${json_arr[3]}
- local players="${current}/${max}"
- local gameport="${json_arr[4]}"
- local gametime="${json_arr[5]}"
- gametime=$(<<< "$gametime" grep -o '[0-9][0-9]:[0-9][0-9]')
-
- echo "$name"
- echo "${ip}:${gameport}"
- echo "$players"
- echo "$gametime"
- echo "$qport"
- done
- fi
-}
-ip_table(){
- local sel
- local res="$1"
- while true; do
- sel=$(prepare_ip_list "$res" | $steamsafe_zenity --width 1200 --height 800 --text="Multiple maps found at this server. Select map from the list below" --title="DZGUI" --list --column=Name --column=IP --column=Players --column=Gametime --column=Qport --print-column=1,2,5 --separator=%% 2>/dev/null)
- [[ $? -eq 1 ]] && return 1
- echo "$sel"
- return 0
- done
-}
-fetch_ip_metadata(){
- local ip="$1"
- source $config_file
- local url="https://api.steampowered.com/IGameServersService/GetServerList/v1/?filter=\appid\221100\gameaddr\\$ip&key=$steam_api"
- curl -Ls "$url"
-}
-
-validate_local_ip(){
- <<< "$1" grep -qP '(^127.\d+.\d+.\d+:\d+$)|(^10\.\d+.\d+.\d+:\d+$)|(^172\.1[6-9]\.\d+.\d+:\d+$)|(^172\.2[0-9]\.\d+.\d+:\d+$)|(^172\.3[0-1]\.\d+.\d+:\d+$)|(^192\.168\.\d+.\d+:\d+$)'
-}
-test_steam_api(){
- local url="https://api.steampowered.com/IGameServersService/GetServerList/v1/?filter=\appid\221100&limit=10&key=$steam_api"
- local code=$(curl -ILs "$url" | grep -E "^HTTP")
- [[ $code =~ 403 ]] && echo 1
- [[ $code =~ 200 ]] && echo 0
-}
-test_bm_api(){
- local api_key="$1"
- [[ -z $api_key ]] && return 1
- local code=$(curl -ILs "$api" -H "Authorization: Bearer "$api_key"" -G \
- -d "filter[game]=$game" | grep -E "^HTTP")
- [[ $code =~ 401 ]] && echo 1
- [[ $code =~ 200 ]] && echo 0
-}
-add_steam_api(){
- [[ $(test_steam_api) -eq 1 ]] && return 1
- mv $config_file ${config_path}dztuirc.old
- nr=$(awk '/steam_api=/ {print NR}' ${config_path}dztuirc.old)
- steam_api="steam_api=\"$steam_api\""
- awk -v "var=$steam_api" -v "nr=$nr" 'NR==nr {$0=var}{print}' ${config_path}dztuirc.old > ${config_path}dztuirc
- echo "[DZGUI] Added Steam API key"
- $steamsafe_zenity --info --title="DZGUI" --text="Added Steam API key to:\n\n${config_path}dztuirc\nIf errors occur, you can restore the file:\n${config_path}dztuirc.old" --width=500 2>/dev/null
- source $config_file
-}
-check_steam_api(){
- if [[ -z $steam_api ]]; then
- steam_api=$($steamsafe_zenity --entry --text="Key 'steam_api' not present in config file. Enter Steam API key:" --title="DZGUI" 2>/dev/null)
- if [[ $? -eq 1 ]] ; then
- return
- elif [[ ${#steam_api} -lt 32 ]] || [[ $(test_steam_api) -eq 1 ]]; then
- $steamsafe_zenity --warning --title="DZGUI" --text="Check API key and try again." 2>/dev/null
- return 1
- else
- add_steam_api
- fi
- fi
-}
-validate_ip(){
- echo "$1" | grep -qP '^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$'
-}
-connect_by_id(){
- local ip
- ip=$(add_by_id "connect")
- [[ $? -eq 1 ]] && return
- readarray -t address < <(format_config_address "$ip")
- local ip="${address[0]}"
- local gameport="${address[1]}"
- local qport="${address[2]}"
- unset address
-
- connect "$ip" "$gameport" "$qport"
-}
-connect_by_ip(){
- local sel
- sel=$(parse_ips)
- [[ -z $sel ]] && return
-
- readarray -t address < <(format_table_results "$sel")
- local ip="${address[1]}"
- local gameport="${address[2]}"
- local qport="${address[3]}"
-
- connect "$ip" "$gameport" "$qport"
-}
-parse_ips(){
- local res
- source $config_file
- check_steam_api
- [[ $? -eq 1 ]] && return
- while true; do
- local ip
- ip=$(edialog "Enter server IP (for LAN servers, include query port in IP:PORT format)")
- [[ $? -eq 1 ]] && return 1
- if [[ $ip =~ ':' ]]; then
- if ! validate_local_ip "$ip"; then
- warn "Invalid local IP. Check IP:PORT combination and try again."
- continue
- fi
- local lan_ip=$(<<< $ip awk -F: '{print $1}')
- local lan_qport=$(<<< $ip awk -F: '{print $2}')
- logger INFO "Given LAN IP was $lan_ip"
- logger INFO "Given LAN port was $lan_qport"
- res=$(a2s $lan_ip $lan_qport info)
- if [[ ! $? -eq 0 ]] || [[ $(<<< $res jq 'length') -eq 0 ]]; then
- warn "Failed to retrieve server metadata. Check IP:PORT combination and try again."
- return 1
- fi
- logger INFO "$res"
- local name=$(<<< $res jq -r '.name')
- local address=$(<<< $res jq -r '.address')
- local ip=$(<<< $address awk -F: '{print $1}')
- local gameport=$(<<< $address awk -F: '{print $2}')
- local qport=$(<<< $res jq -r '.qport')
- logger INFO "Found '${name}' at ${ip}:${gameport}:${qport}"
- echo "${name}%%${ip}:${gameport}%%${qport}"
- return 0
- else
- if validate_ip "$ip"; then
- res=$(fetch_ip_metadata "$ip")
- if [[ ! $? -eq 0 ]] || [[ $(<<< $res jq '.response|length') -eq 0 ]]; then
- warn "Failed to retrieve server metadata. Check IP or API key and try again."
- return 1
- fi
- local ct=$(<<< "$res" jq '.response.servers|length')
- if [[ $ct -eq 1 ]]; then
- local name=$(<<< $res jq -r '.response.servers[].name')
- local address=$(<<< $res jq -r '.response.servers[].addr')
- local ip=$(<<< "$address" awk -F: '{print $1}')
- local qport=$(<<< "$address" awk -F: '{print $2}')
- local gameport=$(<<< $res jq -r '.response.servers[].gameport')
- echo "${name}%%${ip}:${gameport}%%${qport}"
- return 0
- fi
- ip_table "$res"
- return 0
- else
- warn "Invalid IP"
- fi
- fi
- done
-}
-query_defunct(){
- readarray -t modlist <<< "$@"
- local max=${#modlist[@]}
- concat(){
- for ((i=0;i<$max;i++)); do
- echo "publishedfileids[$i]=${modlist[$i]}&"
- done | awk '{print}' ORS=''
- }
- payload(){
- echo -e "itemcount=${max}&$(concat)"
- }
- post(){
- curl -s \
- -X POST \
- -H "Content-Type:application/x-www-form-urlencoded"\
- -d "$(payload)" 'https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1/?format=json'
- }
- local result=$(post | jq -r '.[].publishedfiledetails[] | select(.result==1) | "\(.file_size) \(.publishedfileid)"')
- <<< "$result" awk '{print $2}' > /tmp/dz.modlist
-}
-server_modlist(){
- for i in "${newlist[@]}"; do
- printf "$i\n"
- done
-}
-compare(){
- diff=$(comm -23 <(server_modlist | sort -u) <(installed_mods | sort))
-}
-
-installed_mods(){
- ls -1 "$workshop_dir"
-}
-concat_mods(){
- readarray -t serv <<< "$(server_modlist)"
- for i in "${serv[@]}"; do
- id=$(awk -F"= " '/publishedid/ {print $2}' "$workshop_dir"/$i/meta.cpp | awk -F\; '{print $1}')
- encoded_id=$(encode $id)
- link="@$encoded_id;"
- echo -e "$link"
- done | tr -d '\n' | perl -ple 'chop'
-}
-launch(){
- local ip="$1"
- local gameport="$2"
- local qport="$3"
- source $config_file
- mods=$(concat_mods)
- if [[ ! ${ip_list[@]} =~ "$ip:$gameport:$qport" ]]; then
- qdialog "Before connecting, add this server to My Servers?"
- if [[ $? -eq 0 ]]; then
- ip_list+=("$ip:$gameport:$qport")
- update_config
- fi
- fi
- if [[ $debug -eq 1 ]]; then
- launch_options="$steam_cmd -applaunch $aid -connect=$ip:$gameport -nolauncher -nosplash -name=$name -skipintro \"-mod=$mods\""
- print_launch_options="$(printf "This is a dry run.\nThese options would have been used to launch the game:\n\n$launch_options\n" | fold -w 60)"
- $steamsafe_zenity --question --title="DZGUI" --ok-label="Write to file" --cancel-label="Back"\
- --text="$print_launch_options" 2>/dev/null
- if [[ $? -eq 0 ]]; then
- source_script=$(realpath "$0")
- source_dir=$(dirname "$source_script")
- echo "$launch_options" > "$source_dir"/options.log
- echo "[DZGUI] Wrote launch options to $source_dir/options.log"
- $steamsafe_zenity --info --width=500 --title="DZGUI" --text="Wrote launch options to \n$source_dir/options.log" 2>/dev/null
- fi
- else
- $steamsafe_zenity --width=500 --title="DZGUI" --info --text="Launch conditions satisfied.\nDayZ will now launch after clicking [OK]." 2>/dev/null
- $steam_cmd -applaunch $aid -connect=$ip:$gameport -nolauncher -nosplash -skipintro -name=$name \"-mod=$mods\"
- fi
-}
-browser(){
- if [[ $is_steam_deck -eq 1 ]]; then
- steam steam://openurl/"$1" 2>/dev/null
- elif [[ $is_steam_deck -eq 0 ]]; then
- if [[ -n "$BROWSER" ]]; then
- "$BROWSER" "$1" 2>/dev/null
- else
- xdg-open "$1" 2>/dev/null
- fi
- fi
-}
-report_bug(){
- browser "$issues_url"
-}
-forum(){
- browser "$forum_url"
-}
-help_file(){
- browser "$help_url"
-}
-sponsor(){
- browser "$sponsor_url"
-}
-hof(){
- browser "${help_url}#_hall_of_fame"
-}
-set_mode(){
- logger INFO "${FUNCNAME[0]}"
- if [[ $debug -eq 1 ]]; then
- mode=debug
- else
- mode=normal
- fi
- logger INFO "Mode is $mode"
-}
-delete_by_ip(){
- local to_delete="$1"
- for (( i=0; i<${#ip_list[@]}; ++i )); do
- if [[ ${ip_list[$i]} == "$to_delete" ]]; then
- unset ip_list[$i]
- fi
- done
- if [[ ${#ip_list} -gt 0 ]]; then
- readarray -t ip_list < <(printf "%s\n" "${ip_list[@]}")
- fi
- update_config
- info "Removed $to_delete from:\n${config_path}dztuirc\nIf errors occur, you can restore the file:\n${config_path}dztuirc.old"
-}
-format_table_results(){
- local sel="$1"
- local name=$(<<< "$sel" awk -F"%%" '{print $1}')
- local address=$(<<< "$sel" awk -F"%%" '{print $2}')
- local ip=$(<<< "$address" awk -F":" '{print $1}')
- local gameport=$(<<< "$address" awk -F":" '{print $2}')
- local qport=$(<<< "$sel" awk -F"%%" '{print $3}')
- printf "%s\n%s\n%s\n%s\n" "$name" "$ip" "$gameport" "$qport"
-}
-delete_or_connect(){
- local sel="$1"
- local mode="$2"
-
- readarray -t address < <(format_table_results "$sel")
- local server_name="${address[0]}"
- local ip="${address[1]}"
- local gameport="${address[2]}"
- local qport="${address[3]}"
- unset address
-
- case "$mode" in
- "delete")
- qdialog "Delete this server?\n$server_name"
- [[ $? -eq 1 ]] && return
-
- delete_by_ip "$ip:$gameport:$qport"
- source $config_file
-
- local str="^$ip:$gameport$"
- local nr=$(awk -v v="$str" '$1 ~ v {print NR}' $tmp)
- local st=$((nr-1))
- local en=$((st+5))
- sed -i "${st},${en}d" $tmp
- # if [[ ${#ip_list[@]} -eq 0 ]]; then
- # return 1
- # fi
- ;;
- "connect"|"history")
- connect "$ip" "$gameport" "$qport"
- return
- esac
-}
-populate(){
- local switch="$1"
- while true; do
- cols="--column="Server" --column="IP" --column="Players" --column="Gametime" --column="Distance" --column="Qport""
- set_header "$switch"
- rc=$?
- if [[ $rc -eq 0 ]]; then
- if [[ -z $sel ]]; then
- warn "No item was selected."
- else
- delete_or_connect "$sel" "$switch"
- fi
- else
- return 1
- fi
- done
-}
-list_mods(){
- if [[ -z $(installed_mods) ]] || [[ -z $(find $workshop_dir -maxdepth 2 -name "*.cpp" | grep .cpp) ]]; then
- $steamsafe_zenity --info --text="94: No mods currently installed or incorrect path given" $sd_res 2>/dev/null
- else
- for d in $(find $game_dir/* -maxdepth 1 -type l); do
- dir=$(basename $d)
- awk -v d=$dir -F\" '/name/ {printf "%s\t%s\t", $2,d}' "$gamedir"/$d/meta.cpp
- printf "%s\n" "$(basename $(readlink -f $game_dir/$dir))"
- done | sort -k1
- fi
-}
-connect_to_fav(){
- logger INFO "${FUNCNAME[0]}"
-
- local fav="$1"
- [[ -z $fav ]] && { popup 1300; return; }
-
- readarray -t address < <(format_config_address "$fav")
- local ip="${address[0]}"
- local gameport="${address[1]}"
- local qport="${address[2]}"
-
- unset address
- connect "$ip" "$gameport" "$qport"
- [[ $? -eq 1 ]] && return 1
-}
-set_header(){
- local switch="$1"
- logger INFO "${FUNCNAME[0]}"
- logger INFO "Header mode is $1"
- local news
- news=$(print_news)
- [[ $auto_install -eq 2 ]] && install_mode="auto"
- [[ $auto_install -eq 1 ]] && install_mode="headless"
- [[ $auto_install -eq 0 ]] && install_mode=manual
- case "$switch" in
- "delete")
- [[ -z $(< $tmp) ]] && return 1
- sel=$(< $tmp $steamsafe_zenity $sd_res --list $cols --title="DZGUI" \
- --text="DZGUI $version | Mode: $mode | Branch: $branch | Mods: $install_mode | Fav: $fav_label" \
- --separator="$separator" --print-column=1,2,6 --ok-label="Delete" 2>/dev/null)
- ;;
-
- "connect"|"history")
- sel=$(< $tmp $steamsafe_zenity $sd_res --list $cols --title="DZGUI" \
- --text="DZGUI $version | Mode: $mode | Branch: $branch | Mods: $install_mode | Fav: $fav_label" \
- --separator="$separator" --print-column=1,2,6 --ok-label="Connect" 2>/dev/null)
- ;;
-
- "main_menu")
- sel=$($steamsafe_zenity $sd_res --list --title="DZGUI" \
- --text="${news}DZGUI $version | Mode: $mode | Branch: $branch | Mods: $install_mode | Fav: $fav_label" \
- --cancel-label="Exit" --ok-label="Select" --column="Select launch option" --hide-header "${items[@]}" 2>/dev/null)
- ;;
- esac
-}
-toggle_branch(){
- mv $config_file ${config_path}dztuirc.old
- nr=$(awk '/branch=/ {print NR}' ${config_path}dztuirc.old)
- if [[ $branch == "stable" ]]; then
- branch="testing"
- else
- branch="stable"
- fi
- flip_branch="branch=\"$branch\""
- awk -v "var=$flip_branch" -v "nr=$nr" 'NR==nr {$0=var}{print}' ${config_path}dztuirc.old > $config_file
- source $config_file
-}
-generate_log(){
- cat <<-DOC
- Distro: $(< /etc/os-release grep -w NAME | awk -F\" '{print $2}')
- Kernel: $(uname -mrs)
- Version: $version
- Branch: $branch
- Mode: $mode
- Auto: $auto_hr
- Servers:
- $(print_ip_list)
- Steam path: $steam_path
- Workshop path: $workshop_dir
- Game path: $game_dir
-
- Mods:
- $(list_mods)
- DOC
-}
-focus_beta_client(){
- steam steam://open/library 2>/dev/null 1>&2 &&
- steam steam://open/console 2>/dev/null 1>&2 &&
- sleep 1s
- wid(){
- wmctrl -ilx |\
- awk 'tolower($3) == "steamwebhelper.steam"' |\
- awk '$5 ~ /^Steam|Steam Games List/' |\
- awk '{print $1}'
- }
- until [[ -n $(wid) ]]; do
- :
- done
- wmctrl -ia $(wid)
- sleep 0.1s
- wid=$(xdotool getactivewindow)
- local geo=$(xdotool getwindowgeometry $wid)
- local pos=$(<<< "$geo" awk 'NR==2 {print $2}' | sed 's/,/ /')
- local dim=$(<<< "$geo" awk 'NR==3 {print $2}' | sed 's/x/ /')
- local pos1=$(<<< "$pos" awk '{print $1}')
- local pos2=$(<<< "$pos" awk '{print $2}')
- local dim1=$(<<< "$dim" awk '{print $1}')
- local dim2=$(<<< "$dim" awk '{print $2}')
- local dim1=$(((dim1/2)+pos1))
- local dim2=$(((dim2/2)+pos2))
- xdotool mousemove $dim1 $dim2
- xdotool click 1
- sleep 0.5s
- xdotool key Tab
-}
-console_dl(){
- readarray -t modids <<< "$@"
- focus_beta_client
- sleep 1.5s
- for i in "${modids[@]}"; do
- xdotool type --delay 0 "workshop_download_item $aid $i"
- sleep 0.5s
- xdotool key Return
- sleep 0.5s
- done
-}
-find_default_path(){
- logger INFO "${FUNCNAME[0]}"
- discover(){
- echo "# Searching for Steam"
- default_steam_path=$(find / -type d \( -path "/proc" -o -path "*/timeshift" -o -path \
- "/tmp" -o -path "/usr" -o -path "/boot" -o -path "/proc" -o -path "/root" \
- -o -path "/sys" -o -path "/etc" -o -path "/var" -o -path "/lost+found" \) -prune \
- -o -regex ".*/Steam/ubuntu12_32$" -print -quit 2>/dev/null | sed 's@/ubuntu12_32@@')
- }
- if [[ $is_steam_deck -eq 1 ]]; then
- default_steam_path="$HOME/.local/share/Steam"
- else
- local def_path
- local ub_path
- local flat_path
- def_path="$HOME/.local/share/Steam"
- ub_path="$HOME/.steam/steam"
- flat_path="$HOME/.var/app/com.valvesoftware.Steam/data/Steam"
-
- if [[ -d "$def_path" ]]; then
- default_steam_path="$def_path"
- elif [[ -d "$ub_path" ]]; then
- default_steam_path="$ub_path"
- elif [[ -d $flat_path ]]; then
- default_steam_path="$flat_path"
- else
- local res=$(echo -e "Let DZGUI auto-discover Steam path (accurate, slower)\nSelect the Steam path manually (less accurate, faster)" | $steamsafe_zenity --list --column="Choice" --title="DZGUI" --hide-header --text="Steam is not installed in a standard location." $sd_res)
- case "$res" in
- *auto*) discover ;;
- *manual*)
- zenity --info --text="\nSelect the top-level entry point to the location where Steam (not DayZ)\nis installed and before entering the \"steamapps\" path.\n\nE.g., if Steam is installed at:\n\"/media/mydrive/Steam\"\n\nCorrect:\n- \"/media/mydrive/Steam\"\n\nIncorrect:\n- \"/media/mydrive/Steam/steamapps/common/DayZ\"\n- \"/media/mydrive/\"" --width=500 &&
- file_picker ;;
- esac
- fi
- fi
-}
-fold_message(){
- echo "$1" | fold -s -w40
-}
-popup(){
- pop(){
- $steamsafe_zenity --info --text="$1" --title="DZGUI" --width=500 2>/dev/null
- }
- case "$1" in
- 100) pop "This feature requires xdotool and wmctrl.";;
- 200) pop "This feature is not supported on Gaming Mode.";;
- 300) pop "$(fold_message 'The Steam console will now open and briefly issue commands to download the workshop files, then return to the download progress page. Ensure that the Steam console has keyboard and mouse focus (keep hands off keyboard) while the commands are being issued. Depending on the number if mods, it may take some time to queue the downloads. If a popup or notification window steals focus, it could obstruct the process.')" ;;
- 400) pop "$(fold_message 'Automod install enabled. Auto-downloaded mods will not appear in your Steam Workshop subscriptions, but DZGUI will track the version number of downloaded mods internally and trigger an update if necessary.')" ;;
- 500) pop "$(fold_message 'Automod install disabled. Switched to manual mode.')" ;;
- 600) pop "No preferred servers set." ;;
- 700) pop "Toggled to Flatpak Steam." ;;
- 800) pop "Toggled to native Steam." ;;
- 900) pop "This feature is not supported on Steam Deck." ;;
- 1000) pop "No recent history." ;;
- 1100) pop "No results found." ;;
- 1200) pop "Timed out. Server may be temporarily offline or not responding to queries." ;;
- 1300) pop "No favorite server configured." ;;
- 1400) pop "To install missing mods, run DZGUI via Desktop Mode on Steam Deck, preferably via the desktop shortcut." ;;
- esac
-}
-toggle_console_dl(){
- [[ $is_steam_deck -eq 1 ]] && { popup 900; return; }
- [[ ! $(command -v xdotool) ]] && { popup 100; return; }
- [[ ! $(command -v wmctrl) ]] && { popup 100; return; }
- mv $config_file ${config_path}dztuirc.old
- local nr=$(awk '/auto_install=/ {print NR}' ${config_path}dztuirc.old)
- if [[ $auto_install == "2" ]]; then
- auto_install="0"
- popup 500
- else
- auto_install="2"
- popup 400
- fi
- local flip_state="auto_install=\"$auto_install\""
- awk -v "var=$flip_state" -v "nr=$nr" 'NR==nr {$0=var}{print}' ${config_path}dztuirc.old > $config_file
- source $config_file
-}
-force_update_mods(){
- if [[ -f $version_file ]]; then
- awk '{OFS="\t"}{$2="000"}1' $version_file > /tmp/versions
- mv /tmp/versions $version_file
- fi
-}
-toggle_steam_binary(){
- case "$steam_cmd" in
- steam)
- steam_cmd="flatpak run com.valvesoftware.Steam"
- update_steam_cmd
- popup 700
- ;;
- flatpak*)
- steam_cmd="steam"
- update_steam_cmd
- popup 800;;
- esac
-}
-options_menu(){
- init_options_list(){
- source $config_file
- set_mode
- case "$auto_install" in
- 0|1|"") auto_hr="OFF"; ;;
- 2) auto_hr="ON"; ;;
- esac
- [[ -z $name ]] && name="null"
- debug_list=(
- "Toggle branch [current: $branch]"
- "Toggle debug mode [current: $mode]"
- "Toggle auto mod install [current: $auto_hr]"
- "Change player name [current: $name]"
- "Output system info"
- )
- #TODO: tech debt: drop old flags
- [[ $auto_install -eq 2 ]] || [[ $auto_install -eq 1 ]] && debug_list+=("Force update local mods")
- case "$steam_cmd" in
- steam) steam_hr=Steam ;;
- flatpak*) steam_hr=Flatpak ;;
- esac
- [[ $toggle_steam -eq 1 ]] && debug_list+=("Toggle native Steam or Flatpak [$steam_hr]")
- }
- while true; do
- init_options_list
- debug_sel=$($steamsafe_zenity --list --width=1280 --height=800 --column="Options" --title="DZGUI" --hide-header "${debug_list[@]}" 2>/dev/null)
- [[ -z $debug_sel ]] && return
- case "$debug_sel" in
- Toggle[[:space:]]branch*)
- enforce_dl=1
- toggle_branch &&
- check_version
- ;;
- Toggle[[:space:]]debug*) toggle_debug ;;
- "Output system info")
- source_script=$(realpath "$0")
- source_dir=$(dirname "$source_script")
- output(){
- echo "# Generating log"
- generate_log > "$source_dir/DZGUI.log"
- }
- (output) | pdialog
- [[ $? -eq 1 ]] && return
- info_dialog "Wrote log file to: $source_dir/DZGUI.log"
- ;;
- Toggle[[:space:]]auto*) toggle_console_dl ;;
- "Force update local mods")
- force_update=1
- force_update_mods
- (merge_modlists) | pdialog
- auto_mod_install
- ;;
- Toggle[[:space:]]native*) toggle_steam_binary ;;
- Change[[:space:]]player[[:space:]]name*) change_name
- ;;
- esac
- done
-}
-info_dialog(){
- local title="DZGUI"
- $steamsafe_zenity --info --width=500 --title="$title" --text="$1" 2>/dev/null
-}
-a2s(){
- local ip="$1"
- local qport="$2"
- local mode="$3"
- logger A2S "Querying '$ip:$qport' with mode '$mode'"
- python3 $helpers_path/query.py "$ip" "$qport" "$mode"
-}
-format_config_address(){
- local address="$1"
- parse(){
- local ind="$1"
- <<< $address awk -F: "{print \$$ind}"
- }
- local ip=$(parse 1)
- local gameport=$(parse 2)
- local qport=$(parse 3)
- printf "%s\n%s\n%s" "$ip" "$gameport" "$qport"
-}
-query_and_connect(){
- source $config_file
- local switch="$1"
- local ips="$2"
- case "$switch" in
- "history")
- if [[ -z $2 ]]; then
- warn "No recent servers in history"
- return 1
- fi
- readarray -t ip_arr <<< "$ips"
- ;;
- "connect"|"delete")
- if [[ ${#ip_list[@]} -eq 0 ]]; then
- warn "No servers currently saved"
- return 1
- fi
- ips="$(printf "%s\n" "${ip_list[@]}")"
- readarray -t ip_arr <<< "$ips"
- ;;
- esac
- [[ ${#ip_arr[@]} -lt 1 ]] && { popup 600; return; }
- > $tmp
- q(){
- for (( i = 0; i < ${#ip_arr[@]}; ++i )); do
-
- local address="${ip_arr[$i]}"
- readarray -t address < <(format_config_address "$address")
- local ip="${address[0]}"
- local gameport="${address[1]}"
- local qport="${address[2]}"
- unset address
-
- local info
- echo "# Querying $ip:$qport"
- info=$(a2s "$ip" "$qport" info)
- [[ $? -eq 1 ]] && continue
- local keywords=$(<<< $info jq -r '.keywords')
- local vars=("name" "address" "count" "time" "dist" "qport")
- for j in ${vars[@]}; do
- local -n var=$j
- case "$j" in
- "time")
- var=$(<<< "$keywords" grep -o '[0-9][0-9]:[0-9][0-9]')
- ;;
- "name")
- var=$(<<< "$info" jq -r --arg arg $j '.[$arg]')
- if [[ "${#var}" -gt 50 ]]; then
- var="$(<<< "$var" awk '{print substr($0,1,50) "..."}')"
- fi
- ;;
- "dist")
- check_geo_file
- local_latlon
- var=$(get_dist $(<<< $address awk -F: '{print $1}'))
- ;;
- *)
- var=$(<<< "$info" jq -r --arg arg $j '.[$arg]')
- ;;
- esac
- printf "%s\n" "$var" >> $tmp
- done
- unset $j
- done
- }
-
- (q) | pdialog
- [[ $? -eq 1 ]] && return
- populate "$switch"
-}
-exclude_fpp(){
- response=$(<<< "$response" jq '[.[]|select(.gametype|split(",")|any(. == "no3rd")|not)]')
-}
-exclude_tpp(){
- response=$(<<< "$response" jq '[.[]|select(.gametype|split(",")|any(. == "no3rd"))]')
-}
-exclude_full(){
- response=$(echo "$response" | jq '[.[]|select(.players!=.max_players)]')
-}
-exclude_empty(){
- response=$(echo "$response" | jq '[.[]|select(.players!=0)]')
-}
-filter_maps(){
- echo "# Filtering maps"
- [[ $ret -eq 98 ]] && return
- local maps=$(echo "$response" | jq -r '.[].map//empty|ascii_downcase' | sort -u)
- local map_ct=$(echo "$maps" | wc -l)
- local map_sel=$(echo "$maps" | $steamsafe_zenity --list --column="Check" --width=1200 --height=800 2>/dev/null --title="DZGUI" --text="Found $map_ct map types")
- echo "[DZGUI] Selected '$map_sel'"
- if [[ -z $map_sel ]]; then
- ret=97
- return
- fi
- echo "100"
- response=$(echo "$response" | jq --arg map "$map_sel" '[.[]|select(.map)//empty|select(.map|ascii_downcase == $map)]')
-}
-exclude_daytime(){
- response=$(echo "$response" | jq '[.[]|select(.gametype|test(",[0][6-9]:|,[1][0-6]:")|not)]')
-}
-exclude_nighttime(){
- response=$(echo "$response" | jq '[.[]|select(.gametype|test(",[1][7-9]:|,[2][0-4]:|[0][0-5]:")|not)]')
-}
-keyword_filter(){
- response=$(echo "$response" | jq --arg search "$search" '[.[]|select(.name|ascii_downcase | contains($search))]')
-}
-exclude_lowpop(){
- response=$(echo "$response" | jq '[.[]|select(.players > 9)]')
-}
-exclude_nonascii(){
- response=$(echo "$response" | jq -r '[.[]|select(.name|test("^([[:ascii:]])*$"))]')
-}
-strip_null(){
- response=$(echo "$response" | jq -r '[.[]|select(.map//empty)]')
-}
-local_latlon(){
- if [[ -z $(command -v dig) ]]; then
- local local_ip=$(curl -Ls "https://ipecho.net/plain")
- else
- local local_ip=$(dig -4 +short myip.opendns.com @resolver1.opendns.com)
- fi
- local url="http://ip-api.com/json/$local_ip"
- local res=$(curl -Ls "$url" | jq -r '"\(.lat),\(.lon)"')
- local_lat=$(echo "$res" | awk -F, '{print $1}')
- local_lon=$(echo "$res" | awk -F, '{print $2}')
-}
-disabled(){
- if [[ -z ${disabled[@]} ]]; then
- printf "%s" "-"
- else
- for((i=0;i<${#disabled[@]};i++)); do
- if [[ $i < $((${#disabled[@]}-1)) ]]; then
- printf "%s, " "${disabled[$i]}"
- else
- printf "%s" "${disabled[$i]}"
- fi
-
- done
- fi
-}
-pagination(){
- if [[ ${#qport[@]} -eq 1 ]]; then
- entry=server
- else
- entry=servers
- fi
- printf "DZGUI %s | " "$version"
- printf "Mode: %s |" "$mode"
- printf "Fav: %s " "$fav_label"
- printf "\nIncluded: %s | " "$filters"
- printf "Excluded: %s " "$(disabled)"
- if [[ -n $search ]]; then
- printf "| Keyword: %s " "$search"
- fi
- printf "\nReturned: %s %s of %s | " "${#qport[@]}" "$entry" "$total_servers"
- printf "Players in-game: %s" "$players_online"
-}
-check_geo_file(){
- local gzip="$helpers_path/ips.csv.gz"
- curl -Ls "$sums_url" > "$sums_path"
- cd "$helpers_path"
- md5sum -c "$sums_path" 2>/dev/null 1>&2
- local res=$?
- cd $OLDPWD
- [[ $res -eq 0 ]] && return
- update(){
- mkdir -p "$helpers_path"
- echo "# Fetching new geolocation DB"
- curl -Ls "$db_file" > "$gzip"
- echo "# Extracting coordinates"
- #force overwrite
- gunzip -f "$gzip"
- echo "# Preparing helper file"
- curl -Ls "$km_helper_url" > "$km_helper"
- chmod +x $km_helper
- echo "100"
- }
- update > >(pdialog)
-}
-choose_filters(){
- if [[ $is_steam_deck -eq 0 ]]; then
- sd_res="--width=1920 --height=1080"
- fi
- sels=$($steamsafe_zenity --title="DZGUI" --text="Server search" --list --checklist --column "Check" --column "Option" --hide-header TRUE "All maps (untick to select from map list)" TRUE "Daytime" TRUE "Nighttime" TRUE "1PP" TRUE "3PP" False "Empty" False "Full" TRUE "Low population" FALSE "Non-ASCII titles" FALSE "Keyword search" $sd_res 2>/dev/null)
- if [[ $sels =~ Keyword ]]; then
- local search
- while true; do
- search=$(edialog "Search (case insensitive)" | awk '{print tolower($0)}')
- [[ $? -eq 1 ]] && return 1
- [[ -z $search ]] && warn "Cannot submit an empty keyword"
- [[ -n $search ]] && break
- done
- fi
- [[ -z $sels ]] && return
- echo "$sels" | sed 's/|/, /g;s/ (untick to select from map list)//'
- echo "$search"
-}
-get_dist(){
- local given_ip="$1"
- local network="$(<<< "$given_ip" awk -F. '{OFS="."}{print $1"."$2}')"
- local binary=$(grep -E "^$network\." $geo_file)
- local three=$(<<< $given_ip awk -F. '{print $3}')
- local host=$(<<< $given_ip awk -F. '{print $4}')
- local res=$(<<< "$binary" awk -F[.,] -v three=$three -v host=$host '$3 <=three && $7 >= three{if($3>three || ($3==three && $4 > host) || $7 < three || ($7==three && $8 < host)){next}{print}}' | awk -F, '{print $7,$8}')
- local remote_lat=$(<<< "$res" awk '{print $1}')
- local remote_lon=$(<<< "$res" awk '{print $2}')
- if [[ -z $remote_lat ]]; then
- local dist="Unknown"
- echo "$dist"
- else
- local dist=$($km_helper "$local_lat" "$local_lon" "$remote_lat" "$remote_lon")
- LC_NUMERIC=C printf "%05.0f %s" "$dist" "km"
- fi
-}
-prepare_filters(){
- local sels="$1"
- local search="$2"
- [[ ! "$sels" =~ "Full" ]] && { exclude_full; disabled+=("Full") ; }
- [[ ! "$sels" =~ "Empty" ]] && { exclude_empty; disabled+=("Empty") ; }
- [[ ! "$sels" =~ "Daytime" ]] && { exclude_daytime; disabled+=("Daytime") ; }
- [[ ! "$sels" =~ "Nighttime" ]] && { exclude_nighttime; disabled+=("Nighttime") ; }
- [[ ! "$sels" =~ "Low population" ]] && { exclude_lowpop; disabled+=("Low-pop") ; }
- [[ ! "$sels" =~ "Non-ASCII titles" ]] && { exclude_nonascii; disabled+=("Non-ASCII") ; }
- [[ ! "$sels" =~ "1PP" ]] && { exclude_fpp; disabled+=("FPP") ; }
- [[ ! "$sels" =~ "3PP" ]] && { exclude_tpp; disabled+=("TPP") ; }
- [[ -n "$search" ]] && keyword_filter
- strip_null
-}
-munge_servers(){
- local sels="$1"
- local search="$2"
- write_fifo(){
- [[ -p $fifo ]] && rm $fifo
- mkfifo $fifo
- local dist
- for((i=0;i<${#qport[@]};i++)); do
- dist=$(get_dist ${addr[$i]})
-
- printf "%s\n%s\n%s\n%s\n%03d\n%03d\n%s\n%s:%s\n%s\n" "${name[$i]}" "${map[$i]}" "${fpp[$i]}" "${gametime[$i]}" \
- "${players[$i]}" "${max[$i]}" "$dist" "${addr[$i]}" "${gameport[$i]}" "${qport[$i]}" >> $fifo
- done
- }
- response="$(cat /tmp/dz.servers)"
- if [[ ! "$sels" =~ "All maps" ]]; then
- filter_maps > >(pdialog)
- [[ $? -eq 1 ]] && return
- disabled+=("All maps")
- fi
- [[ $ret -eq 97 ]] && return
- prepare_filters "$sels" "$search"
- [[ $? -eq 1 ]] && return
- if [[ $(echo "$response" | jq 'length') -eq 0 ]]; then
- $steamsafe_zenity --error --text="No matching servers" 2>/dev/null
- return
- fi
- #jq bug #1788, raw output (-r) cannot be used with ASCII
- local name=$(<<< "$response" jq -a '.[].name' | sed 's/\\u[0-9a-z]\{4\}//g;s/^"//;s/"$//')
- local map=$(<<< "$response" jq -r '.[].map|if type == "string" then ascii_downcase else "null" end')
- local gametime=$(<<< "$response" jq -r '.[]|(if .gametype == null then "null" else .gametype end)|scan("[0-9]{2}:[0-9]{2}$")')
- local fpp=$(<<< "$response" jq -r '.[].gametype|split(",")|if any(. == "no3rd") then "1PP" else "3PP" end')
- local players=$(<<< "$response" jq -r '.[].players')
- local max=$(<<< "$response" jq -r '.[].max_players')
- local addr=$(<<< "$response" jq -r '.[].addr|split(":")[0]')
- local gameport=$(<<< "$response" jq -r '.[]|(if .gameport == null then "null" else .gameport end)')
- local qport=$(<<< "$response" jq -r '.[].addr|split(":")[1]')
-
- readarray -t qport <<< $qport
- readarray -t gameport <<< $gameport
- readarray -t addr <<< $addr
- readarray -t name <<< $name
- readarray -t fpp <<< $fpp
- readarray -t players <<< $players
- readarray -t map <<< $map
- readarray -t max <<< $max
- readarray -t gametime <<< $gametime
-
- if [[ $is_steam_deck -eq 0 ]]; then
- sd_res="--width=1920 --height=1080"
- fi
- write_fifo &
- pid=$!
- local sel=$($steamsafe_zenity --text="$(pagination)" --title="DZGUI" --list --column=Name --column=Map --column=PP --column=Gametime --column=Players --column=Max --column=Distance --column=IP --column=Qport $sd_res --print-column=1,8,9 --separator=%% 2>/dev/null < <(while true; do cat $fifo; done))
- if [[ -z $sel ]]; then
- rm $fifo
- kill -9 $pid 2>/dev/null
- return 1
- else
- rm $fifo
- kill -9 $pid
- echo $sel
- fi
-}
-debug_servers(){
- debug_res=$(curl -Ls "https://api.steampowered.com/IGameServersService/GetServerList/v1/?filter=\appid\221100&limit=10&key=$steam_api")
- local len=$(<<< "$debug_res" jq '[.response.servers[]]|length')
- if [[ $len -eq 0 ]]; then
- return 1
- else
- return 0
- fi
-}
-server_browser(){
- unset ret
- local filters="$(<<< "$1" awk 'NR==1 {print $0}')"
- local keywords="$(<<< "$1" awk 'NR==2 {print $0}')"
- echo "# Checking Steam API"
- check_steam_api
- [[ $? -eq 1 ]] && return
- echo "# Checking geolocation file"
- check_geo_file
- echo "# Calculating server distances"
- local_latlon
- [[ $ret -eq 97 ]] && return
-
- local limit=20000
- local url="https://api.steampowered.com/IGameServersService/GetServerList/v1/?filter=\appid\221100&limit=$limit&key=$steam_api"
-
- echo "# Getting server list"
- curl -Ls "$url" | jq -r '.response.servers' > /tmp/dz.servers
- total_servers=$(< /tmp/dz.servers jq 'length' | numfmt --grouping)
- players_online=$(curl -Ls "https://api.steampowered.com/ISteamUserStats/GetNumberOfCurrentPlayers/v1/?appid=$aid" \
- | jq '.response.player_count' | numfmt --grouping)
- debug_servers
- [[ $? -eq 1 ]] && { popup 1100; return 1; }
-
- echo "100"
- local sel=$(munge_servers "$filters" "$keywords")
- if [[ -z $sel ]]; then
- unset filters
- unset search
- ret=98
- sd_res="--width=1280 --height=800"
- return 1
- fi
-
- readarray -t address < <(format_table_results "$sel")
- local ip="${address[1]}"
- local gameport="${address[2]}"
- local qport="${address[3]}"
- unset address
-
- connect "$ip" "$gameport" "$qport"
- sd_res="--width=1280 --height=800"
-}
-mods_disk_size(){
- printf "Total size on disk: %s | " $(du -sh "$workshop_dir" | awk '{print $1}')
- printf "%s mods | " $(ls -1 "$workshop_dir" | wc -l)
- printf "Location: %s/steamapps/workshop/content/221100" "$steam_path"
-}
-main_menu(){
- logger INFO "${FUNCNAME[0]}"
- logger INFO "Setting mode"
- set_mode
- while true; do
- set_header "main_menu"
- rc=$?
- logger INFO "set_header rc is $rc"
- if [[ $rc -eq 0 ]]; then
- case "$sel" in
- "") warn "No item was selected." ;;
- " Server browser")
- local filters=$(choose_filters)
- [[ -z $filters ]] && continue
- (server_browser "$filters") | pdialog ;;
- " My servers") query_and_connect "connect" ;;
- " Quick connect to favorite server") connect_to_fav "$fav_server" ;;
- " Connect by ID") connect_by_id ;;
- " Connect by IP") connect_by_ip ;;
- " Recent servers (last 10)") query_and_connect "history" "$(cat $hist_file)" ;;
- " Add server by ID") add_by_id ;;
- " Add server by IP") add_by_ip ;;
- " Add favorite server") add_by_fav ;;
- " Change favorite server") add_by_fav ;;
- " Delete server") query_and_connect "delete" ;;
- " List installed mods")
- list_mods | sed 's/\t/\n/g' | $steamsafe_zenity --list --column="Mod" --column="Symlink" --column="Dir" \
- --title="DZGUI" $sd_res --text="$(mods_disk_size)" \
- --print-column="" 2>/dev/null
- ;;
- " View changelog") changelog ;;
- " Advanced options")
- options_menu
- main_menu
- return
- ;;
- " Help file ⧉") help_file ;;
- " Report bug ⧉") report_bug ;;
- " Forum ⧉") forum ;;
- " Sponsor ⧉") sponsor ;;
- " Hall of fame ⧉") hof ;;
- esac
- else
- logger INFO "Returning from main menu"
- return
- fi
- done
-}
-set_fav(){
- local fav="$1"
- logger INFO "${FUNCNAME[0]}"
-
- readarray -t address < <(format_config_address "$fav")
- local ip="${address[0]}"
- local gameport="${address[1]}"
- local qport="${address[2]}"
- unset address
-
- local info=$(a2s "$ip" "$qport" info)
- local name=$(<<< $info jq -r '.name')
- echo "'$name'"
-}
-check_unmerged(){
- logger INFO "${FUNCNAME[0]}"
- if [[ -f ${config_path}.unmerged ]]; then
- merge_config
- rm ${config_path}.unmerged
- fi
}
merge_config(){
- source $config_file
- legacy_fav
- legacy_ids
- [[ -z $staging_dir ]] && staging_dir="/tmp"
+ [[ -z $staging_dir ]] && staging_dir="/tmp"
update_config
- tdialog "Wrote new config format to \n${config_file}\nIf errors occur, you can restore the file:\n${config_file}.old"
+ tdialog "Wrote new config format to \n${config_file}\nIf errors occur, you can restore the file:\n${config_file}.old"
}
-download_new_version(){
- if [[ $is_steam_deck -eq 1 ]]; then
- freedesktop_dirs
- fi
- source_script=$(realpath "$0")
- source_dir=$(dirname "$source_script")
- mv $source_script $source_script.old
- echo "# Downloading version $upstream"
- curl -Ls "$version_url" > $source_script
- rc=$?
- if [[ $rc -eq 0 ]]; then
- echo "[DZGUI] Wrote $upstream to $source_script"
- chmod +x $source_script
- touch ${config_path}.unmerged
- echo "100"
- $steamsafe_zenity --question --width=500 --title="DZGUI" --text "DZGUI $upstream successfully downloaded.\nTo view the changelog, select Changelog.\nTo use the new version, select Exit and restart." --ok-label="Changelog" --cancel-label="Exit" 2>/dev/null
- code=$?
- if [[ $code -eq 0 ]]; then
- changelog
- exit
- elif [[ $code -eq 1 ]]; then
- exit
- fi
- else
- echo "100"
- mv $source_script.old $source_script
- $steamsafe_zenity --info --title="DZGUI" --text "[ERROR] 99: Failed to download new version." 2>/dev/null
- return
- fi
-
-}
-check_branch(){
- logger INFO "${FUNCNAME[0]}"
- if [[ $branch == "stable" ]]; then
- version_url="$stable_url/dzgui.sh"
- elif [[ $branch == "testing" ]]; then
- version_url="$testing_url/dzgui.sh"
- fi
- logger INFO "Branch is $branch"
- upstream=$(curl -Ls "$version_url" | awk -F= '/^version=/ {print $2}')
- logger INFO "Upstream version is $version"
-}
-enforce_dl(){
- download_new_version > >(pdialog)
-}
-prompt_dl(){
- $steamsafe_zenity --question --title="DZGUI" --text "Version conflict.\n\nYour branch:\t\t\t$branch\nYour version:\t\t\t$version\nUpstream version:\t\t$upstream\n\nVersion updates introduce important bug fixes and are encouraged.\n\nAttempt to download latest version?" --width=500 --ok-label="Yes" --cancel-label="No" 2>/dev/null
- rc=$?
- if [[ $rc -eq 1 ]]; then
- return
- else
- echo "100"
- download_new_version > >(pdialog)
- fi
+check_unmerged(){
+ if [[ -f ${config_path}.unmerged ]]; then
+ merge_config
+ rm ${config_path}.unmerged
+ fi
}
check_version(){
- logger INFO "${FUNCNAME[0]}"
- [[ -f $config_file ]] && source $config_file
- [[ -z $branch ]] && branch="stable"
- check_branch
- [[ ! -f "$freedesktop_path/dzgui.desktop" ]] && freedesktop_dirs
- if [[ $version == $upstream ]]; then
- logger INFO "Local version is same as upstream"
- check_unmerged
- else
- logger INFO "Local and remote version mismatch"
- if [[ $enforce_dl -eq 1 ]]; then
- enforce_dl
- else
- prompt_dl
- fi
- fi
+ local version_url=$(format_version_url)
+ local upstream=$(curl -Ls "$version_url" | awk -F= '/^version=/ {print $2}')
+ logger INFO "Local branch: '$branch', local version: $version"
+ if [[ $branch == "stable" ]]; then
+ version_url="$stable_url/dzgui.sh"
+ elif [[ $branch == "testing" ]]; then
+ version_url="$testing_url/dzgui.sh"
+ fi
+ local upstream=$(curl -Ls "$version_url" | awk -F= '/^version=/ {print $2}')
+ [[ ! -f "$freedesktop_path/$appname.desktop" ]] && freedesktop_dirs
+ if [[ $version == $upstream ]]; then
+ logger INFO "Local version is same as upstream"
+ check_unmerged
+ else
+ logger WARN "Local and remote version mismatch: $version != $upstream"
+ prompt_dl
+ fi
+}
+download_new_version(){
+ local version_url="$(format_version_url)"
+ mv "$src_path" "$src_path.old"
+ curl -Ls "$version_url" > "$src_path"
+ rc=$?
+ if [[ $rc -eq 0 ]]; then
+ logger INFO "Wrote new version to $src_path"
+ chmod +x "$src_path"
+ touch "${config_path}.unmerged"
+ fdialog "DZGUI $upstream successfully downloaded. To use the new version, select Exit and restart."
+ logger INFO "User exited after version upgrade"
+ exit 0
+ else
+ mv "$src_path.old" "$src_path"
+ logger WARN "curl failed to fetch new version. Rolling back"
+ fdialog "Failed to download the new version. Restoring old version"
+ return 1
+ fi
+ dl_changelog
+}
+prompt_dl(){
+ _text(){
+ cat <<-EOF
+ Version conflict.
+
+ Your branch: $branch
+ Your version: $version
+ Upstream version: $upstream
+
+ Version updates introduce important bug fixes and are encouraged. Attempt to download the latest version?
+ EOF
+ }
+ qdialog "$(_text)" "Yes" "No"
+ if [[ $? -eq 1 ]]; then
+ return 0
+ else
+ download_new_version
+ fi
+}
+dl_changelog(){
+ local mdbranch
+ [[ $branch == "stable" ]] && mdbranch="dzgui"
+ [[ $branch == "" ]] && mdbranch="testing"
+ local md="https://raw.githubusercontent.com/$author/dztui/${mdbranch}/CHANGELOG.md"
+ curl -Ls "$md" > "$state_path/CHANGELOG.md"
}
check_architecture(){
- logger INFO "${FUNCNAME[0]}"
- cpu=$(cat /proc/cpuinfo | grep "AMD Custom APU 0405")
- if [[ -n "$cpu" ]]; then
- is_steam_deck=1
- logger INFO "Setting architecture to 'Steam Deck'"
- else
- is_steam_deck=0
- logger INFO "Setting architecture to 'desktop'"
- fi
+ local cpu=$(< /proc/cpuinfo grep "AMD Custom APU 0405")
+ if [[ -n "$cpu" ]]; then
+ is_steam_deck=1
+ logger INFO "Setting architecture to 'Steam Deck'"
+ else
+ is_steam_deck=0
+ logger INFO "Setting architecture to 'desktop'"
+ fi
}
-print_ip_list(){
- [[ ${#ip_list} -eq 0 ]] && return
- printf "\t\"%s\"\n" "${ip_list[@]}"
+check_map_count(){
+ [[ $is_steam_deck -eq 1 ]] && return 0
+ local count=1048576
+ local conf_file="/etc/sysctl.d/dayz.conf"
+ if [[ -f $conf_file ]]; then
+ logger DEBUG "System map count is already $count or higher"
+ return 0
+ fi
+ qdialog "sudo password required to check system vm map count." "OK" "Cancel"
+ if [[ $? -eq 0 ]]; then
+ local pass
+ logger INFO "Prompting user for sudo escalation"
+ pass=$($steamsafe_zenity --password)
+ if [[ $? -eq 1 ]]; then
+ logger WARN "User aborted password prompt"
+ return 1
+ fi
+ local ct=$(sudo -S <<< "$pass" sh -c "sysctl -q vm.max_map_count | awk -F'= ' '{print \$2}'")
+ logger DEBUG "Old map count is $ct"
+ local new_ct
+ [[ $ct -lt $count ]] && ct=$count
+ sudo -S <<< "$pass" sh -c "echo 'vm.max_map_count=$ct' > $conf_file"
+ sudo sysctl -p "$conf_file"
+ logger DEBUG "Updated map count to $count"
+ else
+ logger WARN "User aborted map count prompt"
+ return 1
+ fi
+}
+qdialog(){
+ local text="$1"
+ local ok="$2"
+ local cancel="$3"
+ $steamsafe_zenity --question --text="$1" --ok-label="$ok" --cancel-label="$cancel" "${zenity_flags[@]}"
+}
+pdialog(){
+ $steamsafe_zenity --progress --pulsate --auto-close "${zenity_flags[@]}"
+}
+fdialog(){
+ $steamsafe_zenity --warning --ok-label="Exit" --text="$1" "${zenity_flags[@]}"
+}
+tdialog(){
+ $steamsafe_zenity --info --text="$1" "${zenity_flags[@]}"
+}
+steam_deps(){
+ local flatpak
+ local steam
+ [[ $(command -v flatpak) ]] && flatpak=$(flatpak list | grep valvesoftware.Steam)
+ steam=$(command -v steam)
+ if [[ -z "$steam" ]] && [[ -z "$flatpak" ]]; then
+ 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
- rm $hist_file
fi
+ logger INFO "Migrated old API file"
+ [[ -f $hist_file ]] && rm $hist_file
+ logger INFO "Wiped old history file"
}
-legacy_fav(){
- source $config_file
- [[ -z $fav ]] && return
- local res=$(map_fav_to_ip "$fav")
- source $config_file
-}
-legacy_ids(){
- source $config_file
- [[ -z $whitelist ]] && return
- local res=$(map_id_to_ip "$whitelist")
- source $config_file
-}
-map_fav_to_ip(){
- local to_add="$1"
- fav_server=$(curl -s "$api" -H "Authorization: Bearer "$api_key"" \
- -G -d "sort=-players" \
- -d "filter[game]=$game" \
- -d "filter[ids][whitelist]=$to_add" \
- | jq -r '.data[].attributes|"\(.ip):\(.port):\(.portQuery)"')
- update_config
- fav_label=$(set_fav "$fav_server")
-}
-map_id_to_ip(){
- local to_add="$1"
- local mode="$2"
- local res=$(curl -s "$api" -H "Authorization: Bearer "$api_key"" \
- -G -d "sort=-players" \
- -d "filter[game]=$game" \
- -d "filter[ids][whitelist]=$to_add")
- local len=$(<<< "$res" jq '.data|length')
- [[ $len -eq 0 ]] && return 1
- local ip=$(<<< "$res" jq -r '.data[].attributes|"\(.ip):\(.port):\(.portQuery)"')
- if [[ $mode == "connect" ]]; then
- echo "$ip"
- return 0
- fi
- for i in $ip; do
- if [[ ${ip_list[@]} =~ $i ]]; then
- [[ ! $len -eq 1 ]] && continue
- warn "This server is already in your list"
- return 2
- fi
- ip_list+=("$i")
- update_config
+stale_symlinks(){
+ local game_dir="$steam_path/steamapps/common/DayZ"
+ for l in $(find "$game_dir" -xtype l); do
+ logger DEBUG "Updating stale symlink '$l'"
+ unlink $l
done
- echo $i
}
-add_by_ip(){
- local sel=$(parse_ips)
- [[ -z $sel ]] && return
-
- readarray -t address < <(format_table_results "$sel")
- local ip="${address[1]}"
- local gameport="${address[2]}"
- local qport="${address[3]}"
- unset address
-
- if [[ ${ip_list[@]} =~ "$ip:$gameport:$qport" ]]; then
- warn "This server is already in your favorites"
- return
+check_news(){
+ [[ $branch == "stable" ]] && news_url="$stable_url/news"
+ [[ $branch == "testing" ]] && news_url="$testing_url/news"
+ local result=$(curl -Ls "$news_url")
+ local sum=$(<<< "$result" md5sum | awk '{print $1}')
+ if [[ $sum != "$seen_news" ]]; then
+ logger WARN "Local news checksum '$seen_news' != '$sum'"
+ seen_news="$sum"
+ update_config
+ echo "$result"
fi
-
- ip_list+=("$ip:$gameport:$qport")
- update_config
- info "Added $ip:$gameport:$qport to:\n${config_path}dztuirc\nIf errors occurred, you can restore the file:\n${config_path}dztuirc.old"
}
-pdialog(){
- $steamsafe_zenity --progress --pulsate --auto-close --title="DZGUI" --width=500 2>/dev/null
-}
-edialog(){
- if [[ $is_steam_deck -eq 1 ]] && [[ $(test_display_mode) == "gm" ]]; then
- kdialog --inputbox "$1" --title "DZGUI" --geometry 500 2>/dev/null
+local_latlon(){
+ if [[ -z $(command -v dig) ]]; then
+ local local_ip=$(curl -Ls "https://ipecho.net/plain")
else
- $steamsafe_zenity --entry --text="$1" --width=500 --title="DZGUI" 2>/dev/null
+ local local_ip=$(dig -4 +short myip.opendns.com @resolver1.opendns.com)
fi
-}
-tdialog(){
- $steamsafe_zenity --info --text="$1" --width=500 --title="DZGUI" 2>/dev/null
-}
-qdialog(){
- $steamsafe_zenity --question --text="$1" --width=500 --title="DZGUI" 2>/dev/null
-}
-add_by_id(){
- local mode="$1"
- if [[ -z $api_key ]]; then
- qdialog "Requires Battlemetrics API key. Set one now?"
- [[ $? -eq 1 ]] && return 1
- while true; do
- api_key=$(edialog "Battlemetrics API key")
- [[ $? -eq 1 ]] && return 1
- [[ -z $api_key ]] && { warn "Invalid API key"; continue; }
- if [[ $(test_bm_api $api_key) -eq 1 ]]; then
- warn "Invalid API key"
- unset api_key
- continue
- fi
- update_config
- break
- done
+ local url="http://ip-api.com/json/$local_ip"
+ local res=$(curl -Ls "$url" | jq -r '"\(.lat)\n\(.lon)"')
+ if [[ -z "$res" ]]; then
+ logger WARN "Failed to get local coordinates"
+ return 1
fi
- while true; do
- local id
- id=$(edialog "Enter server ID")
- [[ $? -eq 1 ]] && return 1
- if [[ ! $id =~ ^[0-9]+$ ]]; then
- warn "Invalid ID"
- else
- local ip
- ip=$(map_id_to_ip "$id" "$mode")
- case "$?" in
- 1)
- warn "Invalid ID"
- continue
- ;;
- 2)
- continue
- ;;
- *)
- if [[ $mode == "connect" ]]; then
- echo "$ip"
- return 0
- fi
- tdialog "Added $ip to:\n${config_path}dztuirc\nIf errors occurred, you can restore the file:\n${config_path}dztuirc.old"
- return 0
- ;;
- esac
- fi
- done
-}
-toggle_debug(){
- if [[ $debug -eq 1 ]]; then
- debug=0
- else
- debug=1
- fi
- update_config
-
-}
-setup(){
- logger INFO "${FUNCNAME[0]}"
- [[ -z $fav_server ]] && return
- items[10]=" Change favorite server"
- [[ -n $fav_label ]] && return
- fav_label=$(set_fav $fav_server)
- update_config
-}
-check_map_count(){
- logger INFO "${FUNCNAME[0]}"
- [[ $is_steam_deck -eq 1 ]] && return
- local count=1048576
- logger INFO "Checking system map count"
- echo "[DZGUI] Checking system map count"
- if [[ ! -f /etc/sysctl.d/dayz.conf ]]; then
- $steamsafe_zenity --question --width=500 --title="DZGUI" --cancel-label="Cancel" --ok-label="OK" --text "sudo password required to check system vm map count."
- local rc=$?
- logger INFO "Return code is $rc"
- if [[ $rc -eq 0 ]]; then
- local pass
- logger INFO "Prompting user for sudo escalation"
- pass=$($steamsafe_zenity --password)
- local rc
- logger INFO "Return code is $rc"
- [[ $rc -eq 1 ]] && exit 1
- local ct=$(sudo -S <<< "$pass" sh -c "sysctl -q vm.max_map_count | awk -F'= ' '{print \$2}'")
- local new_ct
- [[ $ct -lt $count ]] && ct=$count
- logger INFO "Updating map count"
- sudo -S <<< "$pass" sh -c "echo 'vm.max_map_count=$ct' > /etc/sysctl.d/dayz.conf"
- sudo sysctl -p /etc/sysctl.d/dayz.conf
- else
- logger INFO "Zenity dialog failed or user exit"
- exit 1
- fi
- fi
-}
-change_name(){
- while true; do
- local name=$($steamsafe_zenity --entry --text="Enter desired in-game name" --title="DZGUI" 2>/dev/null)
- [[ -z "${name//[[:blank:]]/}" ]] && continue
- update_config
- info "Changed name to: '$name'.\nIf errors occur, you can restore the file '${config_path}dztuirc.old'."
- return
- done
-}
-add_by_fav(){
- local sel=$(parse_ips)
- [[ -z $sel ]] && return
-
- readarray -t address < <(format_table_results "$sel")
- local ip="${address[1]}"
- local gameport="${address[2]}"
- local qport="${address[3]}"
- unset address
- fav_server="$ip:$gameport:$qport"
- fav_label=$(set_fav "$fav_server")
-
- update_config
- info "Added $fav_server to:\n${config_path}dztuirc\nIf errors occurred, you can restore the file:\n${config_path}dztuirc.old"
-
- items[10]=" Change favorite server"
+ echo "$res" > "$coords_file"
}
lock(){
- [[ ! -d $config_path ]] && return
- if [[ ! -f ${config_path}.lockfile ]]; then
- touch ${config_path}.lockfile
- fi
- pid=$(cat ${config_path}.lockfile)
- ps -p $pid -o pid= >/dev/null 2>&1
- res=$?
- if [[ $res -eq 0 ]]; then
- info "DZGUI already running ($pid)"
- exit
- elif [[ $pid == $$ ]]; then
- :
- else
- echo $$ > ${config_path}.lockfile
- fi
+ [[ ! -f $lock_file ]] && touch $lock_file
+ local pid=$(cat $lock_file)
+ ps -p $pid -o pid= >/dev/null 2>&1
+ res=$?
+ if [[ $res -eq 0 ]]; then
+ local msg="DZGUI already running ($pid)"
+ raise_error_and_quit "$msg"
+ elif [[ $pid == $$ ]]; then
+ :
+ else
+ echo $$ > $lock_file
+ fi
+}
+get_hash(){
+ local file="$1"
+ md5sum "$1" | awk '{print $1}'
}
fetch_a2s(){
- [[ -d $helpers_path/a2s ]] && return
- local sha=c7590ffa9a6d0c6912e17ceeab15b832a1090640
- local author="yepoleb"
- local repo="python-a2s"
- local url="https://github.com/$author/$repo/tarball/$sha"
- local prefix="${author^}-$repo-${sha:0:7}"
- local file="$prefix.tar.gz"
- curl -Ls "$url" > "$helpers_path/$file"
- tar xf "$helpers_path/$file" -C "$helpers_path" "$prefix/a2s" --strip=1
- rm "$helpers_path/$file"
+ [[ -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"
+ local prefix="${author^}-$repo-${sha:0:7}"
+ local file="$prefix.tar.gz"
+ curl -Ls "$url" > "$helpers_path/$file"
+ tar xf "$helpers_path/$file" -C "$helpers_path" "$prefix/a2s" --strip=1
+ rm "$helpers_path/$file"
+ logger INFO "Updated A2S helper to sha '$sha'"
}
fetch_dzq(){
- [[ -f $helpers_path/dayzquery.py ]] && return
- local sha=ccc4f71b48610a1885706c9d92638dbd8ca012a5
- local author="yepoleb"
- local repo="dayzquery"
- local url="https://raw.githubusercontent.com/$author/$repo/$sha/$repo.py"
- curl -Ls "$url" > $helpers_path/a2s/$repo.py
-}
-fetch_query(){
- local sum="7cbae12ae68b526e7ff376b638123cc7"
- local file="$helpers_path/query.py"
- if [[ -f $file ]] && [[ $(md5sum $file | awk '{print $1}') == $sum ]]; then
- return
+ local sum="232f42b98a3b50a0dd6e73fee55521b2"
+ 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=ccc4f71b48610a1885706c9d92638dbd8ca012a5
+ local author="yepoleb"
+ local repo="dayzquery"
+ local url="https://raw.githubusercontent.com/$author/$repo/$sha/dayzquery.py"
+ curl -Ls "$url" > "$file"
+ logger INFO "Updated DZQ to sha '$sha'"
+}
+fetch_helpers_by_sum(){
+ declare -A sums
+ sums=(
+ ["ui.py"]="8c430f1465995cbd98f4ad8e2580a79d"
+ ["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
+ ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
+ ["funcs"]="b04a0e34141e4e11da0a061802a822e3"
+ )
+ local author="aclist"
+ local repo="dztui"
+ local branch="$branch"
+ local url="https://raw.githubusercontent.com/$author/$repo/$branch/helpers/$file"
+
+ for i in "${!sums[@]}"; do
+ file="$i"
+ sum="${sums[$i]}"
+ full_path="$helpers_path/$file"
+ if [[ -f "$full_path" ]] && [[ $(get_hash "$helpers_path/$file") == $sum ]]; then
+ logger INFO "'$file' is current"
+ else
+ logger WARN "File '$full_path' checksum != '$sum'"
+ curl -Ls "$url" > "$full_path/$file"
+ if [[ ! $? -eq 0 ]]; then
+ raise_error_and_quit "Failed to fetch the file '$file'. Possible timeout?"
+ fi
+ fi
+ [[ $file == "funcs" ]] && chmod +x "$full_path"
+ logger INFO "Updated '$full_path' to sum '$sum'"
+ done
+ return 0
+}
+fetch_geo_file(){
+ # for binary releases
+ local geo_sum="e7f3b25223ac4dfd5e30a0b55bb3ff6c"
+ local km_sum="b038fdb8f655798207bd28de3a004706"
+ local gzip="$helpers_path/ips.csv.gz"
+ if [[ ! -f $geo_file ]] || [[ $(get_hash $geo_file) != $geo_sum ]]; then
+ curl -Ls "$geo_file_url" > "$gzip"
+ #force overwrite
+ gunzip -f "$gzip"
+ fi
+ if [[ ! -f $km_helper ]] || [[ $(get_hash $km_helper) != $km_sum ]]; then
+ curl -Ls "$km_helper_url" > "$km_helper"
+ chmod +x "$km_helper"
fi
- local author="aclist"
- local repo="dzgui"
- local url="https://raw.githubusercontent.com/$author/dztui/$repo/helpers/query.py"
- curl -Ls "$url" > "$helpers_path/query.py"
}
fetch_helpers(){
- logger INFO "${FUNCNAME[0]}"
- mkdir -p "$helpers_path"
- [[ ! -f "$helpers_path/vdf2json.py" ]] && curl -Ls "$vdf2json_url" > "$helpers_path/vdf2json.py"
fetch_a2s
fetch_dzq
- fetch_query
+ fetch_geo_file
+ fetch_helpers_by_sum
}
-update_steam_cmd(){
- preferred_client="$steam_cmd"
- update_config
+raise_error_and_quit(){
+ local msg="$1"
+ logger CRITICAL "$msg"
+ fdialog "$msg"
+ exit 1
}
-steam_deps(){
- logger INFO "${FUNCNAME[0]}"
- local flatpak steam
- [[ $(command -v flatpak) ]] && flatpak=$(flatpak list | grep valvesoftware.Steam)
- steam=$(command -v steam)
- if [[ -z "$steam" ]] && [[ -z "$flatpak" ]]; then
- warn "Requires Steam or Flatpak Steam"
- logger ERROR "Steam was missing"
- exit
- elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then
- toggle_steam=1
- steam_cmd="steam"
- [[ -n $preferred_client ]] && steam_cmd="$preferred_client"
- [[ -z $preferred_client ]] && update_steam_cmd
- elif [[ -n "$steam" ]]; then
- steam_cmd="steam"
- else
- steam_cmd="flatpak run com.valvesoftware.Steam"
- fi
- logger INFO "steam_cmd set to $steam_cmd"
+test_steam_api(){
+ local key="$1"
+ [[ -z $key ]] && return 1
+ local url="https://api.steampowered.com/IGameServersService/GetServerList/v1/?filter=\appid\221100&limit=10&key=$key"
+ local code=$(curl -ILs "$url" | grep -E "^HTTP")
+ [[ $code =~ 403 ]] && echo 1
+ [[ $code =~ 200 ]] && echo 0
}
-update_steam_cmd(){
- local new_cmd
- preferred_client="$steam_cmd"
- new_cmd="preferred_client=\"$preferred_client\""
- mv $config_file ${config_path}dztuirc.old
- nr=$(awk '/preferred_client=/ {print NR}' ${config_path}dztuirc.old)
- awk -v "var=$new_cmd" -v "nr=$nr" 'NR==nr {$0=var}{print}' ${config_path}dztuirc.old > ${config_path}dztuirc
+test_bm_api(){
+ local bm_api="https://api.battlemetrics.com/servers"
+ local key="$1"
+ [[ -z $key ]] && return 1
+ local code=$(curl -ILs "$bm_api" \
+ -H "Authorization: Bearer "$key"" -G \
+ -d "filter[game]=$game" \
+ | grep -E "^HTTP")
+ [[ $code =~ 401 ]] && echo 1
+ [[ $code =~ 200 ]] && echo 0
}
-steam_deps(){
- logger INFO "${FUNCNAME[0]}"
- local flatpak steam
- [[ $(command -v flatpak) ]] && flatpak=$(flatpak list | grep valvesoftware.Steam)
- steam=$(command -v steam)
- if [[ -z "$steam" ]] && [[ -z "$flatpak" ]]; then
- warn "Requires Steam or Flatpak Steam"
- logger ERROR "Steam was missing"
- exit
- elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then
- toggle_steam=1
- steam_cmd="steam"
- [[ -n $preferred_client ]] && steam_cmd="$preferred_client"
- [[ -z $preferred_client ]] && update_steam_cmd
- elif [[ -n "$steam" ]]; then
- steam_cmd="steam"
- else
- steam_cmd="flatpak run com.valvesoftware.Steam"
- fi
- logger INFO "steam_cmd set to $steam_cmd"
+find_default_path(){
+ _discover(){
+ default_steam_path=$(find / -type d \( -path "/proc" -o -path "*/timeshift" -o -path \
+ "/tmp" -o -path "/usr" -o -path "/boot" -o -path "/proc" -o -path "/root" \
+ -o -path "/sys" -o -path "/etc" -o -path "/var" -o -path "/lost+found" \) -prune \
+ -o -regex ".*/Steam/ubuntu12_32$" -print -quit 2>/dev/null | sed 's@/ubuntu12_32@@')
+ }
+ if [[ $is_steam_deck -eq 1 ]]; then
+ default_steam_path="$HOME/.local/share/Steam"
+ logger INFO "Set default Steam path to $default_steam_path"
+ return 0
+ fi
+ local def_path
+ local ubuntu_path
+ local flatpak_path
+ local debian_path
+ def_path="$HOME/.local/share/Steam"
+ ubuntu_path="$HOME/.steam/steam"
+ 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
+ if [[ -d "$i" ]]; then
+ default_steam_path="$i"
+ return 0
+ fi
+ done
+
+ local msg="Let DZGUI auto-discover Steam path (accurate, slower)\nSelect the Steam path manually (less accurate, faster)"
+ echo -e "$msg" | $steamsafe_zenity --list \
+ --column="Choice" \
+ --title="DZGUI" \
+ --hide-header \
+ --text="Steam is not installed in a standard location." \
+ $sd_res
+
+ case "$res" in
+ *auto*) discover ;;
+ *manual*)
+ zenity --info --text="\nSelect the top-level entry point to the location where Steam (not DayZ)\nis installed and before entering the \"steamapps\" path.\n\nE.g., if Steam is installed at:\n\"/media/mydrive/Steam\"\n\nCorrect:\n- \"/media/mydrive/Steam\"\n\nIncorrect:\n- \"/media/mydrive/Steam/steamapps/common/DayZ\"\n- \"/media/mydrive/\"" --width=500 &&
+ file_picker ;;
+ esac
+}
+file_picker(){
+ local path=$($steamsafe_zenity --file-selection --directory)
+ logger INFO "File picker path resolved to: $path"
+ if [[ -z "$path" ]]; then
+ logger WARN "Steam path selection was empty"
+ return
+ else
+ default_steam_path="$path"
+ fi
+}
+find_library_folder(){
+ local search_path="$1"
+ steam_path="$(python3 "$helpers_path/vdf2json.py" -i "$1/steamapps/libraryfolders.vdf" \
+ | jq -r '.libraryfolders[]|select(.apps|has("221100")).path')"
+ if [[ ! $? -eq 0 ]]; then
+ logger WARN "Failed to parse Steam path using '$search_path'"
+ return 1
+ fi
+ logger INFO "Steam path resolved to: $steam_path"
+}
+create_config(){
+ while true; do
+ local player_input="$($steamsafe_zenity \
+ --forms \
+ --add-entry="Player name (required for some servers)" \
+ --add-entry="Steam API key" \
+ --add-entry="BattleMetrics API key (optional)" \
+ --title="DZGUI" \
+ --text="DZGUI" $sd_res \
+ --separator="@")"
+ #explicitly setting IFS crashes $steamsafe_zenity in loop
+ #and mapfile does not support high ascii delimiters
+ #so split fields with newline
+ readarray -t args < <(<<< "$player_input" sed 's/@/\n/g')
+ name="${args[0]}"
+ steam_api="${args[1]}"
+ api_key="${args[2]}"
+
+ if [[ -z $player_input ]]; then
+ logger WARN "User aborted setup process"
+ exit 1
+ fi
+ if [[ -z $steam_api ]]; then
+ tdialog "Steam API key canot be empty"
+ continue
+ elif [[ "${#steam_api}" -lt 32 ]] || [[ $(test_steam_api "$steam_api") -eq 1 ]]; then
+ tdialog "Invalid Steam API key"
+ continue
+ fi
+ if [[ -n $api_key ]] && [[ $(test_bm_api $api_key) -eq 1 ]]; then
+ tdialog "Invalid BM API key"
+ continue
+ fi
+ while true; do
+ if [[ -n $steam_path ]]; then
+ write_config
+ [[ $? -eq 0 ]] && logger INFO "Successfully created config file"
+ return 0
+ fi
+ find_default_path
+ find_library_folder "$default_steam_path"
+ if [[ -z $steam_path ]]; then
+ logger raise_error "Steam path was empty"
+ zenity --question --text="DayZ not found or not installed at the chosen path." --ok-label="Choose path manually" --cancel-label="Exit"
+ if [[ $? -eq 0 ]]; then
+ logger INFO "User selected file picker"
+ file_picker
+ find_library_folder "$default_steam_path"
+ else
+ fdialog "Failed to find Steam at the provided location"
+ exit 1
+ fi
+ else
+ branch="stable"
+ update_config
+ logger INFO "Wrote config to '$config_file'"
+ return 0
+ fi
+ done
+ done
+}
+varcheck(){
+ if [[ ! -f $config_file ]]; then
+ local msg="Config file '$config_file' missing. Start first-time setup now?"
+ qdialog "$msg" "Yes" "Exit"
+ if [[ $? -eq 1 ]]; then
+ logger CRITICAL "Config file missing, but user aborted setup"
+ exit 1
+ fi
+ create_config
+ fi
+ 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 ]]; then
+ logger WARN "DayZ path resolved to $game_dir"
+ logger WARN "Workshop path resolved to $workshop_dir"
+ pdialog "$msg"
+ if [[ $? -eq 1 ]]; then
+ logger CRITICAL "Malformed Steam path, but user aborted setup"
+ exit 1
+ fi
+ create_config
+ return 0
+ fi
+}
+is_dzg_downloading(){
+ if [[ -d $steam_path ]] && [[ -d $steam_path/downloading/$aid ]]; then
+ logger WARN "DayZ may be scheduling updates"
+ return 0
+ fi
+}
+is_steam_running(){
+ local res=$(ps aux | grep "steamwebhelper" | grep -v grep)
+ if [[ -z $res ]]; then
+ logger WARN "Steam may not be running"
+ tdialog "Is Steam running? For best results, make sure Steam is open in the background."
+ return 0
+ fi
}
initial_setup(){
- echo "# Initial setup"
- run_depcheck
- check_pyver
- watcher_deps
- check_architecture
- check_version
- check_map_count
- fetch_helpers
- config
- steam_deps
- run_varcheck
+ setup_dirs
+ setup_state_files
+ depcheck
+ check_pyver
+ test_gobject
+ watcher_deps
+ check_architecture
+ varcheck
+ source "$config_file"
+ lock
+ legacy_vars
+ check_version
+ check_map_count
+ steam_deps
migrate_files
- stale_symlinks
- init_items
- setup
- echo "100"
+ stale_symlinks
+ #TODO: test fetching
+ fetch_helpers
+ local_latlon
+ is_steam_running
+ is_dzg_downloading
+ print_config_vals
}
main(){
- local parent=$(cat /proc/$PPID/comm)
- [[ -f "$debug_log" ]] && rm "$debug_log"
- lock
- local zenv=$(zenity --version 2>/dev/null)
- [[ -z $zenv ]] && { echo "Failed to find zenity"; logger "Missing zenity"; exit 1; }
- initial_setup > >(pdialog)
- main_menu
- #TODO: tech debt: cruddy handling for steam forking
- [[ $? -eq 1 ]] && pkill -f dzgui.sh
+ local zenv=$(zenity --version 2>/dev/null)
+ [[ -z $zenv ]] && { echo "Requires zenity <= 3.44.1"; exit 1; }
+
+ printf "Initializing setup...\n"
+ initial_setup
+ local news=$(check_news)
+
+ printf "All OK. Kicking off UI...\n"
+ [[ -n $news ]] && python3 "ui.py" "--init-ui" "$news" "$version"
+ [[ -z $news ]] && python3 "ui.py" "--init-ui" "null" "$version"
}
main
+#TODO: tech debt: cruddy handling for steam forking
+[[ $? -eq 1 ]] && pkill -f dzgui.sh
diff --git a/helpers/funcs b/helpers/funcs
new file mode 100644
index 0000000..0b09c00
--- /dev/null
+++ b/helpers/funcs
@@ -0,0 +1,1200 @@
+#!/usr/bin/env bash
+set -o pipefail
+version="5.0.0.rc-1"
+
+#CONSTANTS
+aid=221100
+game="dayz"
+app_name="dzgui"
+app_name_upper="DZGUI"
+workshop="steam://url/CommunityFilePage/"
+sd_res="--width=1280 --height=800"
+steamsafe_zenity="/usr/bin/zenity"
+separator="␞"
+
+##CONFIG
+config_path="$HOME/.config/dztui"
+config_file="$config_path/dztuirc"
+source $config_file
+
+#PATHS
+state_path="$HOME/.local/state/$app_name"
+cache_path="$HOME/.cache/$app_name"
+share_path="$HOME/.local/share/$app_name"
+script_path="$share_path/dzgui.sh"
+helpers_path="$share_path/helpers"
+prefix="dzg"
+
+#LOGS
+log_path="$state_path/logs"
+debug_log="$log_path/DZGUI_DEBUG.log"
+system_log="$log_path/DZGUI_SYSTEM.log"
+
+#STATE FILES
+history_file="$state_path/$prefix.history"
+versions_file="$state_path/$prefix.versions"
+lock_file="$state_path/$prefix.lock"
+
+#CACHE
+cache_dir="$HOME/.cache/$appname"
+_cache_servers="$cache_dir/$prefix.servers"
+_cache_my_servers="$cache_dir/$prefix.my_servers"
+_cache_history="$cache_dir/$prefix.history"
+_cache_launch="$cache_dir/$prefix.launch_mods"
+_cache_address="$cache_dir/$prefix.launch_address"
+_cache_coords="$cache_path/$prefix.coords"
+
+#XDG
+freedesktop_path="$HOME/.local/share/applications"
+
+#HELPERS
+ui_helper="$helpers_path/ui.py"
+geo_file="$helpers_path/ips.csv"
+km_helper="$helpers_path/latlon"
+sums_path="$helpers_path/sums.md5"
+query_helper="$helpers_path/query_v2.py"
+func_helper="$helpers_path/funcs"
+
+#STEAM PATHS
+workshop_path="$steam_path/steamapps/workshop"
+workshop_dir="$workshop_path/content/$aid"
+downloads_dir="$workshop_path/downloads/$aid"
+game_dir="$steam_path/steamapps/common/DayZ"
+
+#URLS
+author="aclist"
+repo="dztui"
+gh_prefix="https://github.com"
+issues_url="$gh_prefix/$author/$repo/issues"
+url_prefix="https://raw.githubusercontent.com/$author/$repo"
+stable_url="$url_prefix/dzgui"
+testing_url="$url_prefix/testing"
+releases_url="$gh_prefix/$author/$repo/releases/download/browser"
+km_helper_url="$releases_url/latlon"
+db_file="$releases_url/ips.csv.gz"
+sums_url="$stable_url/helpers/sums.md5"
+vdf2json_url="$stable_url/helpers/vdf2json.py"
+#TODO: move adoc to index
+help_url="https://$author.github.io/dzgui/dzgui"
+forum_url="$gh_prefix/$author/$repo/discussions"
+sponsor_url="$gh_prefix/sponsors/$author"
+battlemetrics_server_url="https://www.battlemetrics.com/servers/dayz"
+steam_api_url="https://steamcommunity.com/dev/apikey"
+#TODO: update link in docs
+battlemetrics_api_url="https://www.battlemetrics.com/developers"
+bm_api="https://api.battlemetrics.com/servers"
+
+if [[ $preferred_client == "steam" ]]; then
+ steam_cmd="steam"
+else
+ steam_cmd="flatpak run com.valvesoftware.Steam"
+fi
+
+#TODO: dump servers methods can be merged
+declare -A funcs=(
+["My servers"]="dump_servers"
+["Change player name"]="update_config_val"
+["Change Steam API key"]="update_config_val"
+["Change Battlemetrics API key"]="update_config_val"
+["Change favorite server"]="add_record"
+["Quick-connect to favorite server"]="quick_connect"
+["Add server by IP"]="add_record"
+["Add server by ID"]="add_record"
+["Connect by IP"]="validate_and_connect"
+["Connect by ID"]="validate_and_connect"
+["Connect from table"]="connect_from_table"
+["toggle"]="toggle"
+["Open link"]="open_link"
+["filter"]="dump_servers"
+["dump_servers"]="dump_servers"
+["get_unique_maps"]="get_unique_maps"
+["get_dist"]="get_dist"
+["query_config"]="query_config"
+["list_mods"]="list_mods"
+["delete"]="delete_local_mod"
+["show_server_modlist"]="show_server_modlist"
+["is_in_favs"]="is_in_favs"
+["show_log"]="show_log"
+["gen_log"]="generate_log"
+["open_workshop_page"]="open_workshop_page"
+["Add to my servers"]="update_favs_from_table"
+["Remove from favorites"]="update_favs_from_table"
+["Remove from history"]="remove_from_history"
+["force_update"]="force_update"
+["Handshake"]="final_handshake"
+)
+
+validate_and_connect(){
+ local context="$1"
+ local addr="$2"
+
+ local record
+ case "$context" in
+ "Connect by ID")
+ if [[ -z "$api_key" ]]; then
+ printf "No Battlemetrics API key set"
+ return 4
+ fi
+ record=$(map_id_to_ip "$addr")
+ if [[ $? -eq 1 ]]; then
+ logger WARN "Not a valid record: '$addr'"
+ printf "Not a valid ID"
+ return 2
+ fi
+ logger INFO "Battlemetrics ID resolved to IP $record"
+ ;;
+ "Connect by IP")
+ if [[ $(validate_ip "$addr") -eq 1 ]]; then
+ printf "Not a valid IP format. Supply IP:Queryport"
+ return 2
+ fi
+ local ip=$(<<< $addr awk -F: '{print $1}')
+ local qport=$(<<< $addr awk -F: '{print $2}')
+ local res
+ res=$(a2s $ip $qport info)
+ if [[ ! $? -eq 0 ]]; then
+ printf "Timed out when querying the server. Is this a valid server?"
+ return 2
+ fi
+ local gameport="$(<<< $res jq -r '.[].gameport')"
+ record="${ip}:${gameport}:${qport}"
+ logger INFO "Record resolved to $record"
+ esac
+ try_connect "$record"
+}
+force_update(){
+ if [[ ! $auto_install -eq 1 ]]; then
+ printf "Only available when mod auto-install is ON"
+ return 1
+ fi
+ #TODO: force update
+ printf "Currently does nothing"
+ return 0
+}
+map_id_to_ip(){
+ local id="$1"
+ local res=$(curl -s "$bm_api" -H "Authorization: Bearer "$api_key"" \
+ -G -d "sort=-players" \
+ -d "filter[game]=$game" \
+ -d "filter[ids][whitelist]=$id")
+ local len=$(<<< "$res" jq '.data|length')
+ [[ $len -eq 0 ]] && return 1
+ local record=$(<<< "$res" jq -r '.data[].attributes|"\(.ip):\(.port):\(.portQuery)"')
+ echo "$record"
+}
+add_record(){
+ local context="$1"
+ local addr="$2"
+ local record
+ if [[ $context != "Add server by ID" ]] && [[ $(validate_ip "$addr") -eq 1 ]]; then
+ printf "Not a valid IP format. Supply IP:Queryport"
+ return 2
+ fi
+ local ip=$(<<< $addr awk -F: '{print $1}')
+ local qport=$(<<< $addr awk -F: '{print $2}')
+ local res
+ res=$(a2s $ip $qport info)
+ if [[ ! $? -eq 0 ]]; then
+ printf "Timed out when querying the server. Is this a valid server?"
+ return 2
+ fi
+ local gameport="$(<<< $res jq -r '.[].gameport')"
+ record="${ip}:${gameport}:${qport}"
+
+ case "$context" in
+ "Add server by IP")
+ if [[ ${ip_list[*]} =~ $record ]]; then
+ printf "Already in favorites list"
+ return 1
+ fi
+ add_to_favs "$record"
+ ;;
+ "Change favorite server")
+ fav_label=$(<<< "$res" jq -r '.[].name')
+ fav_server="$record"
+ update_config
+ return 90
+ ;;
+ "Add server by ID")
+ if [[ -z "$api_key" ]]; then
+ printf "No Battlemetrics API key set"
+ return 4
+ fi
+ record=$(map_id_to_ip "$addr")
+ if [[ $? -eq 1 ]]; then
+ logger WARN "Not a valid record: '$addr'"
+ printf "Not a valid ID"
+ return 2
+ fi
+ logger INFO "Battlemetrics ID resolved to IP $record"
+ if [[ ${ip_list[*]} =~ $record ]]; then
+ printf "Already in favorites list"
+ return 1
+ fi
+ add_to_favs "$record"
+ ;;
+ esac
+}
+connect_by_id(){
+ if [[ $(validate_ip "$addr") -eq 1 ]]; then
+ printf "Not a valid IP format. Supply IP:Queryport"
+ return 2
+ fi
+ local ip=$(<<< $addr awk -F: '{print $1}')
+ local qport=$(<<< $addr awk -F: '{print $2}')
+ local res
+ res=$(a2s $ip $qport info)
+ if [[ ! $? -eq 0 ]]; then
+ printf "Timed out when querying the server. Is this a valid server?"
+ return 2
+ fi
+ #res contains modlist
+}
+initialize_remote_servers(){
+ local file="$_cache_servers"
+ [[ -f $file ]] && rm "$file"
+ local res
+ res=$(get_remote_servers)
+ parse_server_json "$res" >> "$file"
+}
+a2s(){
+ local ip="$1"
+ local qport="$2"
+ local mode="$3"
+ logger INFO "Querying '$ip:$qport' with mode '$mode'"
+ python3 "$query_helper" "$ip" "$qport" "$mode"
+}
+is_in_favs(){
+ shift
+ local record="$1"
+ for (( i = 0; i < ${#ip_list[@]}; i++ )); do
+ if [[ ${ip_list[$i]} == "$record" ]]; then
+ logger INFO "'$record' is in favorites list"
+ return 0
+ fi
+ done
+ return 1
+}
+list_mods(){
+ local symlink
+ local sep
+ local name
+ local base_dir
+ local size
+ if [[ -z $(installed_mods) ]] || [[ -z $(find $workshop_dir -maxdepth 2 -name "*.cpp" | grep .cpp) ]]; then
+ echo "No mods currently installed or incorrect path set."
+ logger WARN "Found no locally installed mods"
+ return 1
+ else
+ for dir in $(find $game_dir/* -maxdepth 1 -type l); do
+ symlink=$(basename $dir)
+ sep="␞"
+ 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=$(echo "scale=4; ($size / 1024) + .005" | bc)
+ printf "%s$sep%s$sep%s$sep%3.3f\n" "$name" "$symlink" "$base_dir" "$size"
+ done | sort -k1
+ fi
+}
+installed_mods(){
+ ls -1 "$workshop_dir"
+}
+open_url(){
+ local context="$1"
+ local url
+ case "$context" in
+ "Help file ⧉")
+ url="$help_url"
+ ;;
+ "Report a bug ⧉")
+ url="$issues_url"
+ ;;
+ "Forum ⧉")
+ url="$forum_url"
+ ;;
+ "Sponsor ⧉")
+ url="$sponsor_url"
+ ;;
+ "Hall of fame ⧉")
+ url="${help_url}#_hall_of_fame"
+ ;;
+ esac
+
+ if [[ -n "$BROWSER" ]]; then
+ "$BROWSER" "$url" 2>/dev/null
+ return
+ fi
+ xdg-open "$url" 2>/dev/null
+}
+local_latlon(){
+ local url="http://ip-api.com/json/$local_ip"
+ local local_ip
+
+ if [[ -z $(command -v dig) ]]; then
+ local_ip=$(curl -Ls "https://ipecho.net/plain")
+ else
+ local_ip=$(dig -4 +short myip.opendns.com @resolver1.opendns.com)
+ fi
+ curl -Ls "$url" | jq -r '"\(.lat)\n\(.lon)"'
+}
+get_dist(){
+ shift
+ local given_ip="$1"
+ readarray -t coords < "$_cache_coords"
+ readarray -t n < <(<<< "$given_ip" awk 'BEGIN{RS="."}{$1=$1}1')
+
+ local local_lat="${coords[0]}"
+ local local_lon="${coords[1]}"
+ local network="^${n[0]}.${n[1]}\."
+ local three="${n[2]}"
+ local host="${n[3]}"
+
+ local binary=$(grep -E "$network" $geo_file)
+ local res=$(<<< "$binary" awk -F[.,] -v three=$three -v host=$host '
+ $3 <=three && $7 >= three{if($3>three || ($3==three && $4 > host) || $7 < three || ($7==three && $8 < host)){next}{print}}' \
+ | awk -F, '{print $7,$8}')
+ local remote_lat=$(<<< "$res" awk '{print $1}')
+ local remote_lon=$(<<< "$res" awk '{print $2}')
+ if [[ -z $remote_lat ]]; then
+ logger WARN "Failed to find geolocation candidate in IP database"
+ local dist="Unknown"
+ printf "Unknown"
+ else
+ logger INFO "Resolved remote server geolocation to '$remote_lat, $remote_lon'"
+ local dist=$($km_helper "$local_lat" "$local_lon" "$remote_lat" "$remote_lon")
+ LC_NUMERIC=C printf "%d" "$dist"
+ logger INFO "Distance: $dist km"
+ fi
+}
+get_remote_servers(){
+ local limit=20000
+ local url="https://api.steampowered.com/IGameServersService/GetServerList/v1/?filter=\appid\221100&limit=$limit&key=$steam_api"
+ curl -Ls "$url" | jq -r '.response.servers'
+}
+get_unique_maps(){
+ shift
+ local context="$1"
+ local filter_file
+ case "$context" in
+ "My saved servers")
+ filter_file="$_cache_my_servers"
+ ;;
+ "Server browser")
+ filter_file="$_cache_servers"
+ ;;
+ "Recent servers")
+ filter_file="$_cache_history"
+ esac
+ logger INFO "Map filter context is: '$context', using cached file at '$filter_file'"
+ < "$filter_file" awk -F$separator '{print $2}' | sort -u
+}
+query_config(){
+ local key="$1"
+ keys=(
+ "branch"
+ "debug"
+ "auto_install"
+ "name"
+ "fav_label"
+ "preferred_client"
+ )
+ if [[ -n $key ]]; then
+ if [[ -n ${!key} ]]; then
+ echo "${!key}"
+ return 0
+ else
+ return 1
+ fi
+ fi
+ for i in "${keys[@]}"; do
+ echo "${!i}"
+ done
+}
+filter_servers(){
+ local filtered="$(< "$1")"
+ shift
+ readarray -t filters < <(printf "%s\n" "$@")
+
+ for ((i=0; i< ${#filters[@]}; ++i)); do
+ if [[ ${filters[$i]} =~ Keyword ]]; then
+ keyword=$(<<< ${filters[$i]} awk -F␞ '{print $2}')
+ elif [[ ${filters[$i]} =~ Map ]]; then
+ map=$(<<< ${filters[$i]} awk -F= '{print $2}')
+ fi
+ done
+
+ filter_ascii(){
+ if [[ ${filters[*]} =~ Non ]]; then
+ echo -n "$filtered"
+ else
+ <<< "$filtered" sed 's/␞/@@DZGUI_PLACEHOLDER@@/g' | grep -v -P '[^[:ascii:]]' | sed 's/@@DZGUI_PLACEHOLDER@@/␞/g'
+ fi
+ }
+ filter_time(){
+ if [[ ${filters[*]} =~ Day ]] && [[ ${filters[*]} =~ Night ]]; then
+ echo -n "$filtered"
+ elif [[ ${filters[*]} =~ Day ]]; then
+ <<< "$filtered" awk -F$separator '$4~/^([0][6-9]:|[1][0-6])/'
+ elif [[ ${filters[*]} =~ Night ]]; then
+ <<< "$filtered" awk -F$separator '$4~/^([1][7-9]:|[2][0-3]:|[0][0-5])/'
+ else
+ echo -n ""
+ fi
+ }
+ filter_perspective(){
+ if [[ ${filters[*]} =~ 1PP ]] && [[ ${filters[*]} =~ 3PP ]]; then
+ echo -n "$filtered"
+ elif [[ ${filters[*]} =~ 1PP ]]; then
+ <<< "$filtered" awk '!/3PP/'
+ elif [[ ${filters[*]} =~ 3PP ]]; then
+ <<< "$filtered" awk '!/1PP/'
+ else
+ echo -n ""
+ fi
+ }
+ filter_lowpop(){
+ if [[ ${filters[*]} =~ Low ]]; then
+ echo -n "$filtered"
+ else
+ <<< "$filtered" awk -F$separator '{if (($5 > 0) && ($5/$6)*100 >=30){print $0}}'
+ fi
+ }
+ filter_full(){
+ if [[ ${filters[*]} =~ Full ]]; then
+ echo -n "$filtered"
+ else
+ <<< "$filtered" awk -F$separator '$5 != $6'
+ fi
+ }
+ filter_empty(){
+ if [[ ${filters[*]} =~ Empty ]]; then
+ echo -n "$filtered"
+ else
+ <<< "$filtered" awk -F$separator '$5 != "0"'
+ fi
+ }
+ filter_map(){
+ if [[ $map == "All maps" ]]; then
+ echo "$filtered"
+ else
+ <<< "$filtered" awk -v var="$map" -F$separator '$2 == var'
+ fi
+ }
+ filter_keyword(){
+ keyword=$(sanitize "$keyword")
+ <<< "$filtered" KEYWORD="$keyword" awk -F$separator 'BEGIN{IGNORECASE=1} $0 ~ ENVIRON["KEYWORD"] {print $0}'
+ }
+ filter_duplicates(){
+ if [[ ${filters[*]} =~ Duplicate ]]; then
+ echo -n "$filtered"
+ else
+ <<< "$filtered" awk -F$separator '!seen[$1]++'
+ fi
+ }
+
+ filtered=$(filter_perspective)
+ filtered=$(filter_full)
+ filtered=$(filter_empty)
+ filtered=$(filter_time)
+ filtered=$(filter_map)
+ filtered=$(filter_lowpop)
+ filtered=$(filter_ascii)
+ filtered=$(filter_duplicates)
+ filtered=$(filter_keyword)
+
+ if [[ -z "$filtered" ]]; then
+ logger WARN "Filter result is empty"
+ echo -n ""
+ return
+ fi
+
+ logger INFO "Returning sorted server list back to UI"
+ printf "%s\n" "$filtered" | sort -k1
+}
+sanitize(){
+ echo "$1" | sed \
+ -e 's/\//\\\//g' \
+ -e 's/\$/\\$/g' \
+ -e 's/\[/\\[/g' \
+ -e 's/\]/\\]/g' \
+ -e 's/\#/\\#/g' \
+ -e 's/\./\\./g' \
+ -e 's/\^/\\^/g' \
+ -e 's/\=/\\=/g' \
+ -e 's/|/\\|/g' \
+ -e 's/\+/\\+/g' \
+ -e 's/(/\\(/g' \
+ -e 's/)/\\)/g'
+}
+parse_server_json(){
+ local response="$1"
+ <<< "$response" jq -r '
+ .[]|"\(.name)␞" +
+ "\(.map|if type == "string" then ascii_downcase else "null" end)␞" +
+ "\(if .gametype == null then "null" else (.gametype|split(",")|if any(. == "no3rd") then "1PP" else "3PP" end) end)␞" +
+ "\(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)␞" +
+ "\(.addr|split(":")[0]):\(if .gameport == null then "XXXX" else .gameport end)␞" +
+ "\(.addr|split(":")[1])"
+ ' | sort -k1
+}
+delete_local_mod(){
+ shift
+ local symlink="$1"
+ local dir="$2"
+ [[ ! -d $workshop_dir/$dir ]] && return 1
+ [[ ! -L $game_dir/$symlink ]] && return 1
+ #SC2115
+ rm -rf "${workshop_dir:?}/$dir" && unlink "$game_dir/$symlink" || return 1
+}
+dump_servers(){
+ local context="$1"
+ local subcontext="$2"
+ local ip
+ local qport
+ local res
+ _iterate(){
+ local file="$1"
+ shift
+ for server in "$@"; do
+ ip=$(<<< $server awk -F: '{print $1}')
+ qport=$(<<< $server awk -F: '{print $3}')
+ res=$(a2s "$ip" "$qport" info)
+ if [[ ! $? -eq 0 ]]; then
+ continue
+ fi
+ parse_server_json "$res" >> "$file"
+ done
+ }
+ case "$subcontext" in
+ *Server[[:space:]]browser*)
+ local file="$_cache_servers"
+ if [[ ! $subcontext =~ Name ]]; then
+ initialize_remote_servers
+ fi
+ ;;
+ *My[[:space:]]saved[[:space:]]servers*)
+ local file="$_cache_my_servers"
+ if [[ ! $subcontext =~ Name ]]; then
+ [[ -f $file ]] && rm $file
+ _iterate "$file" "${ip_list[@]}"
+ fi
+ ;;
+ *Recent[[:space:]]servers*)
+ local file="$_cache_history"
+ if [[ ! $subcontext =~ Name ]]; then
+ [[ -f $file ]] && rm $file
+ readarray -t iters < <(cat $history_file)
+ _iterate "$file" "${iters[@]}"
+ fi
+ ;;
+ esac
+ shift
+ logger INFO "Server context is '$subcontext', reading from file '$file'"
+ filter_servers "$file" "$@"
+}
+logger(){
+ local date="$(date "+%F %T,%3N")"
+ local tag="$1"
+ local string="$2"
+ local self="${BASH_SOURCE[0]}"
+ local caller="${FUNCNAME[1]}"
+ local line="${BASH_LINENO[0]}"
+ printf "%s␞%s␞%s::%s()::%s␞%s\n" "$date" "$tag" "$self" "$caller" "$line" "$string" >> "$debug_log"
+}
+show_server_modlist(){
+ shift
+ local ip="$1"
+ local qport="$2"
+ local res=$(a2s $ip $qport names)
+ [[ -z $res ]] && return 1
+ [[ $(<<< $res jq '.ids|length') -lt 1 ]] && return 1
+ local names=$(<<< "$res" jq -r '.names[]')
+ local ids=$(<<< "$res" jq -r '.ids[]')
+ local icon
+ local flag
+ local label
+ readarray -t names <<< "$names"
+ readarray -t ids <<< "$ids"
+ readarray -t mods < <(installed_mods)
+ for ((i=0; i<${#ids[@]}; ++i)); do
+ icon=
+ flag="WARN"
+ label="MISSING"
+ for j in "${mods[@]}"; do
+ if [[ $j == "${ids[$i]}" ]]; then
+ icon=✓
+ flag="INFO"
+ label="installed"
+ break
+ fi
+ done
+ logger $flag "Mod '${names[$i]}' is $label"
+ printf "%s␞%s␞%s\n" "${names[$i]}" "${ids[i]}" "$icon"
+ done | sort -k1
+}
+print_ip_list(){
+ [[ ${#ip_list[@]} -eq 0 ]] && return 1
+ printf "\t\"%s\"\n" "${ip_list[@]}"
+}
+write_config(){
+cat <<-END
+#Path to DayZ installation
+steam_path="$steam_path"
+
+#Battlemetrics API key
+api_key="$api_key"
+
+#Favorited server IP:PORT array
+ip_list=(
+$(print_ip_list)
+)
+
+#Favorite server to fast-connect to (limit one)
+fav_server="$fav_server"
+
+#Favorite server label (human readable)
+fav_label="$fav_label"
+
+#Custom player name (optional, required by some servers)
+name="$name"
+
+#Set to 1 to perform dry-run and print launch options
+debug="$debug"
+
+#Toggle stable/testing branch
+branch="$branch"
+
+#Last seen news item
+seen_news="$seen_news"
+
+#Steam API key
+steam_api="$steam_api"
+
+#Auto-install mods
+auto_install="$auto_install"
+
+#Automod staging directory
+staging_dir="$staging_dir"
+
+#Path to default Steam client
+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(){
+ echo FORMAT
+ case "$branch" in
+ "stable")
+ version_url="$stable_url/dzgui.sh"
+ ;;
+ "testing")
+ version_url="$testing_url/dzgui.sh"
+ ;;
+ esac
+ echo "$version_url"
+}
+download_new_version(){
+ local version_url="$(format_version_url)"
+ mv "$src_path" "$src_path.old"
+ curl -Ls "$version_url" > "$src_path"
+ rc=$?
+ if [[ $rc -eq 0 ]]; then
+ logger INFO "Wrote new version to $src_path"
+ chmod +x "$src_path"
+ touch "${config_path}.unmerged"
+ printf "New version downloaded. Please exit to apply changes"
+ logger INFO "User exited after version upgrade"
+ return 255
+ else
+ mv "$src_path.old" "$src_path"
+ printf "Failed to fetch new version. Rolling back"
+ logger WARN "curl failed to fetch new version. Rolling back"
+ return 1
+ fi
+ dl_changelog
+}
+dl_changelog(){
+ local mdbranch
+ local file="CHANGELOG.md"
+ [[ $branch == "stable" ]] && mdbranch="dzgui"
+ [[ $branch == "" ]] && mdbranch="testing"
+ local md="https://raw.githubusercontent.com/$author/$repo/${mdbranch}/$file"
+ curl -Ls "$md" > "$state_path/$file"
+}
+toggle(){
+ shift
+ local context="$1"
+ case "$context" in
+ Toggle[[:space:]]release[[:space:]]branch)
+ if [[ $branch == "stable" ]]; then
+ branch="testing"
+ else
+ branch="stable"
+ fi
+ update_config
+ download_new_version
+ ;;
+ Toggle[[:space:]]mod[[:space:]]install[[:space:]]mode)
+ if [[ -z $auto_install ]]; then
+ staging_dir="/tmp"
+ auto_install="1"
+ else
+ auto_install=""
+ fi
+ ;;
+ Toggle[[:space:]]debug[[:space:]]mode)
+ if [[ -z $debug ]]; then
+ debug="1"
+ else
+ debug=""
+ fi
+ ;;
+ Toggle[[:space:]]Steam/Flatpak)
+ if [[ $preferred_client == "steam" ]]; then
+ preferred_client="flatpak"
+ else
+ preferred_client="steam"
+ fi
+ esac
+ update_config
+
+}
+add_to_favs(){
+ local record="$1"
+ ip_list+=("$record")
+ update_config
+ logger INFO "Added the record $record to saved servers"
+}
+remove_from_history(){
+ shift
+ local record="$1"
+ # remove ip from history file
+ local hist_cache=$(< "$history_file")
+ <<< "$hist_cache" grep -v "$record" > "$history_file"
+ # update cache
+ local cache=$(< "$_cache_history")
+ local r=$(<<< "$record" awk -F: '{print $1":"$2"␞"$3}')
+ <<< "$cache" grep -v -P "$r$" > "$_cache_history"
+}
+remove_from_favs(){
+ local record="$1"
+ for (( i=0; i<${#ip_list[@]}; ++i )); do
+ if [[ ${ip_list[$i]} == "$record" ]]; then
+ unset ip_list[$i]
+ break
+ fi
+ done
+ if [[ ${#ip_list} -gt 0 ]]; then
+ readarray -t ip_list < <(printf "%s\n" "${ip_list[@]}")
+ fi
+ update_config
+ local r=$(<<< "$record" awk -F: '{print $1":"$2"␞"$3}')
+ local cache="$(< "$_cache_my_servers")"
+ <<< "$cache" grep -v -P "$r$" > $_cache_my_servers
+ logger INFO "Removed the record $record from saved servers"
+}
+update_favs_from_table(){
+ local context="$1"
+ local record="$2"
+ if [[ $context =~ Remove ]]; then
+ remove_from_favs "$record"
+ else
+ add_to_favs "$record"
+ fi
+ return 0
+}
+update_config(){
+ # handling for legacy files
+ [[ -z $branch ]] && branch="stable"
+ mv $config_file ${config_file}.old
+ write_config > $config_file
+ if [[ $? -eq 0 ]]; then
+ printf "Updated config file"
+ return 90
+ else
+ return 1
+ fi
+ logger INFO "Updated config file at '$config_file'"
+}
+validate_ip(){
+ local ip="$1"
+ local res
+ <<< "$ip" grep -qP '^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}:[0-9]+$' && echo 0 || echo 1
+}
+test_steam_api(){
+ local key="$1"
+ [[ -z $key ]] && return 1
+ local url="https://api.steampowered.com/IGameServersService/GetServerList/v1/?filter=\appid\221100&limit=10&key=$key"
+ local code=$(curl -ILs "$url" | grep -E "^HTTP")
+ [[ $code =~ 403 ]] && echo 1
+ [[ $code =~ 200 ]] && echo 0
+}
+test_bm_api(){
+ local key="$1"
+ if [[ ! $key =~ ^[0-9]+$ ]]; then
+ return
+ fi
+ [[ -z $key ]] && return 1
+ local code=$(curl -ILs "$bm_api" \
+ -H "Authorization: Bearer "$key"" -G \
+ -d "filter[game]=$game" \
+ | grep -E "^HTTP")
+ [[ $code =~ 401 ]] && echo 1
+ [[ $code =~ 200 ]] && echo 0
+}
+update_config_val(){
+ local context="$1"
+ local value="$2"
+ case $1 in
+ "Change player name")
+ key="name"
+ ;;
+ "Change Steam API key")
+ key="steam_api"
+ if [[ ${#value} -lt 32 ]] || [[ $(test_steam_api "$value") -eq 1 ]]; then
+ printf "Invalid API key"
+ return 2
+ fi
+ ;;
+ "Change Battlemetrics API key")
+ key="api_key"
+ if [[ $(test_bm_api "$value") -eq 1 ]]; then
+ printf "Invalid API key"
+ return 2
+ fi
+ ;;
+ esac
+ declare -n nr=$key
+ nr="$value"
+ update_config
+}
+show_log(){
+ < "$debug_log" sed 's/Keyword␞/Keyword/'
+}
+open_workshop_page(){
+ shift
+ local id="$1"
+ local workshop_uri="steam://url/CommunityFilePage/$id"
+ $steam_cmd "$workshop_uri" $id
+}
+open_link(){
+ shift
+ local destination="$1"
+ local url
+ case "$destination" in
+ "Open Battlemetrics")
+ url="$battlemetrics_server_url"
+ ;;
+ "Open Steam API page")
+ url="$steam_api_url"
+ ;;
+ "Open Battlemetrics API page")
+ url="$battlemetrics_api_url"
+ ;;
+ esac
+
+#if [[ $is_steam_deck -eq 1 ]]; then
+#$steam_cmd steam://openurl/"$1" 2>/dev/null
+ if [[ -n "$BROWSER" ]]; then
+ logger INFO "Opening '$url' in '$BROWSER'"
+ "$BROWSER" "$url"
+ else
+ logger INFO "Opening '$url' with xdg-open"
+ xdg-open "$url"
+ fi
+}
+
+quick_connect(){
+ if [[ -z $fav_server ]]; then
+ printf "No favorite server currently set"
+ return 1
+ fi
+ try_connect "$fav_server"
+}
+connect_from_table(){
+ shift
+ local record="$1"
+ try_connect "$record"
+}
+pretty_print(){
+ while read -r line; do
+ printf "\t%s\n" "$line"
+ done < "$@"
+}
+generate_log(){
+ source $config_file
+ cat <<-DOC > $system_log
+ Distro: $(< /etc/os-release grep -w NAME | awk -F\" '{print $2}')
+ Kernel: $(uname -mrs)
+ Version: $version
+ Branch: $branch
+ Mode: $(if [[ -z $debug ]]; then echo normal; else echo debug; fi)
+ Auto: $(if [[ -z $auto_install ]]; then echo normal; else echo auto; fi)
+ Steam path: $steam_path
+ Workshop path: $workshop_dir
+ Game path: $game_dir
+ Servers:
+$(print_ip_list | sed 's/"//g')
+ Mods:
+$(list_mods | sed 's/^/\t/g')
+ DOC
+ printf "Wrote system log to %s" "$system_log"
+ return 0
+}
+query_defunct(){
+ readarray -t modlist <<< "$@"
+ local max=${#modlist[@]}
+ concat(){
+ for ((i=0;i<$max;i++)); do
+ echo "publishedfileids[$i]=${modlist[$i]}&"
+ done | awk '{print}' ORS=''
+ }
+ payload(){
+ echo -e "itemcount=${max}&$(concat)"
+ }
+ post(){
+ curl -s \
+ -X POST \
+ -H "Content-Type:application/x-www-form-urlencoded"\
+ -d "$(payload)" 'https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1/?format=json'
+ }
+ local result=$(post | jq -r '.[].publishedfiledetails[] | select(.result==1) | "\(.file_size) \(.publishedfileid)"')
+ local result2=$(post | jq -r '')
+ echo "$result2" > $HOME/json
+ <<< "$result" awk '{print $2}'
+}
+encode(){
+ echo "$1" | md5sum | cut -c -8
+}
+compare(){
+ local modlist="$@"
+ diff=$(comm -23 <(<<< "$modlist" sort -u) <(installed_mods | sort))
+ echo "$diff"
+}
+legacy_symlinks(){
+ for d in "$game_dir"/*; do
+ if [[ $d =~ @[0-9]+-.+ ]]; then
+ unlink "$d"
+ fi
+ done
+ for d in "$workshop_dir"/*; do
+ local id=$(awk -F"= " '/publishedid/ {print $2}' "$d"/meta.cpp | awk -F\; '{print $1}')
+ local encoded_id=$(echo "$id" | awk '{printf("%c",$1)}' | base64 | sed 's/\//_/g; s/=//g; s/+/]/g')
+ if [[ -h "$game_dir/@$encoded_id" ]]; then
+ unlink "$game_dir/@$encoded_id"
+ fi
+ done
+}
+symlinks(){
+ for d in "$workshop_dir"/*; do
+ id=$(awk -F"= " '/publishedid/ {print $2}' "$d"/meta.cpp | awk -F\; '{print $1}')
+ encoded_id=$(encode "$id")
+ link="@$encoded_id"
+ if [[ -h "$game_dir/$link" ]]; then
+ logger INFO "Symlink already exists: '$link' for mod '$id'"
+ continue
+ fi
+ ln -fs "$d" "$game_dir/$link"
+ logger INFO "Created symlink '$link' for mod '$id'"
+ done
+}
+update_history(){
+ local record="$1"
+ local old
+ [[ -n $(grep "$record" $history_file) ]] && return
+ if [[ -f $history_file ]]; then
+ old=$(tail -n9 "$history_file")
+ rm $history_file
+ echo "$old" > "$history_file"
+ fi
+ echo "$record" >> "$history_file"
+}
+update_symlinks(){
+ legacy_symlinks
+ symlinks
+}
+try_connect(){
+ local record="$1"
+ local ip=$(<<< $record awk -F: '{print $1}')
+ local gameport=$(<<< $record awk -F: '{print $2}')
+ local qport=$(<<< $record awk -F: '{print $3}')
+ local remote_mods
+ 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=$(query_defunct "$remote_mods")
+ local diff=$(compare "$sanitized_mods")
+
+ logger INFO "Connection attempt for $ip:$qport"
+ update_history "$record"
+ #
+ if [[ -n $auto_install ]]; then
+ #TODO: remove when ready
+ printf "Auto install mode currently disabled"
+ return 1
+ fi
+ #TODO: publishedfileid,timestamp
+ #if [[ -z $auto_install ]]; then
+ # merge_modlists
+ #fi
+ #
+ if [[ -n $diff ]]; then
+ if [[ $is_steam_deck -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";;
+ 1|2) auto_mod_install "$ip" "$gameport" "$diff" "$sanitized_mods" ;;
+ esac
+ else
+ launch "$ip" "$gameport" "$sanitized_mods"
+ fi
+}
+concat_mods(){
+ readarray -t concat_arr <<< "$@"
+ local id
+ local encoded_id
+ local link
+ for i in "${concat_arr[@]}"; do
+ id=$(awk -F"= " '/publishedid/ {print $2}' "$workshop_dir"/$i/meta.cpp | awk -F\; '{print $1}')
+ encoded_id=$(encode $id)
+ link="@$encoded_id;"
+ echo -e "$link"
+ done | tr -d '\n' | perl -ple 'chop'
+}
+is_dayz_running(){
+ local proc=$(ps aux | grep "DayZ.*\.exe" | grep -v grep)
+ if [[ -n $proc ]]; then
+ echo 1
+ else
+ echo 0
+ fi
+}
+launch(){
+ local ip="$1"
+ local gameport="$2"
+ local mods="$3"
+ local concat
+ if [[ -n $mods ]]; then
+ concat=$(concat_mods "$mods")
+ else
+ concat=""
+ fi
+
+ update_symlinks
+ if [[ $debug -eq 1 ]]; then
+ local launch_options="$steam_cmd -applaunch $aid -connect=$ip:$gameport -nolauncher -nosplash -name=$name -skipintro \"-mod=$concat\""
+ printf "Dry-run mode: these options would have been used to launch the game: $launch_options"
+ return 0
+ fi
+ echo "$concat" > "$_cache_launch"
+ echo "$ip:$gameport" > "$_cache_address"
+ printf "Launch conditions satisfied. DayZ will now launch after you confirm this dialog."
+ return 100
+}
+final_handshake(){
+ local saved_mods=$(< "$_cache_launch")
+ local saved_address=$(< "$_cache_address")
+ local res=$(is_dayz_running)
+ if [[ $res -eq 1 ]]; then
+ printf "Is DayZ already running? DZGUI cannot launch DayZ if another process is using it."
+ return 1
+ fi
+ $steam_cmd -applaunch $aid -connect=$saved_address -nolauncher -nosplash -skipintro -name=$name \"-mod=$saved_mods\" &
+ until [[ $(is_dayz_running) -eq 1 ]]; do
+ sleep 0.1s
+ done
+ return 6
+}
+manual_mod_install(){
+ local ip="$1"
+ local gameport="$2"
+ local diff="$3"
+ local sanitized_mods="$4"
+ local ex="$state_path/dzg.watcher"
+
+ readarray -t stage_mods <<< "$diff"
+ [[ -f $ex ]] && rm $ex
+
+ _watcher(){
+ for((i=0;i<${#stage_mods[@]};i++)); do
+ [[ -f $ex ]] && return 1
+ log ${stage_mods[$i]}
+
+ $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."
+ 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
+ echo "# Steam is downloading ${stage_mods[$i]} (mod $((i+1)) of ${#stage_mods[@]})"
+ 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)
+
+ # compare latest installed mods to modlist
+ local diff=$(compare "$sanitized_mods")
+ if [[ -z $diff ]]; then
+ launch "$ip" "$gameport" "$sanitized_mods"
+ else
+ printf "Some mods may have failed to download. Try connecting again to resync"
+ exit 1
+ fi
+}
+test_display_mode(){
+ pgrep -a gamescope | grep -q "generate-drm-mode"
+ if [[ $? -eq 0 ]]; then
+ echo gm
+ else
+ echo dm
+ fi
+}
+foreground(){
+ if [[ $(command -v wmctrl) ]]; then
+ wmctrl -a "DZG Watcher"
+ else
+ local wid=$(xdotool search --name "DZG Watcher")
+ xdotool windowactivate $wid
+ fi
+}
+main(){
+ local params="$(printf '"%s", ' "$@")"
+ logger INFO "Received request from UI constructor with params [${params::-2}]"
+ func=${funcs["$1"]}
+ [[ -z $func ]] && return 1
+ if [[ -z $2 ]]; then
+ shift
+ $func
+ else
+ $func "$@"
+ fi
+}
+main "$@"
diff --git a/helpers/query_v2.py b/helpers/query_v2.py
new file mode 100644
index 0000000..4ed62e9
--- /dev/null
+++ b/helpers/query_v2.py
@@ -0,0 +1,75 @@
+import sys
+import a2s
+import math
+import json
+from a2s import dayzquery
+sys.path.append('a2s')
+
+def get_info(ip, qport):
+ try:
+ info = a2s.info((ip, int(qport)))
+
+ name = info.server_name
+ map = info.map_name
+ address = ip + ":" + qport
+ gameport = str(info.port)
+ players = info.player_count
+ max_players = info.max_players
+ keywords = info.keywords
+ ping = (info.ping*1000)
+ ping = math.floor(ping)
+
+ res = {}
+
+ res['name'] = name
+ res['map'] = map
+ res['gametype'] = keywords
+ res['players'] = players
+ res['max_players'] = max_players
+ res['addr'] = address
+ res['gameport'] = gameport
+ res['stat'] = "online"
+ res['qport'] = qport
+ res['ping'] = str(ping) + "ms"
+
+ j = json.dumps([res])
+
+ print(j)
+ except:
+ sys.exit(1)
+
+def get_rules(ip, qport):
+ try:
+ mods = dayzquery.dayz_rules((ip, int(qport))).mods
+ for k in mods:
+ print(k.workshop_id)
+ except:
+ sys.exit(1)
+
+def get_names(ip, qport):
+ try:
+ mods = dayzquery.dayz_rules((ip, int(qport))).mods
+ ids = []
+ names = []
+ for mod in mods:
+ names.append(mod.name)
+ ids.append(mod.workshop_id)
+ res = {}
+ res['names'] = names
+ res['ids'] = ids
+ j = json.dumps(res)
+ print(j)
+ except:
+ sys.exit(1)
+
+ip = sys.argv[1]
+qport = sys.argv[2]
+mode = sys.argv[3]
+
+match mode:
+ case "info":
+ get_info(ip, qport)
+ case "rules":
+ get_rules(ip, qport)
+ case "names":
+ get_names(ip, qport)
diff --git a/helpers/ui.py b/helpers/ui.py
new file mode 100644
index 0000000..ebc044d
--- /dev/null
+++ b/helpers/ui.py
@@ -0,0 +1,1635 @@
+import csv
+import gi
+import locale
+import logging
+import os
+import signal
+import multiprocessing
+import re
+import subprocess
+import sys
+import threading
+import time
+
+locale.setlocale(locale.LC_ALL, '')
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk, GLib, Gdk, GObject, Pango
+
+# 5.0.0-rc.1
+app_name = "DZGUI"
+
+cache = {}
+config_vals = []
+stored_keys = []
+toggled_checks = []
+server_filters = []
+delimiter = "␞"
+selected_map = ["Map=All maps"]
+keyword_filter = ["Keyword%s" %(delimiter)]
+
+checks = list()
+map_store = Gtk.ListStore(str)
+row_store = Gtk.ListStore(str)
+modlist_store = Gtk.ListStore(str, str, str)
+# Name, Symlink, ID, Size
+mod_store = Gtk.ListStore(str, str, str, float)
+# Timestamp, Flag, Trace, Message
+log_store = Gtk.ListStore(str, str, str, str)
+# Name, Map, Perspective, Gametime, Players, Max, IP, Qport
+server_store = Gtk.ListStore(str, str, str, str, int, int, str, int)
+
+default_tooltip = "Select a row to see its detailed description"
+server_tooltip = [None, None]
+
+user_path = os.path.expanduser('~')
+state_path = '%s/.local/state/dzgui' %(user_path)
+helpers_path = '%s/.local/share/dzgui/helpers' %(user_path)
+log_path = '%s/logs' %(state_path)
+changelog_path = '%s/CHANGELOG.md' %(state_path)
+funcs = '%s/funcs' %(helpers_path)
+
+logger = logging.getLogger(__name__)
+log_file = '%s/DZGUI_DEBUG.log' %(log_path)
+system_log = '%s/DZGUI_SYSTEM.log' %(log_path)
+FORMAT = "%(asctime)s␞%(levelname)s␞%(filename)s::%(funcName)s::%(lineno)s␞%(message)s"
+logging.basicConfig(filename=log_file,
+ format=FORMAT,
+level=logging.DEBUG)
+
+browser_cols = [
+ "Name",
+ "Map",
+ "Perspective",
+ "Gametime",
+ "Players",
+ "Maximum",
+ "IP",
+ "Qport",
+]
+mod_cols = [
+ "Mod",
+ "Symlink",
+ "Dir",
+ "Size (MiB)"
+]
+log_cols = [
+ "Timestamp",
+ "Flag",
+ "Traceback",
+ "Message"
+]
+connect = [
+ ("Server browser",),
+ ("My saved servers",),
+ ("Quick-connect to favorite server",),
+ ("Recent servers",),
+ ("Connect by IP",),
+ ("Connect by ID",)
+]
+manage = [
+ ("Add server by IP",),
+ ("Add server by ID",),
+ ("Change favorite server",),
+]
+options = [
+ ("List installed mods",),
+ ("Toggle release branch",),
+ ("Toggle mod install mode",),
+ ("Toggle Steam/Flatpak",),
+ ("Change player name",),
+ ("Change Steam API key",),
+ ("Change Battlemetrics API key",),
+ ("Force update local mods",),
+ ("Output system info to log file",)
+]
+help = [
+ ("View changelog",),
+ ("Show debug log",),
+ ("Help file ⧉",),
+ ("Report a bug ⧉",),
+ ("Forum ⧉",),
+ ("Sponsor ⧉",),
+ ("Hall of fame ⧉",),
+]
+filters = {
+ "1PP": True,
+ "3PP": True,
+ "Day": True,
+ "Night": True,
+ "Empty": False,
+ "Full": False,
+ "Low population": True,
+ "Non-ASCII": False,
+ "Duplicate names": False
+}
+side_buttons = [
+ "Connect",
+ "Manage",
+ "Options",
+ "Help",
+ "Exit"
+]
+status_tooltip = {
+ "Server browser": "Used to browse the global server list",
+ "My saved servers": "Browse your saved servers",
+ "Quick-connect to favorite server": "Connect to your favorite server",
+ "Recent servers": "Shows the last 10 servers you connected to",
+ "Connect by IP": "Connect to a server by IP",
+ "Connect by ID": "Connect to a server by Battlemetrics ID",
+ "Add server by IP": "Add a server by IP",
+ "Add server by ID": "Add a server by Battlemetrics ID",
+ "Change favorite server": "Update your quick-connect server",
+ "List installed mods": "Browse a list of locally-installed mods",
+ "Toggle release branch": "Switch between stable and testing branches",
+ "Toggle mod install mode": "Switch between manual and auto mod installation",
+ "Toggle Steam/Flatpak": "Switch the preferred client to use for launching DayZ",
+ "Change player name": "Update your in-game name (required by some servers)",
+ "Change Steam API key": "Can be used if you revoked an old API key",
+ "Change Battlemetrics API key": "Can be used if you revoked an old API key",
+ "Force update local mods": "Attempts to update any local mods out of synch with remote versions (experimental)",
+ "Output system info to log file": "Generates a system log for troubleshooting",
+ "View changelog": "Opens the DZGUI changelog in a dialog window",
+ "Show debug log": "Read the DZGUI log generated since startup",
+ "Help file ⧉": "Opens the DZGUI documentation in a browser",
+ "Report a bug ⧉": "Opens the DZGUI issue tracker in a browser",
+ "Forum ⧉": "Opens the DZGUI discussion forum in a browser",
+ "Sponsor ⧉": "Sponsor the developer of DZGUI",
+ "Hall of fame ⧉": "A list of significant contributors and testers",
+}
+
+
+def format_distance(distance):
+ if distance == "Unknown":
+ distance = "| Distance: %s" %(distance)
+ else:
+ d = int(distance)
+ formatted = f'{d:n}'
+ distance = "| Distance: %s km" %(formatted)
+ return distance
+
+
+def set_surrounding_margins(widget, margin):
+ widget.set_margin_top(margin)
+ widget.set_margin_start(margin)
+ widget.set_margin_end(margin)
+
+
+def parse_modlist_rows(data):
+ lines = data.stdout.splitlines()
+ hits = len(lines)
+ reader = csv.reader(lines, delimiter=delimiter)
+ try:
+ rows = [[row[0], row[1], row[2]] for row in reader if row]
+ except IndexError:
+ return 1
+ for row in rows:
+ modlist_store.append(row)
+ return hits
+
+def parse_log_rows(data):
+ lines = data.stdout.splitlines()
+ reader = csv.reader(lines, delimiter=delimiter)
+ try:
+ rows = [[row[0], row[1], row[2], row[3]] for row in reader if row]
+ except IndexError:
+ return 1
+ for row in rows:
+ log_store.append(row)
+
+def parse_mod_rows(data):
+ # GTK pads trailing zeroes on floats
+ # https://stackoverflow.com/questions/26827434/gtk-cellrenderertext-with-format
+ sum = 0
+ lines = data.stdout.splitlines()
+ hits = len(lines)
+ reader = csv.reader(lines, delimiter=delimiter)
+ try:
+ rows = [[row[0], row[1], row[2], locale.atof(row[3], func=float)] for row in reader if row]
+ except IndexError:
+ return 1
+ for row in rows:
+ mod_store.append(row)
+ size = float(row[3])
+ sum += size
+ return [sum, hits]
+
+
+def parse_server_rows(data):
+ sum = 0
+ lines = data.stdout.splitlines()
+ reader = csv.reader(lines, delimiter=delimiter)
+ hits = len(lines)
+ try:
+ rows = [[row[0], row[1], row[2], row[3], int(row[4]), int(row[5]), row[6], int(row[7])] for row in reader if row]
+ except IndexError:
+ return 1
+ for row in rows:
+ server_store.append(row)
+ players = int(row[4])
+ sum += players
+ return [sum, hits]
+
+
+def query_config(widget, key=""):
+ proc = call_out(widget, "query_config", key)
+ config = list(proc.stdout.splitlines())
+ return (config)
+
+
+def call_out(widget, command, *args):
+ if widget is not None:
+ widget_name = widget.get_name()
+ try:
+ widget_name = widget_name.split('+')[1]
+ match widget_name:
+ case "TreeView":
+ context = widget.get_first_col()
+ case "ScrollableTree":
+ context = widget.treeview.get_first_col()
+ case "OuterWindow":
+ context = widget.grid.scrollable_treelist.treeview.get_first_col()
+ case "Grid":
+ context = widget.scrollable_treelist.treeview.get_first_col()
+ except IndexError:
+ context = "Generic"
+ else:
+ context = "Generic"
+
+ arg_ar = []
+ for i in args:
+ arg_ar.append(i)
+ logger.info("Context '%s' calling subprocess '%s' with args '%s'" %(context, command, arg_ar))
+ proc = subprocess.run(["/usr/bin/env", "bash", funcs, command] + arg_ar, capture_output=True, text=True)
+ return proc
+
+
+def spawn_dialog(transient_parent, msg, mode):
+ dialog = GenericDialog(transient_parent, msg, mode)
+ response = dialog.run()
+ dialog.destroy()
+ match response:
+ case Gtk.ResponseType.OK:
+ logger.info("User confirmed dialog with message '%s'" %(msg))
+ return 0
+ case Gtk.ResponseType.CANCEL | Gtk.ResponseType.DELETE_EVENT:
+ logger.info("User aborted dialog with message '%s'" %(msg))
+ return 1
+
+
+def process_shell_return_code(transient_parent, msg, code, original_input):
+ match code:
+ #TODO: add logger output to each
+ case 0:
+ # success with notice popup
+ spawn_dialog(transient_parent, msg, "NOTIFY")
+ pass
+ case 1:
+ # error with notice popup
+ if msg == "":
+ msg = "Something went wrong"
+ spawn_dialog(transient_parent, msg, "NOTIFY")
+ pass
+ case 2:
+ # warn and recurse (e.g. validation failed)
+ spawn_dialog(transient_parent, msg, "NOTIFY")
+ treeview = transient_parent.grid.scrollable_treelist.treeview
+ process_tree_option(original_input, treeview)
+ case 4:
+ # for BM only
+ spawn_dialog(transient_parent, msg, "NOTIFY")
+ treeview = transient_parent.grid.scrollable_treelist.treeview
+ process_tree_option(["Options", "Change Battlemetrics API key"], treeview)
+ case 5:
+ # for steam only
+ spawn_dialog(transient_parent, msg, "NOTIFY")
+ treeview = transient_parent.grid.scrollable_treelist.treeview
+ process_tree_option(["Options", "Change Steam API key"], treeview)
+ case 6:
+ # return silently
+ pass
+ case 90:
+ # used to update configs and metadata in-place
+ treeview = transient_parent.grid.scrollable_treelist.treeview
+ col = treeview.get_column_at_index(0)
+ config_vals.clear()
+ for i in query_config(None):
+ config_vals.append(i)
+ tooltip = format_metadata(col)
+ transient_parent.grid.update_statusbar(tooltip)
+ spawn_dialog(transient_parent, msg, "NOTIFY")
+ return
+ case 100:
+ # final handoff before launch
+ final_conf = spawn_dialog(transient_parent, msg, "CONFIRM")
+ treeview = transient_parent.grid.scrollable_treelist.treeview
+ if final_conf == 1 or final_conf is None:
+ return
+ process_tree_option(["Handshake", ""], treeview)
+ case 255:
+ spawn_dialog(transient_parent, "Update complete. Please close DZGUI and restart.", "NOTIFY")
+ Gtk.main_quit()
+
+
+def process_tree_option(input, treeview):
+ context = input[0]
+ command = input[1]
+ logger.info("Parsing tree option '%s' for the context '%s'" %(command, context))
+
+ transient_parent = treeview.get_outer_window()
+ toggle_contexts = ["Toggle mod install mode", "Toggle release branch", "Toggle Steam/Flatpak"]
+
+ def call_on_thread(bool, subproc, msg, args):
+ def _background(subproc, args, dialog):
+ def _load():
+ wait_dialog.destroy()
+ msg = proc.stdout
+ rc = proc.returncode
+ logger.info("Subprocess returned code %s with message '%s'" %(rc, msg))
+ process_shell_return_code(transient_parent, msg, rc, input)
+ proc = call_out(transient_parent, subproc, args)
+ GLib.idle_add(_load)
+ if bool is True:
+ wait_dialog = GenericDialog(transient_parent, msg, "WAIT")
+ wait_dialog.show_all()
+ thread = threading.Thread(target=_background, args=(subproc, args, wait_dialog))
+ thread.start()
+ else:
+ # False is used to bypass wait dialogs
+ proc = call_out(transient_parent, subproc, args)
+ rc = proc.returncode
+ msg = proc.stdout
+ process_shell_return_code(transient_parent, msg, rc, input)
+
+
+ match context:
+ case "Help":
+ if command == "View changelog":
+ diag = ChangelogDialog(transient_parent, '', "Changelog -- content can be scrolled")
+ diag.run()
+ diag.destroy()
+ else:
+ # non-blocking subprocess
+ subprocess.Popen(['/usr/bin/env', 'bash', funcs, "Open link", command])
+ case "Handshake":
+ call_on_thread(True, context, "Waiting for DayZ", command)
+ case _:
+ if command == "Output system info to log file":
+ call_on_thread(True, "gen_log", "Generating log", "")
+ elif command == "Force update local mods":
+ call_on_thread(True, "force_update", "Updating mods", "")
+ elif command == "Quick-connect to favorite server":
+ call_on_thread(True, command, "Working", "")
+ elif command in toggle_contexts:
+ if command == "Toggle release branch":
+ call_on_thread(False, "toggle", "Updating DZGUI branch", command)
+ else:
+ proc = call_out(transient_parent, "toggle", command)
+ grid = treeview.get_parent().get_parent()
+ grid.update_right_statusbar()
+ tooltip = format_metadata(command)
+ transient_parent.grid.update_statusbar(tooltip)
+ else:
+ # This branch is only used by interactive dialogs
+ match command:
+ case "Connect by IP" | "Add server by IP" | "Change favorite server":
+ flag = True
+ link_label = ""
+ prompt = "Enter IP in IP:Queryport format\nE.g. 192.168.1.1:27016"
+ case "Connect by ID" | "Add server by ID":
+ flag = True
+ link_label = "Open Battlemetrics"
+ prompt = "Enter server ID"
+ case "Change player name":
+ flag = False
+ link_label = ""
+ prompt = "Enter new nickname"
+ case "Change Steam API key":
+ flag = True
+ link_label = "Open Steam API page"
+ prompt = "Enter new API key"
+ case "Change Battlemetrics API key":
+ flag = True
+ link_label = "Open Battlemetrics API page"
+ prompt = "Enter new API key"
+
+ user_entry = EntryDialog(transient_parent, prompt, "ENTRY", link_label)
+ res = user_entry.get_input()
+ if res is None:
+ logger.info("User aborted entry dialog")
+ return
+ logger.info("User entered: '%s'" %(res))
+
+ call_on_thread(flag, command, "Working", res)
+
+
+def reinit_checks():
+ toggled_checks.clear()
+ for check in checks:
+ label = check.get_label()
+ if filters[label] is True:
+ check.set_active(True)
+ toggled_checks.append(label)
+ else:
+ check.set_active(False)
+
+
+class OuterWindow(Gtk.Window):
+ def __init__(self):
+ super().__init__()
+
+ self.connect("destroy", self.halt_proc_and_quit)
+ self.connect("delete-event", self.halt_proc_and_quit)
+ # Deprecated in GTK 4.0
+ self.set_border_width(10)
+
+ """
+ app > win > grid > scrollable > treeview [row/server/mod store]
+ app > win > grid > vbox > buttonbox > filterpanel > combo [map store]
+ """
+ self.grid = Grid()
+ self.add(self.grid)
+ self.hb = AppHeaderBar()
+ self.set_titlebar(self.hb)
+
+ # Hide FilterPanel on main menu
+ self.show_all()
+ self.grid.right_panel.set_filter_visibility(False)
+ self.grid.scrollable_treelist.treeview.grab_focus()
+
+ def halt_proc_and_quit(self, window):
+ self.grid.terminate_treeview_process()
+ Gtk.main_quit()
+
+
+class ScrollableTree(Gtk.ScrolledWindow):
+ def __init__(self):
+ super().__init__()
+ self.set_vexpand(False)
+
+ self.treeview = TreeView()
+ self.add(self.treeview)
+
+
+class RightPanel(Gtk.Box):
+ def __init__(self):
+ super().__init__(spacing=6)
+ self.set_orientation(Gtk.Orientation.VERTICAL)
+
+ self.button_vbox = ButtonBox()
+ self.filters_vbox = FilterPanel()
+ toggle_signal(self.filters_vbox, self.filters_vbox.maps_combo, '_on_map_changed', False)
+
+ self.pack_start(self.button_vbox, False, False, 0)
+ self.pack_start(self.filters_vbox, False, False, 0)
+
+ self.question_label = Gtk.Label(label="Type ? for keybindings")
+ self.question_label.set_ellipsize(Pango.EllipsizeMode.END)
+ self.question_label.set_margin_top(100)
+ self.question_label.set_margin_start(10)
+ self.pack_start(self.question_label, False, True, 0)
+
+ def set_filter_visibility(self, bool):
+ self.filters_vbox.set_visible(bool)
+
+ def focus_button_box(self):
+ self.button_vbox.focus_button(0)
+
+ def set_active_combo(self):
+ self.filters_vbox.set_active_combo()
+
+
+class ButtonBox(Gtk.Box):
+ def __init__(self):
+ super().__init__(spacing=6)
+ self.set_orientation(Gtk.Orientation.VERTICAL)
+ set_surrounding_margins(self, 10)
+
+ self.buttons = list()
+ for side_button in side_buttons:
+ button = Gtk.Button(label=side_button)
+ button.set_size_request(100, 100)
+ button.set_opacity(0.6)
+ self.buttons.append(button)
+ button.connect("clicked", self._on_selection_button_clicked)
+ self.pack_start(button, False, False, True)
+
+ self.buttons[0].set_opacity(1.0)
+
+ def _update_single_column(self, context):
+ logger.info("Returning from multi-column view to monocolumn view for the context '%s'" %(context))
+ treeview = self.get_treeview()
+ right_panel = self.get_parent()
+ right_panel.set_filter_visibility(False)
+
+ """Block maps combo when returning to main menu"""
+ toggle_signal(right_panel.filters_vbox, right_panel.filters_vbox.maps_combo, '_on_map_changed', False)
+ right_panel.filters_vbox.keyword_entry.set_text("")
+ keyword_filter.clear()
+ keyword_filter.append("Keyword␞")
+ server_store.clear()
+
+ for column in treeview.get_columns():
+ treeview.remove_column(column)
+ for i, column_title in enumerate([context]):
+ renderer = Gtk.CellRendererText()
+ column = Gtk.TreeViewColumn(column_title, renderer, text=i)
+ treeview.append_column(column)
+ treeview.set_model(row_store)
+ treeview.grab_focus()
+
+ def _populate(self, array_context):
+ row_store.clear()
+ status = array_context[0][0]
+ treeview = self.get_treeview()
+ grid = self.get_parent().get_parent()
+
+ for items in array_context:
+ row_store.append(list(items))
+ grid.update_statusbar(status_tooltip[status])
+ treeview.grab_focus()
+
+ def _on_selection_button_clicked(self, button):
+ treeview = self.get_treeview()
+ toggle_signal(treeview, treeview.selected_row, '_on_tree_selection_changed', False)
+ context = button.get_label()
+ logger.info("User clicked '%s'" %(context))
+
+ if context == "Exit":
+ logger.info("Normal user exit")
+ sys.exit(1)
+ cols = treeview.get_columns()
+
+ if len(cols) > 1:
+ self._update_single_column(context)
+
+ # Highlight the active widget
+ for inactive_button in self.buttons:
+ inactive_button.set_opacity(0.6)
+ button.set_opacity(1.0)
+
+ for col in cols:
+ col.set_title(context)
+
+ match context:
+ case 'Manage': self._populate(manage)
+ case 'Connect': self._populate(connect)
+ case 'Options': self._populate(options)
+ case 'Help': self._populate(help)
+
+ toggle_signal(treeview, treeview.selected_row, '_on_tree_selection_changed', True)
+
+ def focus_button(self, index):
+ self.buttons[index].grab_focus()
+
+ def get_treeview(self):
+ grid = self.get_parent().get_parent()
+ treeview = grid.scrollable_treelist.treeview
+ return treeview
+
+
+class CalcDist(multiprocessing.Process):
+ def __init__(self, widget, addr, result_queue, cache):
+ super().__init__()
+
+ self.widget = widget
+ self.result_queue = result_queue
+ self.addr = addr
+ self.ip = addr.split(':')[0]
+
+ def run(self):
+ if self.addr in cache:
+ logger.info("Address '%s' already in cache" %(self.addr))
+ self.result_queue.put([self.addr, cache[self.addr]])
+ return
+ proc = call_out(self.widget, "get_dist", self.ip)
+ km = proc.stdout
+ self.result_queue.put([self.addr, km])
+
+
+class TreeView(Gtk.TreeView):
+ __gsignals__ = {"on_distcalc_started": (GObject.SignalFlags.RUN_FIRST, None, ())}
+
+ def __init__(self):
+ super().__init__()
+
+ self.queue = multiprocessing.Queue()
+ self.current_proc = None
+
+ # Disables typeahead search
+ self.set_enable_search(False)
+ self.set_search_column(-1)
+
+ # Populate model with initial context
+ for rows in connect:
+ row_store.append(list(rows))
+ self.set_model(row_store)
+
+ for i, column_title in enumerate(
+ ["Connect"]
+ ):
+ renderer = Gtk.CellRendererText()
+ column = Gtk.TreeViewColumn(column_title, renderer, text=i)
+ self.append_column(column)
+ # TODO: change font size on the fly
+ # renderer.set_property("size-points", 20)
+
+ self.connect("row-activated", self._on_row_activated)
+ self.connect("key-press-event", self._on_keypress)
+ self.connect("key-press-event", self._on_keypress_main_menu)
+ toggle_signal(self, self, '_on_keypress', False)
+
+ self.selected_row = self.get_selection()
+ self.selected_row.connect("changed", self._on_tree_selection_changed)
+ self.connect("button-release-event", self._on_button_release)
+
+ def terminate_process(self):
+ if self.current_proc and self.current_proc.is_alive():
+ self.current_proc.terminate()
+
+ def _on_menu_click(self, menu_item):
+ parent = self.get_outer_window()
+ context = self.get_first_col()
+ value = self.get_column_at_index(0)
+ context_menu_label = menu_item.get_label()
+ logger.info("User clicked context menu '%s'" %(context_menu_label))
+
+ match context_menu_label:
+ case "Add to my servers" | "Remove from favorites":
+ record = "%s:%s" %(self.get_column_at_index(6), self.get_column_at_index(7))
+ call_out(parent, context_menu_label, record)
+ if context == "Name (My saved servers)":
+ iter = self.get_current_iter()
+ server_store.remove(iter)
+ res = spawn_dialog(parent, "Added %s to favorites" %(record), "NOTIFY")
+ case "Remove from history":
+ record = "%s:%s" %(self.get_column_at_index(6), self.get_column_at_index(7))
+ call_out(parent, context_menu_label, record)
+ iter = self.get_current_iter()
+ server_store.remove(iter)
+ case "Copy IP to clipboard":
+ self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD)
+ addr = self.get_column_at_index(6)
+ qport = self.get_column_at_index(7)
+ ip = addr.split(':')[0]
+ record = "%s:%s" %(ip, qport)
+ self.clipboard.set_text(record, -1)
+ case "Show server-side mods":
+ record = "%s:%s" %(self.get_column_at_index(6), self.get_column_at_index(7))
+ dialog = ModDialog(parent, "Enter/double click a row to open in Steam Workshop. ESC exits this dialog", "Modlist", record)
+ modlist_store.clear()
+ case "Delete mod":
+ conf_msg = "Really delete the mod '%s'?" %(value)
+ success_msg = "Successfully deleted the mod '%s'." %(value)
+ fail_msg = "An error occurred during deletion. Aborting."
+ res = spawn_dialog(parent, conf_msg, "CONFIRM")
+ symlink = self.get_column_at_index(1)
+ dir = self.get_column_at_index(2)
+ if res == 0:
+ proc = call_out(parent, "delete", symlink, dir)
+ if proc.returncode == 0:
+ spawn_dialog(parent, success_msg, "NOTIFY")
+ self._update_quad_column("List installed mods")
+ else:
+ spawn_dialog(parent, fail_msg, "NOTIFY")
+ case "Open in Steam Workshop":
+ record = self.get_column_at_index(2)
+ call_out(parent, "open_workshop_page", record)
+
+ def _on_button_release(self, widget, event):
+ try:
+ pathinfo = self.get_path_at_pos(event.x, event.y)
+ if pathinfo is None:
+ return
+ (path, col, cellx, celly) = pathinfo
+ self.set_cursor(path,col,0)
+ except AttributeError:
+ pass
+
+ if event.type is Gdk.EventType.BUTTON_RELEASE and event.button != 3:
+ return
+ context = self.get_first_col()
+ self.menu = Gtk.Menu()
+
+ mod_context_items = ["Open in Steam Workshop", "Delete mod"]
+ subcontext_items = {"Server browser": ["Add to my servers", "Copy IP to clipboard", "Show server-side mods"],
+ "My saved servers": ["Remove from favorites", "Copy IP to clipboard", "Show server-side mods"],
+ "Recent servers": ["Remove from history", "Copy IP to clipboard", "Show server-side mods"],
+ }
+ # submenu hierarchy https://stackoverflow.com/questions/52847909/how-to-add-a-sub-menu-to-a-gtk-menu
+ if context == "Mod":
+ items = mod_context_items
+ subcontext = "List installed mods"
+ elif "Name" in context:
+ subcontext = context.split('(')[1].split(')')[0]
+ items = subcontext_items[subcontext]
+ else:
+ return
+
+ for item in items:
+ if subcontext == "Server browser" and item == "Add to my servers":
+ record = "%s:%s" %(self.get_column_at_index(6), self.get_column_at_index(7))
+ proc = call_out(widget, "is_in_favs", record)
+ if proc.returncode == 0:
+ item = "Remove from favorites"
+ item = Gtk.MenuItem(label=item)
+ item.connect("activate", self._on_menu_click)
+ self.menu.append(item)
+
+ self.menu.show_all()
+
+ if event.type is Gdk.EventType.KEY_PRESS and event.keyval is Gdk.KEY_l:
+ self.menu.popup_at_widget(widget, Gdk.Gravity.CENTER, Gdk.Gravity.WEST)
+ else:
+ self.menu.popup_at_pointer(event)
+
+ def get_outer_window(self):
+ win = self.get_parent().get_parent().get_parent()
+ return win
+
+ def get_outer_grid(self):
+ grid = self.get_parent().get_parent()
+ return grid
+
+ def get_current_iter(self):
+ iter = self.get_selection().get_selected()[1]
+ return iter
+
+ def get_current_index(self):
+ index = treeview.get_selection().get_selected_rows()[1][0][0]
+ return index
+
+ def _on_tree_selection_changed(self, selection):
+ grid = self.get_outer_grid()
+ context = self.get_first_col()
+ row_sel = self.get_column_at_index(0)
+ if context == "Mod" or context == "Timestamp":
+ return
+ logger.info("Tree selection for context '%s' changed to '%s'" %(context, row_sel))
+
+ if self.current_proc and self.current_proc.is_alive():
+ self.current_proc.terminate()
+
+ if "Name" in context:
+ addr = self.get_column_at_index(6)
+ if addr is None:
+ return
+ if addr in cache:
+ dist = format_distance(cache[addr])
+
+ tooltip = server_tooltip[0] + dist
+ grid.update_statusbar(tooltip)
+ return
+ self.emit("on_distcalc_started")
+ self.current_proc = CalcDist(self, addr, self.queue, cache)
+ self.current_proc.start()
+ elif None:
+ return
+ else:
+ tooltip = format_metadata(row_sel)
+ grid.update_statusbar(tooltip)
+
+ def _on_keypress_main_menu(self, treeview, event):
+ window = self.get_outer_window()
+ grid = self.get_outer_grid()
+ match event.keyval:
+ case Gdk.KEY_Right:
+ grid.right_panel.focus_button_box()
+ case Gdk.KEY_question:
+ if event.state is Gdk.ModifierType.SHIFT_MASK:
+ diag = KeysDialog(window, '', "Keybindings")
+ diag.run()
+ diag.destroy()
+ case Gdk.KEY_f:
+ if event.state is Gdk.ModifierType.CONTROL_MASK:
+ return True
+ case _:
+ return False
+
+ def _on_keypress(self, treeview, event):
+ if self.get_first_col == "Mod":
+ return
+ keyname = Gdk.keyval_name(event.keyval)
+ grid = self.get_outer_grid()
+ cur_proc = grid.scrollable_treelist.treeview.current_proc
+ if event.state is Gdk.ModifierType.CONTROL_MASK:
+ match event.keyval:
+ case Gdk.KEY_d:
+ debug = grid.right_panel.filters_vbox.debug_toggle
+ if debug.get_active():
+ debug.set_active(False)
+ else:
+ debug.set_active(True)
+ case Gdk.KEY_l:
+ self._on_button_release(self, event)
+ case Gdk.KEY_f:
+ grid.right_panel.filters_vbox.grab_keyword_focus()
+ case Gdk.KEY_m:
+ grid.right_panel.filters_vbox.maps_combo.grab_focus()
+ grid.right_panel.filters_vbox.maps_combo.popup()
+ case _:
+ return False
+ elif keyname.isnumeric() and int(keyname) > 0:
+ digit = (int(keyname) - 1)
+ grid.right_panel.filters_vbox.toggle_check(checks[digit])
+ else:
+ return False
+
+ def get_column_at_index(self, index):
+ select = self.get_selection()
+ sels = select.get_selected_rows()
+ (model, pathlist) = sels
+ if len(pathlist) < 1:
+ return
+ path = pathlist[0]
+ tree_iter = model.get_iter(path)
+ value = model.get_value(tree_iter, index)
+ return value
+
+ def _background(self, dialog, mode):
+ def loadTable():
+ for map in maps:
+ map_store.append([map])
+ toggle_signal(self, self.selected_row, '_on_tree_selection_changed', True)
+ right_panel.set_filter_visibility(True)
+ dialog.destroy()
+ self.grab_focus()
+
+ grid = self.get_outer_grid()
+ right_panel = grid.right_panel
+
+ filters = toggled_checks + keyword_filter + selected_map
+ data = call_out(self, "dump_servers", mode, *filters)
+
+ toggle_signal(self, self.selected_row, '_on_tree_selection_changed', False)
+ row_metadata = parse_server_rows(data)
+ sum = row_metadata[0]
+ hits = row_metadata[1]
+ server_tooltip[0] = format_tooltip(sum, hits)
+ grid.update_statusbar(server_tooltip[0])
+
+ map_data = call_out(self, "get_unique_maps", mode)
+ maps = map_data.stdout.splitlines()
+ self.set_model(server_store)
+ GLib.idle_add(loadTable)
+
+ def _background_quad(self, dialog, mode):
+ def load():
+ dialog.destroy()
+ self.set_model(mod_store)
+ self.grab_focus()
+ size = locale.format_string('%.3f', total_size, grouping=True)
+ grid.update_statusbar("Found %s mods taking up %s MiB" %(f'{total_mods:n}', size))
+
+ grid = self.get_outer_grid()
+ right_panel = grid.right_panel
+
+ right_panel.set_filter_visibility(False)
+ data = call_out(self, "list_mods", mode)
+ result = parse_mod_rows(data)
+ total_size = result[0]
+ total_mods = result[1]
+ GLib.idle_add(load)
+
+ def _update_multi_column(self, mode):
+ # Local server lists may have different filter toggles from remote list
+ # FIXME: tree selection updates twice here. attach signal later
+ toggle_signal(self, self.selected_row, '_on_tree_selection_changed', False)
+ # toggle_signal(self, self.selected_row, '_on_check_toggled', False)
+ for column in self.get_columns():
+ self.remove_column(column)
+ row_store.clear()
+ for i, column_title in enumerate(browser_cols):
+ renderer = Gtk.CellRendererText()
+ column = Gtk.TreeViewColumn(column_title, renderer, text=i)
+ column.set_sort_column_id(i)
+ """Prevent columns from auto-adjusting"""
+ if ("Name" in column_title):
+ column.set_fixed_width(800)
+ if (column_title == "Map"):
+ column.set_fixed_width(300)
+ self.append_column(column)
+
+ self.update_first_col(mode)
+ transient_parent = self.get_outer_window()
+
+ for check in checks:
+ toggle_signal(self.get_outer_grid().right_panel.filters_vbox, check, '_on_check_toggle', True)
+ toggle_signal(self, self, '_on_keypress', True)
+
+ wait_dialog = GenericDialog(transient_parent, "Fetching server metadata", "WAIT")
+ wait_dialog.show_all()
+ thread = threading.Thread(target=self._background, args=(wait_dialog, mode))
+ thread.start()
+
+ def update_first_col(self, title):
+ for col in self.get_columns():
+ old_title = col.get_title()
+ col.set_title("%s (%s)" %(old_title, title))
+ break
+
+ def get_first_col(self):
+ for col in self.get_columns():
+ cur_col = col.get_title()
+ break
+ return cur_col
+
+ def _format_float(self, column, cell, model, iter, data):
+ # https://docs.huihoo.com/pygtk/2.0-tutorial/sec-CellRenderers.html
+ val = model[iter][3]
+ formatted = locale.format_string('%.3f', val, grouping=True)
+ cell.set_property('text', formatted)
+ return
+
+ def _update_quad_column(self, mode):
+ # toggle_signal(self, self.selected_row, '_on_tree_selection_changed', False)
+ for column in self.get_columns():
+ self.remove_column(column)
+
+ mod_store.clear()
+ log_store.clear()
+
+ if mode == "List installed mods":
+ cols = mod_cols
+ self.set_model(mod_store)
+ else:
+ cols = log_cols
+ self.set_model(log_store)
+
+ for i, column_title in enumerate(cols):
+ renderer = Gtk.CellRendererText()
+ column = Gtk.TreeViewColumn(column_title, renderer, text=i)
+ if mode == "List installed mods":
+ if i == 3:
+ column.set_cell_data_func(renderer, self._format_float, func_data=None)
+ column.set_sort_column_id(i)
+ if (column_title == "Name"):
+ column.set_fixed_width(600)
+ self.append_column(column)
+
+ if mode == "List installed mods":
+ pass
+ else:
+ data = call_out(self, "show_log")
+ res = parse_log_rows(data)
+ if res == 1:
+ spawn_dialog(self.get_outer_window(), "Failed to load log file, possibly corrupted", "NOTIFY")
+ return
+
+ transient_parent = self.get_outer_window()
+
+ wait_dialog = GenericDialog(transient_parent, "Checking mods", "WAIT")
+ wait_dialog.show_all()
+ thread = threading.Thread(target=self._background_quad, args=(wait_dialog, mode))
+ thread.start()
+
+ def _background_connection(self, dialog, record):
+ def load():
+ dialog.destroy()
+ transient = self.get_outer_window()
+ process_shell_return_code(transient, proc.stdout, proc.returncode, record)
+
+ proc = call_out(self, "Connect from table", record)
+ GLib.idle_add(load)
+
+
+ def _attempt_connection(self):
+ transient_parent = self.get_outer_window()
+ addr = self.get_column_at_index(6)
+ qport = self.get_column_at_index(7)
+ record = "%s:%s" %(addr, str(qport))
+
+ wait_dialog = GenericDialog(transient_parent, "Querying server and aligning mods", "WAIT")
+ wait_dialog.show_all()
+ thread = threading.Thread(target=self._background_connection, args=(wait_dialog, record))
+ thread.start()
+
+ def _on_row_activated(self, treeview, tree_iter, col):
+ context = self.get_first_col()
+ chosen_row = self.get_column_at_index(0)
+ output = context, chosen_row
+ if context == "Mod" or context == "Timestamp":
+ return
+ logger.info("User selected '%s' for the context '%s'" %(chosen_row, context))
+
+ outer = self.get_outer_window()
+ right_panel = outer.grid.right_panel
+ filters_vbox = right_panel.filters_vbox
+
+ valid_contexts = ["Server browser", "My saved servers", "Recent servers"]
+ if chosen_row in valid_contexts:
+ # server contexts share the same model type
+ for check in checks:
+ toggle_signal(filters_vbox, check, '_on_check_toggle', False)
+
+ if chosen_row == "Server browser":
+ reinit_checks()
+ else:
+ for check in checks:
+ if check.get_label() not in toggled_checks:
+ toggled_checks.append(check.get_label())
+ check.set_active(True)
+ self._update_multi_column(chosen_row)
+
+ map_store.clear()
+ map_store.append(["All maps"])
+ right_panel.set_active_combo()
+
+ toggle_signal(filters_vbox, filters_vbox.maps_combo, '_on_map_changed', True)
+ toggle_signal(self, self.selected_row, '_on_tree_selection_changed', True)
+ self.grab_focus()
+ elif chosen_row == "List installed mods" or chosen_row == "Show debug log":
+ toggle_signal(self, self.selected_row, '_on_tree_selection_changed', False)
+ self._update_quad_column(chosen_row)
+ toggle_signal(self, self.selected_row, '_on_tree_selection_changed', True)
+ elif any(map(context.__contains__, valid_contexts)):
+ # implies activated row on any server list subcontext
+ self._attempt_connection()
+ else:
+ # implies any other non-server option selected from main menu
+ process_tree_option(output, self)
+
+
+def format_metadata(row_sel):
+ prefix = status_tooltip[row_sel]
+ vals = {
+ "branch": config_vals[0],
+ "debug": config_vals[1],
+ "auto_install": config_vals[2],
+ "name": config_vals[3],
+ "fav_label": config_vals[4],
+ "preferred_client": config_vals[5]
+ }
+ match row_sel:
+ case "Quick-connect to favorite server" | "Change favorite server":
+ default = "unset"
+ val = "fav_label"
+ case "Change player name":
+ val = "name"
+ case "Toggle mod install mode":
+ default = "manual"
+ alt = "auto"
+ val = "auto_install"
+ case "Toggle debug mode":
+ default = "normal"
+ alt = "debug"
+ val = "debug"
+ case "Toggle release branch":
+ val = "branch"
+ case "Toggle Steam/Flatpak":
+ val = "preferred_client"
+ case _:
+ return prefix
+
+ try:
+ cur_val = vals[val]
+ if cur_val == "":
+ return "%s | Current: %s" %(prefix, default)
+ # TODO: migrate to human readable config values
+ elif cur_val == "1":
+ return "%s | Current: %s" %(prefix, alt)
+ else:
+ return "%s | Current: '%s'" %(prefix, cur_val)
+ except KeyError:
+ return prefix
+
+
+def format_tooltip(sum, hits):
+ if hits == 1:
+ hit_suffix = "match"
+ else:
+ hit_suffix = "matches"
+ if sum == 1:
+ player_suffix = "player"
+ else:
+ player_suffix = "players"
+ tooltip = "Found %s %s with %s %s" %(f'{hits:n}', hit_suffix, f'{sum:n}', player_suffix)
+ return tooltip
+
+
+def filter_servers(transient_parent, filters_vbox, treeview, context):
+ def filter(dialog):
+ def clear_and_destroy():
+ row_metadata = parse_server_rows(data)
+ sum = row_metadata[0]
+ hits = row_metadata[1]
+ server_tooltip[0] = format_tooltip(sum, hits)
+ transient_parent.grid.update_statusbar(server_tooltip[0])
+
+ toggle_signal(treeview, treeview.selected_row, '_on_tree_selection_changed', True)
+ toggle_signal(filters_vbox, filters_vbox, '_on_button_release', True)
+ toggle_signal(filters_vbox, filters_vbox.maps_combo, '_on_map_changed', True)
+ dialog.destroy()
+ treeview.grab_focus()
+
+ server_filters = toggled_checks + keyword_filter + selected_map
+ data = call_out(transient_parent, "filter", context, *server_filters)
+ GLib.idle_add(clear_and_destroy)
+
+ # block additional input on FilterPanel while filters are running
+ toggle_signal(treeview, treeview.selected_row, '_on_tree_selection_changed', False)
+ toggle_signal(filters_vbox, filters_vbox, '_on_button_release', False)
+ toggle_signal(filters_vbox, filters_vbox.maps_combo, '_on_map_changed', False)
+
+ dialog = GenericDialog(transient_parent, "Filtering results", "WAIT")
+ dialog.show_all()
+ server_store.clear()
+
+ thread = threading.Thread(target=filter, args=(dialog,))
+ thread.start()
+
+
+class AppHeaderBar(Gtk.HeaderBar):
+ def __init__(self):
+ super().__init__()
+ Gtk.HeaderBar()
+ self.props.title = app_name
+ self.set_show_close_button(True)
+
+
+class NewsHeader(Gtk.Box):
+ def __init__(self, news):
+ super().__init__()
+ Gtk.Box(spacing=1)
+ self.set_valign(Gtk.Align.START)
+ news_label = Gtk.Label(label=news)
+ news_label.set_ellipsize(Pango.EllipsizeMode.END)
+ self.pack_start(news_label, False, False, 0)
+
+
+class GenericDialog(Gtk.MessageDialog):
+ def __init__(self, parent, text, mode):
+
+ def _on_dialog_delete(self, response_id):
+ """Passively ignore user-input"""
+ return True
+
+ match mode:
+ case "WAIT":
+ dialog_type = Gtk.MessageType.INFO
+ button_type = Gtk.ButtonsType.NONE
+ header_text = "Please wait"
+ case "NOTIFY":
+ dialog_type = Gtk.MessageType.INFO
+ button_type = Gtk.ButtonsType.OK
+ header_text = "Notice"
+ case "CONFIRM":
+ dialog_type = Gtk.MessageType.QUESTION
+ button_type = Gtk.ButtonsType.OK_CANCEL
+ header_text = "Confirmation"
+ case "ENTRY":
+ dialog_type = Gtk.MessageType.QUESTION
+ button_type = Gtk.ButtonsType.OK_CANCEL
+ header_text = "User input required"
+ case _:
+ dialog_type = Gtk.MessageType.INFO
+ button_type = Gtk.ButtonsType.OK
+ header_text = mode
+
+ Gtk.MessageDialog.__init__(
+ self,
+ transient_for=parent,
+ flags=0,
+ message_type=dialog_type,
+ text=header_text,
+ secondary_text=text,
+ buttons=button_type,
+ title=app_name,
+ modal=True,
+ )
+
+ if mode == "WAIT":
+ dialogBox = self.get_content_area()
+ spinner = Gtk.Spinner()
+ dialogBox.pack_end(spinner, False, False, 0)
+ spinner.start()
+ self.connect("delete-event", _on_dialog_delete)
+
+ self.set_default_response(Gtk.ResponseType.OK)
+ self.set_size_request(500, 0)
+ self.set_position(Gtk.WindowPosition.CENTER_ON_PARENT)
+
+ def update_label(self, text):
+ self.format_secondary_text(text)
+
+
+def ChangelogDialog(parent, text, mode):
+
+ dialog = GenericDialog(parent, text, mode)
+ dialogBox = dialog.get_content_area()
+ dialog.set_default_response(Gtk.ResponseType.OK)
+ dialog.set_size_request(1000, 600)
+
+ with open(changelog_path, 'r') as f:
+ changelog = f.read()
+
+ scrollable = Gtk.ScrolledWindow()
+ label = Gtk.Label()
+ label.set_markup(changelog)
+ scrollable.add(label)
+ dialogBox.pack_end(scrollable, True, True, 0)
+ set_surrounding_margins(dialogBox, 30)
+
+ dialog.show_all()
+ return dialog
+
+
+def KeysDialog(parent, text, mode):
+
+ dialog = GenericDialog(parent, text, mode)
+ dialogBox = dialog.get_content_area()
+ dialog.set_default_response(Gtk.ResponseType.OK)
+ dialog.set_size_request(700, 0)
+
+ keybindings = """
+ Basic navigation
+ Ctrl-q: quit
+ Enter/Space/Double click: select row item
+ Up, Down: navigate through row items
+
+ Button navigation
+ Right: jump from main view to side buttons
+ Left: jump from side buttons to main view
+ Up, Down: navigate up and down through side buttons
+ Tab, Shift-Tab: navigate forward/back through menu elements
+
+ Any server browsing context
+ Enter/Space/Double click: connect to server
+ Right-click on row/Ctrl-l: displays additional context menus
+ Ctrl-f: jump to keyword field
+ Ctrl-m: jump to maps dropdown
+ Ctrl-d: toggle dry run (debug) mode
+ 1-9: toggle filter ON/OFF
+ ESC: jump back to main view from keyword/maps
+ """
+
+ label = Gtk.Label()
+ label.set_markup(keybindings)
+ dialogBox.pack_end(label, False, False, 0)
+ dialog.show_all()
+ return dialog
+
+
+class ModDialog(GenericDialog):
+ def __init__(self, parent, text, mode, record):
+ super().__init__(parent, text, mode)
+
+ dialogBox = self.get_content_area()
+ self.set_default_response(Gtk.ResponseType.OK)
+ self.set_size_request(800, 500)
+
+ self.scrollable = Gtk.ScrolledWindow()
+ self.view = Gtk.TreeView()
+ self.scrollable.set_vexpand(True)
+ self.scrollable.add(self.view)
+ set_surrounding_margins(self.scrollable, 20)
+
+ self.view.connect("row-activated", self._on_row_activated)
+
+ for i, column_title in enumerate(
+ ["Mod", "ID", "Installed"]
+ ):
+ renderer = Gtk.CellRendererText()
+ column = Gtk.TreeViewColumn(column_title, renderer, text=i)
+ self.view.append_column(column)
+ column.set_sort_column_id(i)
+ dialogBox.pack_end(self.scrollable, True, True, 0)
+
+ wait_dialog = GenericDialog(parent, "Fetching modlist", "WAIT")
+ wait_dialog.show_all()
+ thread = threading.Thread(target=self._background, args=(wait_dialog, parent, record))
+ thread.start()
+
+ def _background(self, dialog, parent, record):
+ def _load():
+ dialog.destroy()
+ if data.returncode == 1:
+ spawn_dialog(parent, "Server has no mods installed", "NOTIFY")
+ return
+ self.show_all()
+ self.set_markup("Modlist (%s mods)" %(mod_count))
+ res = self.run()
+ self.destroy()
+
+ addr = record.split(':')
+ ip = addr[0]
+ qport = addr[2]
+ data = call_out(parent, "show_server_modlist", ip, qport)
+ mod_count = parse_modlist_rows(data)
+ self.view.set_model(modlist_store)
+ GLib.idle_add(_load)
+
+ def popup(self):
+ pass
+
+ def _on_row_activated(self, treeview, tree_iter, col):
+ select = treeview.get_selection()
+ sels = select.get_selected_rows()
+ (model, pathlist) = sels
+ if len(pathlist) < 1:
+ return
+ path = pathlist[0]
+ tree_iter = model.get_iter(path)
+ mod_id = model.get_value(tree_iter, 1)
+ call_out(treeview, "open_workshop_page", mod_id)
+
+class EntryDialog(GenericDialog):
+ def __init__(self, parent, text, mode, link):
+ super().__init__(parent, text, mode)
+
+ """ Returns user input as a string or None """
+ """ If user does not input text it returns None, NOT AN EMPTY STRING. """
+
+ self.dialog = GenericDialog(parent, text, mode)
+ self.dialogBox = self.dialog.get_content_area()
+ self.dialog.set_default_response(Gtk.ResponseType.OK)
+ self.dialog.set_size_request(500, 0)
+
+ self.userEntry = Gtk.Entry()
+ set_surrounding_margins(self.userEntry, 20)
+ self.userEntry.set_margin_top(0)
+ self.userEntry.set_size_request(250, 0)
+ self.userEntry.set_activates_default(True)
+ self.dialogBox.pack_start(self.userEntry, False, False, 0)
+
+ if link != "":
+ button = Gtk.Button(label=link)
+ button.set_margin_start(60)
+ button.set_margin_end(60)
+ button.connect("clicked", self._on_button_clicked)
+ self.dialogBox.pack_end(button, False, False, 0)
+
+ def _on_button_clicked(self, button):
+ label = button.get_label()
+ subprocess.Popen(['/usr/bin/env', 'bash', funcs, "Open link", label])
+
+ def get_input(self):
+ self.dialog.show_all()
+ response = self.dialog.run()
+ text = self.userEntry.get_text()
+ self.dialog.destroy()
+ if (response == Gtk.ResponseType.OK) and (text != ''):
+ return text
+ else:
+ return None
+
+
+class Grid(Gtk.Grid):
+ def __init__(self):
+ super().__init__()
+ Gtk.Grid()
+ self.set_column_homogeneous(True)
+ #self.set_row_homogeneous(True)
+
+ self.scrollable_treelist = ScrollableTree()
+ self.scrollable_treelist.set_vexpand(True)
+ self.right_panel = RightPanel()
+
+ _news = sys.argv[2]
+ self._version = "%s %s" %(app_name, sys.argv[3])
+
+ if _news != "null":
+ self.news = NewsHeader(_news)
+ self.attach(self.news, 0, -1, 8, 10)
+
+ self.bar = Gtk.Statusbar()
+ self.scrollable_treelist.treeview.connect("on_distcalc_started", self._on_calclat_started)
+
+ GLib.timeout_add(200, self._check_result_queue)
+
+ self.update_statusbar(default_tooltip)
+ self.status_right_label = Gtk.Label(label="")
+ self.bar.add(self.status_right_label)
+ self.update_right_statusbar()
+
+ self.attach(self.scrollable_treelist, 0, 0, 8, 10)
+ self.attach_next_to(self.bar, self.scrollable_treelist, Gtk.PositionType.BOTTOM, 8, 1)
+ self.attach_next_to(self.right_panel, self.scrollable_treelist, Gtk.PositionType.RIGHT, 1, 1)
+
+ def update_right_statusbar(self):
+ config_vals.clear()
+ for i in query_config(self):
+ config_vals.append(i)
+ _branch = config_vals[0]
+ _branch = _branch.upper()
+ _debug = config_vals[1]
+ if _debug == "":
+ _debug = "NORMAL"
+ else:
+ _debug = "DEBUG"
+ concat_label = "%s | %s | %s" %(_branch, _debug, self._version)
+ self.status_right_label.set_text(concat_label)
+
+ def terminate_treeview_process(self):
+ self.scrollable_treelist.treeview.terminate_process()
+
+ def _on_calclat_started(self, treeview):
+ server_tooltip[1] = server_tooltip[0] + "| Distance: calculating..."
+ self.update_statusbar(server_tooltip[1])
+
+ def _check_result_queue(self):
+ latest_result = None
+ result_queue = self.scrollable_treelist.treeview.queue
+ while not result_queue.empty():
+ latest_result = result_queue.get()
+
+ if latest_result is not None:
+ addr = latest_result[0]
+ km = latest_result[1]
+ cache[addr] = km
+ dist = format_distance(km)
+ tooltip = server_tooltip[1] = server_tooltip[0] + dist
+ self.update_statusbar(tooltip)
+
+ return True
+
+ def update_statusbar(self, string):
+ meta = self.bar.get_context_id("Statusbar")
+ self.bar.push(meta, string)
+
+
+def toggle_signal(owner, widget, func_name, bool):
+ func = getattr(owner, func_name)
+ if (bool):
+ logger.debug("Unblocking %s for %s" %(func_name, widget))
+ widget.handler_unblock_by_func(func)
+ else:
+ logger.debug("Blocking %s for %s" %(func_name, widget))
+ widget.handler_block_by_func(func)
+
+
+class App(Gtk.Application):
+ def __init__(self):
+
+ self.win = OuterWindow()
+
+ # TODO: steam deck
+ # self.win.set_size_request(1280,800)
+ self.win.fullscreen()
+
+ accel = Gtk.AccelGroup()
+ accel.connect(Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE, self._halt_window_subprocess)
+ self.win.add_accel_group(accel)
+
+ GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, Gtk.main_quit)
+ Gtk.main()
+
+ def _halt_window_subprocess(self, accel_group, window, code, flag):
+ self.win.halt_proc_and_quit(self)
+
+
+class FilterPanel(Gtk.Box):
+ def __init__(self):
+ super().__init__(spacing=6)
+
+ for check in filters.keys():
+ checkbutton = Gtk.CheckButton(label=check)
+ label = checkbutton.get_children()
+
+ label[0].set_ellipsize(Pango.EllipsizeMode.END)
+ if filters[check] is True:
+ checkbutton.set_active(True)
+ toggled_checks.append(check)
+ checkbutton.connect("toggled", self._on_check_toggle)
+ checks.append(checkbutton)
+
+ self.connect("button-release-event", self._on_button_release)
+ self.set_orientation(Gtk.Orientation.VERTICAL)
+ set_surrounding_margins(self, 10)
+
+ self.filters_label = Gtk.Label(label="Filters")
+
+ 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_esc_pressed)
+
+ renderer_text = Gtk.CellRendererText(ellipsize=Pango.EllipsizeMode.END)
+ self.maps_combo = Gtk.ComboBox.new_with_model(map_store)
+ self.maps_combo.pack_start(renderer_text, True)
+ self.maps_combo.add_attribute(renderer_text, "text", 0)
+ self.maps_combo.connect("changed", self._on_map_changed)
+ self.maps_combo.connect("key-press-event", self._on_esc_pressed)
+
+ self.debug_toggle = Gtk.ToggleButton(label="Debug mode")
+ self.debug_toggle.connect("toggled", self._on_button_toggled, "Toggle debug mode")
+ set_surrounding_margins(self.debug_toggle, 10)
+
+ self.pack_start(self.filters_label, False, False, True)
+ self.pack_start(self.keyword_entry, False, False, True)
+ self.pack_start(self.maps_combo, False, False, True)
+
+ for i, check in enumerate(checks[0:]):
+ self.pack_start(checks[i], False, False, True)
+
+ self.pack_start(self.debug_toggle, False, False, 0)
+
+ def _on_button_toggled(self, button, command):
+ transient_parent = self.get_outer_window()
+ grid = self.get_outer_grid()
+ call_out(transient_parent, "toggle", command)
+ grid.update_right_statusbar()
+ grid.scrollable_treelist.treeview.grab_focus()
+
+ def grab_keyword_focus(self):
+ self.keyword_entry.grab_focus()
+
+ def restore_focus_to_treeview(self):
+ grid = self.get_outer_grid()
+ grid.scrollable_treelist.treeview.grab_focus()
+ return False
+
+ def _on_esc_pressed(self, entry, event):
+ keyname = Gdk.keyval_name(event.keyval)
+ if keyname == "Escape":
+ GLib.idle_add(self.restore_focus_to_treeview)
+
+ def get_outer_grid(self):
+ panel = self.get_parent()
+ grid = panel.get_parent()
+ return grid
+
+ def get_outer_window(self):
+ grid = self.get_outer_grid()
+ outer_window = grid.get_parent()
+ return outer_window
+
+ def _on_keyword_enter(self, keyword_entry):
+ keyword = keyword_entry.get_text()
+ old_keyword = keyword_filter[0].split(delimiter)[1]
+ if keyword == old_keyword:
+ return
+ logger.info("User filtered by keyword '%s'" %(keyword))
+ keyword_filter.clear()
+ keyword_filter.append("Keyword␞" + keyword)
+ transient_parent = self.get_outer_window()
+ grid = self.get_outer_grid()
+ treeview = grid.scrollable_treelist.treeview
+ context = grid.scrollable_treelist.treeview.get_first_col()
+ filter_servers(transient_parent, self, treeview, context)
+
+ def _on_button_release(self, window, button):
+ return True
+
+ def set_active_combo(self):
+ self.maps_combo.set_active(0)
+
+ def toggle_check(self, button):
+ if button.get_active():
+ button.set_active(False)
+ else:
+ button.set_active(True)
+
+ def _on_check_toggle(self, button):
+ grid = self.get_outer_grid()
+ treeview = grid.scrollable_treelist.treeview
+ context = grid.scrollable_treelist.treeview.get_first_col()
+ label = button.get_label()
+ state = button.get_active()
+
+ if context == "Mod":
+ return
+ if state is True:
+ toggled_checks.append(label)
+ else:
+ toggled_checks.remove(label)
+
+ logger.info("User toggled button '%s' to %s" %(label, state))
+ transient_parent = self.get_outer_window()
+ filter_servers(transient_parent, self, treeview, context)
+
+ def _on_map_changed(self, combo):
+ grid = self.get_outer_grid()
+ transient_parent = self.get_outer_window()
+ treeview = grid.scrollable_treelist.treeview
+ context = grid.scrollable_treelist.treeview.get_first_col()
+
+ tree_iter = combo.get_active_iter()
+ if tree_iter is not None:
+ selected_map.clear()
+ model = combo.get_model()
+ selection = model[tree_iter][0]
+ selected_map.append("Map=" + selection)
+ logger.info("User selected map '%s'" %(selection))
+ filter_servers(transient_parent, self, treeview, context)
+
+
+def main():
+
+ def usage():
+ text = "UI constructor must be run via DZGUI"
+ logger.critical(text)
+ print(text)
+ sys.exit(1)
+
+ expected_flag = "--init-ui"
+ if len(sys.argv) < 2:
+ usage()
+ if sys.argv[1] != expected_flag:
+ usage()
+
+ logger.info("Spawned UI from DZGUI setup process")
+ App()
+
+
+if __name__ == '__main__':
+ main()
From 4bd1d4728d99c73e7c3a6811eddce7c7a6c735a9 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:13:41 +0900
Subject: [PATCH 004/122] chore: update logging
---
dzgui.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index ece043f..a4d63bc 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -545,10 +545,11 @@ fetch_helpers_by_sum(){
file="$i"
sum="${sums[$i]}"
full_path="$helpers_path/$file"
- if [[ -f "$full_path" ]] && [[ $(get_hash "$helpers_path/$file") == $sum ]]; then
+ cur_sum=$(get_hash "$helpers_path/$file")
+ if [[ -f "$full_path" ]] && [[ $cur_sum == $sum ]]; then
logger INFO "'$file' is current"
else
- logger WARN "File '$full_path' checksum != '$sum'"
+ logger WARN "File '$full_path' checksum '$cur_sum' != '$sum'"
curl -Ls "$url" > "$full_path/$file"
if [[ ! $? -eq 0 ]]; then
raise_error_and_quit "Failed to fetch the file '$file'. Possible timeout?"
From 77ea5836f4b650740d67373ac10c615dce65820a Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:27:45 +0900
Subject: [PATCH 005/122] chore: cleanup
---
dzgui.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index a4d63bc..01b25f2 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -63,8 +63,6 @@ testing_url="$url_prefix/testing"
releases_url="https://github.com/$author/$repo/releases/download/browser"
km_helper_url="$releases_url/latlon"
geo_file_url="$releases_url/ips.csv.gz"
-#TODO: normalize
-vdf2json_url="$stable_url/helpers/vdf2json.py"
#TODO: move adoc to index
help_url="https://$author.github.io/dzgui/dzgui"
sponsor_url="https://github.com/sponsors/$author"
@@ -786,7 +784,6 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
- #TODO: test fetching
fetch_helpers
local_latlon
is_steam_running
From 1566f8ade69e7c8581fbb9baee8accf99655f787 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:29:27 +0900
Subject: [PATCH 006/122] chore: drop old vars
---
dzgui.sh | 3 ---
helpers/funcs | 1 -
2 files changed, 4 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 01b25f2..47db67d 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -63,9 +63,6 @@ testing_url="$url_prefix/testing"
releases_url="https://github.com/$author/$repo/releases/download/browser"
km_helper_url="$releases_url/latlon"
geo_file_url="$releases_url/ips.csv.gz"
-#TODO: move adoc to index
-help_url="https://$author.github.io/dzgui/dzgui"
-sponsor_url="https://github.com/sponsors/$author"
logger(){
local date="$(date "+%F %T,%3N")"
diff --git a/helpers/funcs b/helpers/funcs
index 0b09c00..bc564d5 100644
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -73,7 +73,6 @@ releases_url="$gh_prefix/$author/$repo/releases/download/browser"
km_helper_url="$releases_url/latlon"
db_file="$releases_url/ips.csv.gz"
sums_url="$stable_url/helpers/sums.md5"
-vdf2json_url="$stable_url/helpers/vdf2json.py"
#TODO: move adoc to index
help_url="https://$author.github.io/dzgui/dzgui"
forum_url="$gh_prefix/$author/$repo/discussions"
From 06a389eebe8fa7fbdef8afea1fd9bc0509646f54 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:33:33 +0900
Subject: [PATCH 007/122] fix: presetup checks
---
dzgui.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 47db67d..c9bd89d 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -540,12 +540,11 @@ fetch_helpers_by_sum(){
file="$i"
sum="${sums[$i]}"
full_path="$helpers_path/$file"
- cur_sum=$(get_hash "$helpers_path/$file")
- if [[ -f "$full_path" ]] && [[ $cur_sum == $sum ]]; then
+ if [[ -f "$full_path" ]] && [[ $(get_hash "$full_path") == $sum ]]; then
logger INFO "'$file' is current"
else
- logger WARN "File '$full_path' checksum '$cur_sum' != '$sum'"
- curl -Ls "$url" > "$full_path/$file"
+ logger WARN "File '$full_path' checksum != '$sum'"
+ curl -Ls "$url" > "$full_path"
if [[ ! $? -eq 0 ]]; then
raise_error_and_quit "Failed to fetch the file '$file'. Possible timeout?"
fi
From f57973c1456607e38266d6af702a7c976fe7ed3e Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:34:25 +0900
Subject: [PATCH 008/122] fix: full path to UI helper
---
dzgui.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index c9bd89d..0dae4f7 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -795,8 +795,8 @@ main(){
local news=$(check_news)
printf "All OK. Kicking off UI...\n"
- [[ -n $news ]] && python3 "ui.py" "--init-ui" "$news" "$version"
- [[ -z $news ]] && python3 "ui.py" "--init-ui" "null" "$version"
+ [[ -n $news ]] && python3 "$ui_helper" "--init-ui" "$news" "$version"
+ [[ -z $news ]] && python3 "$ui_helper" "--init-ui" "null" "$version"
}
main
#TODO: tech debt: cruddy handling for steam forking
From de5b53096893540fb8f637ad6099801ca7347629 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:10:02 +0900
Subject: [PATCH 009/122] fix: return codes
---
dzgui.sh | 9 ++++++---
helpers/funcs | 13 ++++++-------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 0dae4f7..a8ce9a8 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -529,17 +529,20 @@ fetch_helpers_by_sum(){
["ui.py"]="8c430f1465995cbd98f4ad8e2580a79d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="b04a0e34141e4e11da0a061802a822e3"
+ ["funcs"]="3aae486ae5097fa9b7349df1dfd25734"
)
local author="aclist"
local repo="dztui"
local branch="$branch"
- local url="https://raw.githubusercontent.com/$author/$repo/$branch/helpers/$file"
+ local file
+ local sum
+ local full_path
for i in "${!sums[@]}"; do
file="$i"
sum="${sums[$i]}"
full_path="$helpers_path/$file"
+ url="https://raw.githubusercontent.com/$author/$repo/$branch/helpers/$file"
if [[ -f "$full_path" ]] && [[ $(get_hash "$full_path") == $sum ]]; then
logger INFO "'$file' is current"
else
@@ -548,9 +551,9 @@ fetch_helpers_by_sum(){
if [[ ! $? -eq 0 ]]; then
raise_error_and_quit "Failed to fetch the file '$file'. Possible timeout?"
fi
+ logger INFO "Updated '$full_path' to sum '$sum'"
fi
[[ $file == "funcs" ]] && chmod +x "$full_path"
- logger INFO "Updated '$full_path' to sum '$sum'"
done
return 0
}
diff --git a/helpers/funcs b/helpers/funcs
index bc564d5..9313b09 100644
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -739,7 +739,8 @@ toggle(){
branch="stable"
fi
update_config
- download_new_version
+ return 255
+# download_new_version
;;
Toggle[[:space:]]mod[[:space:]]install[[:space:]]mode)
if [[ -z $auto_install ]]; then
@@ -764,6 +765,7 @@ toggle(){
fi
esac
update_config
+ return 90
}
add_to_favs(){
@@ -771,6 +773,7 @@ add_to_favs(){
ip_list+=("$record")
update_config
logger INFO "Added the record $record to saved servers"
+ return 90
}
remove_from_history(){
shift
@@ -799,6 +802,7 @@ remove_from_favs(){
local cache="$(< "$_cache_my_servers")"
<<< "$cache" grep -v -P "$r$" > $_cache_my_servers
logger INFO "Removed the record $record from saved servers"
+ return 90
}
update_favs_from_table(){
local context="$1"
@@ -815,12 +819,6 @@ update_config(){
[[ -z $branch ]] && branch="stable"
mv $config_file ${config_file}.old
write_config > $config_file
- if [[ $? -eq 0 ]]; then
- printf "Updated config file"
- return 90
- else
- return 1
- fi
logger INFO "Updated config file at '$config_file'"
}
validate_ip(){
@@ -874,6 +872,7 @@ update_config_val(){
declare -n nr=$key
nr="$value"
update_config
+ return 90
}
show_log(){
< "$debug_log" sed 's/Keyword␞/Keyword/'
From ee1803c73cf27ca8176d9bb2d3ebcf54a67fce00 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:11:32 +0900
Subject: [PATCH 010/122] fix: control flow
---
dzgui.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index a8ce9a8..c8bf364 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -442,7 +442,8 @@ migrate_files(){
cp $config_file $config_path/dztuirc.oldapi
fi
logger INFO "Migrated old API file"
- [[ -f $hist_file ]] && rm $hist_file
+ [[ ! -f $hist_file ]] && return
+ rm $hist_file
logger INFO "Wiped old history file"
}
stale_symlinks(){
From e5bc3abbd59a18d1f5e3dbf467be2c20d8036f2a Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:13:42 +0900
Subject: [PATCH 011/122] chore: update sums
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index c8bf364..4bb1509 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -530,7 +530,7 @@ fetch_helpers_by_sum(){
["ui.py"]="8c430f1465995cbd98f4ad8e2580a79d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="3aae486ae5097fa9b7349df1dfd25734"
+ ["funcs"]="7cab1604d9a614bdbb324db756c68fd9"
)
local author="aclist"
local repo="dztui"
From 0fd5cfdc8b397cce6617ff4a8fd088f649a65527 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:15:19 +0900
Subject: [PATCH 012/122] fix: download new version
---
dzgui.sh | 2 +-
helpers/funcs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
mode change 100644 => 100755 helpers/funcs
diff --git a/dzgui.sh b/dzgui.sh
index 4bb1509..bb591b4 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -530,7 +530,7 @@ fetch_helpers_by_sum(){
["ui.py"]="8c430f1465995cbd98f4ad8e2580a79d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="7cab1604d9a614bdbb324db756c68fd9"
+ ["funcs"]="2a308d08349c1cdd2dfff3830d49cd18"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
old mode 100644
new mode 100755
index 9313b09..8c4ec6e
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -739,8 +739,8 @@ toggle(){
branch="stable"
fi
update_config
+ download_new_version
return 255
-# download_new_version
;;
Toggle[[:space:]]mod[[:space:]]install[[:space:]]mode)
if [[ -z $auto_install ]]; then
From 38e199872133cc20bda71677b81b806df94a9374 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:26:33 +0900
Subject: [PATCH 013/122] fix: control flow
---
dzgui.sh | 2 +-
helpers/funcs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index bb591b4..e738445 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -530,7 +530,7 @@ fetch_helpers_by_sum(){
["ui.py"]="8c430f1465995cbd98f4ad8e2580a79d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="2a308d08349c1cdd2dfff3830d49cd18"
+ ["funcs"]="c6a6ae4d004245e34982078ec006ef3a"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 8c4ec6e..f528c88 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -706,6 +706,7 @@ download_new_version(){
curl -Ls "$version_url" > "$src_path"
rc=$?
if [[ $rc -eq 0 ]]; then
+ dl_changelog
logger INFO "Wrote new version to $src_path"
chmod +x "$src_path"
touch "${config_path}.unmerged"
@@ -718,7 +719,6 @@ download_new_version(){
logger WARN "curl failed to fetch new version. Rolling back"
return 1
fi
- dl_changelog
}
dl_changelog(){
local mdbranch
From dc4e418540f7d557674214ee529e551c192dab23 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:32:16 +0900
Subject: [PATCH 014/122] fix: error handling
---
dzgui.sh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index e738445..477a72a 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -2,7 +2,6 @@
set -o pipefail
version="4.2.0.rc-1"
-src_path=$(realpath "$0")
#CONSTANTS
aid=221100
@@ -729,8 +728,9 @@ create_config(){
done
}
varcheck(){
+ 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. Restart first-time setup now?"
if [[ ! -f $config_file ]]; then
- local msg="Config file '$config_file' missing. Start first-time setup now?"
qdialog "$msg" "Yes" "Exit"
if [[ $? -eq 1 ]]; then
logger CRITICAL "Config file missing, but user aborted setup"
@@ -742,9 +742,9 @@ varcheck(){
local workshop_dir="$steam_path/steamapps/workshop/content/$aid"
local game_dir="$steam_path/steamapps/common/DayZ"
if [[ ! -d $steam_path ]] || [[ ! -d $game_dir ]]; then
- logger WARN "DayZ path resolved to $game_dir"
- logger WARN "Workshop path resolved to $workshop_dir"
- pdialog "$msg"
+ logger WARN "DayZ path resolved to '$game_dir'"
+ logger WARN "Workshop path resolved to '$workshop_dir'"
+ qdialog "$msg2" "Yes" "Exit"
if [[ $? -eq 1 ]]; then
logger CRITICAL "Malformed Steam path, but user aborted setup"
exit 1
@@ -752,6 +752,10 @@ 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
From 66d7d16c36252c685fbcb2bcc629ed11e6c9af5f Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:50:00 +0900
Subject: [PATCH 015/122] fix: download toggle
---
dzgui.sh | 2 +-
helpers/funcs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 477a72a..d35b359 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -529,7 +529,7 @@ fetch_helpers_by_sum(){
["ui.py"]="8c430f1465995cbd98f4ad8e2580a79d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="c6a6ae4d004245e34982078ec006ef3a"
+ ["funcs"]="bacc774e52229ed6848829d06f96376e"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index f528c88..03f3644 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -702,8 +702,8 @@ format_version_url(){
}
download_new_version(){
local version_url="$(format_version_url)"
- mv "$src_path" "$src_path.old"
- curl -Ls "$version_url" > "$src_path"
+ curl -L "$version_url" > /tmp/dzg.new
+ mv /tmp/dzg.new "$src_path"
rc=$?
if [[ $rc -eq 0 ]]; then
dl_changelog
From b8fbe36c4e9fdda0a9853dc6644905022c158962 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:56:53 +0900
Subject: [PATCH 016/122] fix: curl failing
---
dzgui.sh | 2 +-
helpers/funcs | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index d35b359..60b3c01 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -529,7 +529,7 @@ fetch_helpers_by_sum(){
["ui.py"]="8c430f1465995cbd98f4ad8e2580a79d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="bacc774e52229ed6848829d06f96376e"
+ ["funcs"]="d2537e9b7916453fbfe55592d92e683f"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 03f3644..1842423 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -689,7 +689,6 @@ src_path="$src_path"
END
}
format_version_url(){
- echo FORMAT
case "$branch" in
"stable")
version_url="$stable_url/dzgui.sh"
@@ -702,8 +701,8 @@ format_version_url(){
}
download_new_version(){
local version_url="$(format_version_url)"
- curl -L "$version_url" > /tmp/dzg.new
- mv /tmp/dzg.new "$src_path"
+ mv "$src_path" "$src_path.old"
+ curl -Ls "$version_url" > "$src_path"
rc=$?
if [[ $rc -eq 0 ]]; then
dl_changelog
From 71fd37feb67525e609eb12517fba6c5b73455371 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:00:05 +0900
Subject: [PATCH 017/122] chore: comments
---
dzgui.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index 60b3c01..3972630 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -315,11 +315,13 @@ check_version(){
fi
}
download_new_version(){
+ # function differs slightly in helper file due to return codes
local version_url="$(format_version_url)"
mv "$src_path" "$src_path.old"
curl -Ls "$version_url" > "$src_path"
rc=$?
if [[ $rc -eq 0 ]]; then
+ dl_changelog
logger INFO "Wrote new version to $src_path"
chmod +x "$src_path"
touch "${config_path}.unmerged"
@@ -332,7 +334,6 @@ download_new_version(){
fdialog "Failed to download the new version. Restoring old version"
return 1
fi
- dl_changelog
}
prompt_dl(){
_text(){
From c8e61e19c1c3b7c0cbf1f4e568de170b71b9f462 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:08:00 +0900
Subject: [PATCH 018/122] chore: update pdialog
---
dzgui.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 3972630..857c3c8 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -315,7 +315,6 @@ check_version(){
fi
}
download_new_version(){
- # function differs slightly in helper file due to return codes
local version_url="$(format_version_url)"
mv "$src_path" "$src_path.old"
curl -Ls "$version_url" > "$src_path"
@@ -407,7 +406,7 @@ qdialog(){
$steamsafe_zenity --question --text="$1" --ok-label="$ok" --cancel-label="$cancel" "${zenity_flags[@]}"
}
pdialog(){
- $steamsafe_zenity --progress --pulsate --auto-close "${zenity_flags[@]}"
+ $steamsafe_zenity --progress --pulsate --auto-close "${zenity_flags[@]}" --text="$1"
}
fdialog(){
$steamsafe_zenity --warning --ok-label="Exit" --text="$1" "${zenity_flags[@]}"
@@ -789,7 +788,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
- fetch_helpers
+ fetch_helpers > >(pdialog "Fetching additional helper files")
local_latlon
is_steam_running
is_dzg_downloading
From cb0f223c597a8aa21ed195d10d53032669bf5f87 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 17:04:12 +0900
Subject: [PATCH 019/122] chore: bump version
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index 857c3c8..248d69b 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version="4.2.0.rc-1"
+version="5.0.0"
#CONSTANTS
aid=221100
From d2cad55abcea176912fb118bcd0f880167c32ab6 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 17:31:45 +0900
Subject: [PATCH 020/122] chore: normalize version
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index 248d69b..a616def 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version="5.0.0"
+version="5.0.0.rc-1"
#CONSTANTS
aid=221100
From 43087b44d4e521d5f3e1a208d1a3e21a8c0f35c6 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 12 Jan 2024 18:09:40 +0900
Subject: [PATCH 021/122] fix: remove quotes on version
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index a616def..0bb3ef9 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version="5.0.0.rc-1"
+version=5.0.0.rc-1
#CONSTANTS
aid=221100
From d214d40ad5112b23bfc3ba523e6839bd1b5ee694 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 04:58:18 +0900
Subject: [PATCH 022/122] fix: handle floats
---
helpers/funcs | 2 +-
helpers/ui.py | 80 ++++++++++++++++++++++++++++++++-------------------
2 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/helpers/funcs b/helpers/funcs
index 1842423..e736bb1 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -291,7 +291,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=$(echo "scale=4; ($size / 1024) + .005" | bc)
+ size=$(python3 -c "n=($size/1024) +.005; print(round(n,4))")
printf "%s$sep%s$sep%s$sep%3.3f\n" "$name" "$symlink" "$base_dir" "$size"
done | sort -k1
fi
diff --git a/helpers/ui.py b/helpers/ui.py
index ebc044d..48883ee 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -118,9 +118,9 @@ filters = {
"Night": True,
"Empty": False,
"Full": False,
- "Low population": True,
+ "Low pop": True,
"Non-ASCII": False,
- "Duplicate names": False
+ "Duplicate": False
}
side_buttons = [
"Connect",
@@ -441,6 +441,7 @@ class OuterWindow(Gtk.Window):
self.connect("delete-event", self.halt_proc_and_quit)
# Deprecated in GTK 4.0
self.set_border_width(10)
+ self.set_type_hint(Gdk.WindowTypeHint.DIALOG)
"""
app > win > grid > scrollable > treeview [row/server/mod store]
@@ -462,31 +463,39 @@ class OuterWindow(Gtk.Window):
class ScrollableTree(Gtk.ScrolledWindow):
- def __init__(self):
+ def __init__(self, is_steam_deck):
super().__init__()
+ #self.set_propagate_natural_height(False)
self.set_vexpand(False)
- self.treeview = TreeView()
+ self.treeview = TreeView(is_steam_deck)
self.add(self.treeview)
class RightPanel(Gtk.Box):
- def __init__(self):
+ def __init__(self, is_steam_deck):
super().__init__(spacing=6)
self.set_orientation(Gtk.Orientation.VERTICAL)
- self.button_vbox = ButtonBox()
+ self.button_vbox = ButtonBox(is_steam_deck)
self.filters_vbox = FilterPanel()
toggle_signal(self.filters_vbox, self.filters_vbox.maps_combo, '_on_map_changed', False)
self.pack_start(self.button_vbox, False, False, 0)
self.pack_start(self.filters_vbox, False, False, 0)
- self.question_label = Gtk.Label(label="Type ? for keybindings")
- self.question_label.set_ellipsize(Pango.EllipsizeMode.END)
- self.question_label.set_margin_top(100)
- self.question_label.set_margin_start(10)
- self.pack_start(self.question_label, False, True, 0)
+ self.question_button = Gtk.Button(label="?")
+ #TODO: too big on top
+ self.question_button.set_margin_top(10)
+ self.question_button.set_margin_start(50)
+ self.question_button.set_margin_end(50)
+# set_surrounding_margins(self.question_label, 50)
+ self.pack_start(self.question_button, False, True, 0)
+ self.question_button.connect("clicked", self._on_button_clicked)
+
+ def _on_button_clicked(self, button):
+ grid = self.get_parent()
+ grid.scrollable_treelist.treeview.spawn_keys_dialog(button)
def set_filter_visibility(self, bool):
self.filters_vbox.set_visible(bool)
@@ -499,7 +508,7 @@ class RightPanel(Gtk.Box):
class ButtonBox(Gtk.Box):
- def __init__(self):
+ def __init__(self, is_steam_deck):
super().__init__(spacing=6)
self.set_orientation(Gtk.Orientation.VERTICAL)
set_surrounding_margins(self, 10)
@@ -507,7 +516,7 @@ class ButtonBox(Gtk.Box):
self.buttons = list()
for side_button in side_buttons:
button = Gtk.Button(label=side_button)
- button.set_size_request(100, 100)
+ button.set_size_request(50, 50)
button.set_opacity(0.6)
self.buttons.append(button)
button.connect("clicked", self._on_selection_button_clicked)
@@ -556,7 +565,7 @@ class ButtonBox(Gtk.Box):
if context == "Exit":
logger.info("Normal user exit")
- sys.exit(1)
+ Gtk.main_quit()
cols = treeview.get_columns()
if len(cols) > 1:
@@ -609,7 +618,7 @@ class CalcDist(multiprocessing.Process):
class TreeView(Gtk.TreeView):
__gsignals__ = {"on_distcalc_started": (GObject.SignalFlags.RUN_FIRST, None, ())}
- def __init__(self):
+ def __init__(self, is_steam_deck):
super().__init__()
self.queue = multiprocessing.Queue()
@@ -631,7 +640,8 @@ class TreeView(Gtk.TreeView):
column = Gtk.TreeViewColumn(column_title, renderer, text=i)
self.append_column(column)
# TODO: change font size on the fly
- # renderer.set_property("size-points", 20)
+ if is_steam_deck is True:
+ renderer.set_property("size-points", 20)
self.connect("row-activated", self._on_row_activated)
self.connect("key-press-event", self._on_keypress)
@@ -788,6 +798,12 @@ class TreeView(Gtk.TreeView):
tooltip = format_metadata(row_sel)
grid.update_statusbar(tooltip)
+ def spawn_keys_dialog(self, widget):
+ diag = KeysDialog(self.get_outer_window(), '', "Keybindings")
+ diag.run()
+ diag.destroy()
+ self.grab_focus()
+
def _on_keypress_main_menu(self, treeview, event):
window = self.get_outer_window()
grid = self.get_outer_grid()
@@ -796,9 +812,7 @@ class TreeView(Gtk.TreeView):
grid.right_panel.focus_button_box()
case Gdk.KEY_question:
if event.state is Gdk.ModifierType.SHIFT_MASK:
- diag = KeysDialog(window, '', "Keybindings")
- diag.run()
- diag.destroy()
+ self.spawn_keys_dialog(None)
case Gdk.KEY_f:
if event.state is Gdk.ModifierType.CONTROL_MASK:
return True
@@ -902,11 +916,11 @@ class TreeView(Gtk.TreeView):
renderer = Gtk.CellRendererText()
column = Gtk.TreeViewColumn(column_title, renderer, text=i)
column.set_sort_column_id(i)
- """Prevent columns from auto-adjusting"""
+ #"""Prevent columns from auto-adjusting"""
if ("Name" in column_title):
column.set_fixed_width(800)
- if (column_title == "Map"):
- column.set_fixed_width(300)
+ #if (column_title == "Map"):
+ # column.set_fixed_width(300)
self.append_column(column)
self.update_first_col(mode)
@@ -962,8 +976,8 @@ class TreeView(Gtk.TreeView):
if i == 3:
column.set_cell_data_func(renderer, self._format_float, func_data=None)
column.set_sort_column_id(i)
- if (column_title == "Name"):
- column.set_fixed_width(600)
+ #if (column_title == "Name"):
+ # column.set_fixed_width(600)
self.append_column(column)
if mode == "List installed mods":
@@ -1380,17 +1394,24 @@ class Grid(Gtk.Grid):
self.set_column_homogeneous(True)
#self.set_row_homogeneous(True)
- self.scrollable_treelist = ScrollableTree()
- self.scrollable_treelist.set_vexpand(True)
- self.right_panel = RightPanel()
-
_news = sys.argv[2]
+ _isd = sys.argv[3]
self._version = "%s %s" %(app_name, sys.argv[3])
+ if _isd == 1:
+ is_steam_deck = True
+ else:
+ is_steam_deck = False
+
if _news != "null":
self.news = NewsHeader(_news)
self.attach(self.news, 0, -1, 8, 10)
+ self.scrollable_treelist = ScrollableTree(is_steam_deck)
+ self.scrollable_treelist.set_vexpand(True)
+ self.right_panel = RightPanel(is_steam_deck)
+
+
self.bar = Gtk.Statusbar()
self.scrollable_treelist.treeview.connect("on_distcalc_started", self._on_calclat_started)
@@ -1464,7 +1485,8 @@ class App(Gtk.Application):
# TODO: steam deck
# self.win.set_size_request(1280,800)
- self.win.fullscreen()
+ #self.win.fullscreen()
+ self.win.set_keep_below(True)
accel = Gtk.AccelGroup()
accel.connect(Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE, self._halt_window_subprocess)
From 6f9aaa252b18db67a3f6bf18d39fa56051287d61 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 04:59:26 +0900
Subject: [PATCH 023/122] fix: toggle news
---
dzgui.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 0bb3ef9..fa1dac3 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -803,8 +803,8 @@ main(){
local news=$(check_news)
printf "All OK. Kicking off UI...\n"
- [[ -n $news ]] && python3 "$ui_helper" "--init-ui" "$news" "$version"
- [[ -z $news ]] && python3 "$ui_helper" "--init-ui" "null" "$version"
+ [[ -z $news ]] && news="null"
+ python3 "$ui_helper" "--init-ui" "$news" "$version" "$is_steam_deck"
}
main
#TODO: tech debt: cruddy handling for steam forking
From d93c06c5dac446a54c04e1fcc0a0849a11357f73 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 05:22:51 +0900
Subject: [PATCH 024/122] fix: workshop page on own thread
---
helpers/ui.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helpers/ui.py b/helpers/ui.py
index 48883ee..6f9ff8a 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -1344,7 +1344,7 @@ class ModDialog(GenericDialog):
path = pathlist[0]
tree_iter = model.get_iter(path)
mod_id = model.get_value(tree_iter, 1)
- call_out(treeview, "open_workshop_page", mod_id)
+ subprocess.Popen(['/usr/bin/env', 'bash', funcs, "open_workshop_page", mod_id])
class EntryDialog(GenericDialog):
def __init__(self, parent, text, mode, link):
From e062d6cb60d4a07eee0d6e54742f503bc1c7b442 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 05:23:41 +0900
Subject: [PATCH 025/122] chore: bump version
---
dzgui.sh | 2 +-
helpers/funcs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index fa1dac3..e55346d 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-1
+version=5.0.0.rc-2
#CONSTANTS
aid=221100
diff --git a/helpers/funcs b/helpers/funcs
index e736bb1..8ae9a4e 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version="5.0.0.rc-1"
+version="5.0.0.rc-2"
#CONSTANTS
aid=221100
From 810f4dbdc6ef28da8cf8cf34d69cd1978918a4cc Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 05:32:39 +0900
Subject: [PATCH 026/122] chore: update sums
---
dzgui.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index e55346d..1029472 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -526,10 +526,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="8c430f1465995cbd98f4ad8e2580a79d"
+ ["ui.py"]="6870f75ff74a8ad65d82650499d739de"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="d2537e9b7916453fbfe55592d92e683f"
+ ["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
)
local author="aclist"
local repo="dztui"
From 9847c95617f3ef8b3db565ba140cb880a295673a Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 05:44:21 +0900
Subject: [PATCH 027/122] fix: steam deck ui
---
dzgui.sh | 6 ++++--
helpers/ui.py | 11 ++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 1029472..bb028ba 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-2
+version=5.0.0.rc-3
#CONSTANTS
aid=221100
@@ -316,8 +316,10 @@ check_version(){
}
download_new_version(){
local version_url="$(format_version_url)"
+ logger INFO "Version URL is '$version_url'"
+ logger INFO "$src_path"
mv "$src_path" "$src_path.old"
- curl -Ls "$version_url" > "$src_path"
+ curl -L "$version_url" > "$src_path" 2>$debug_log
rc=$?
if [[ $rc -eq 0 ]]; then
dl_changelog
diff --git a/helpers/ui.py b/helpers/ui.py
index 6f9ff8a..26c9002 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -516,7 +516,10 @@ class ButtonBox(Gtk.Box):
self.buttons = list()
for side_button in side_buttons:
button = Gtk.Button(label=side_button)
- button.set_size_request(50, 50)
+ if is_steam_deck is True:
+ button.set_size_request(10, 10)
+ else
+ button.set_size_request(50,50)
button.set_opacity(0.6)
self.buttons.append(button)
button.connect("clicked", self._on_selection_button_clicked)
@@ -1483,10 +1486,8 @@ class App(Gtk.Application):
self.win = OuterWindow()
- # TODO: steam deck
- # self.win.set_size_request(1280,800)
- #self.win.fullscreen()
- self.win.set_keep_below(True)
+ self.win.fullscreen()
+ #self.win.set_keep_below(True)
accel = Gtk.AccelGroup()
accel.connect(Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE, self._halt_window_subprocess)
From 00aae2ce84c5606cb215e2fbb03b02173a4d4b69 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 05:53:54 +0900
Subject: [PATCH 028/122] chore: update sums
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index bb028ba..b9a0445 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -528,7 +528,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="6870f75ff74a8ad65d82650499d739de"
+ ["ui.py"]="bc75587cad618090b370c2fe851f8893"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
From f3dcd058cd3b792336cad98f3e2c2b59eb0ff228 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 06:01:46 +0900
Subject: [PATCH 029/122] fix: else statement
---
helpers/ui.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helpers/ui.py b/helpers/ui.py
index 26c9002..ee7918d 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -518,7 +518,7 @@ class ButtonBox(Gtk.Box):
button = Gtk.Button(label=side_button)
if is_steam_deck is True:
button.set_size_request(10, 10)
- else
+ else:
button.set_size_request(50,50)
button.set_opacity(0.6)
self.buttons.append(button)
From ecc790123a0036c1aa77255c4875710cd72f2585 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 06:04:08 +0900
Subject: [PATCH 030/122] chore: bump sums
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index b9a0445..e52c00e 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -528,7 +528,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="bc75587cad618090b370c2fe851f8893"
+ ["ui.py"]="840a96d695f1937c33f6e0da38c66164"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
From 42512e97a9528646b41f82e67d0163c0616801fb Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 06:16:40 +0900
Subject: [PATCH 031/122] fix: shift sys args
---
dzgui.sh | 2 +-
helpers/ui.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index e52c00e..b68598c 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -528,7 +528,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="840a96d695f1937c33f6e0da38c66164"
+ ["ui.py"]="f705b5e0eec2352aea99764b00bb8656"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/ui.py b/helpers/ui.py
index ee7918d..d4275f1 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -1398,8 +1398,8 @@ class Grid(Gtk.Grid):
#self.set_row_homogeneous(True)
_news = sys.argv[2]
- _isd = sys.argv[3]
self._version = "%s %s" %(app_name, sys.argv[3])
+ _isd = sys.argv[4]
if _isd == 1:
is_steam_deck = True
From e05bf493959114c31d9d7830592e7e047baee339 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 06:18:59 +0900
Subject: [PATCH 032/122] chore: bump version
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index b68598c..071f6ec 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-3
+version=5.0.0.rc-4
#CONSTANTS
aid=221100
From 2a24bbfe6b22054f4054b715eeea32f2029db223 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 06:34:24 +0900
Subject: [PATCH 033/122] fix: type coercion
---
dzgui.sh | 4 ++--
helpers/ui.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 071f6ec..3abf8cb 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-4
+version=5.0.0.rc-5
#CONSTANTS
aid=221100
@@ -528,7 +528,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="f705b5e0eec2352aea99764b00bb8656"
+ ["ui.py"]="9cef55ccaa1c71b7e3ef648fe68d0eec"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/ui.py b/helpers/ui.py
index d4275f1..f79c4a1 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -1399,7 +1399,7 @@ class Grid(Gtk.Grid):
_news = sys.argv[2]
self._version = "%s %s" %(app_name, sys.argv[3])
- _isd = sys.argv[4]
+ _isd = int(sys.argv[4])
if _isd == 1:
is_steam_deck = True
From 00452cca5f0762916bfa9e6aaaf6b596ad8f4614 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 06:39:22 +0900
Subject: [PATCH 034/122] chore: focus in signals
---
dzgui.sh | 4 ++--
helpers/ui.py | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 3abf8cb..0a17188 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-5
+version=5.0.0.rc-6
#CONSTANTS
aid=221100
@@ -528,7 +528,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="9cef55ccaa1c71b7e3ef648fe68d0eec"
+ ["ui.py"]="a6d80a2cfff27e7c02e16499a0983f8e"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/ui.py b/helpers/ui.py
index f79c4a1..eaefb8f 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -1487,7 +1487,6 @@ class App(Gtk.Application):
self.win = OuterWindow()
self.win.fullscreen()
- #self.win.set_keep_below(True)
accel = Gtk.AccelGroup()
accel.connect(Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE, self._halt_window_subprocess)
@@ -1525,6 +1524,8 @@ class FilterPanel(Gtk.Box):
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_esc_pressed)
+ self.keyword_entry.connect("focus-in-event", self._on_keyword_focused)
+ self.keyword_entry.connect("focus-out-event", self._on_keyword_unfocused)
renderer_text = Gtk.CellRendererText(ellipsize=Pango.EllipsizeMode.END)
self.maps_combo = Gtk.ComboBox.new_with_model(map_store)
@@ -1546,6 +1547,16 @@ class FilterPanel(Gtk.Box):
self.pack_start(self.debug_toggle, False, False, 0)
+ def _on_keyword_unfocused(self, widget):
+ print("user unfocused keyword field")
+ win = self.get_outer_window()
+ win.set_keep_below(False)
+
+ def _on_keyword_focused(self, widget):
+ print("user focused keyword field")
+ win = self.get_outer_window()
+ win.set_keep_below(True)
+
def _on_button_toggled(self, button, command):
transient_parent = self.get_outer_window()
grid = self.get_outer_grid()
@@ -1577,6 +1588,8 @@ class FilterPanel(Gtk.Box):
return outer_window
def _on_keyword_enter(self, keyword_entry):
+ win = self.get_outer_window()
+ win.set_keep_below(False)
keyword = keyword_entry.get_text()
old_keyword = keyword_filter[0].split(delimiter)[1]
if keyword == old_keyword:
From 406663cd7abd97ce280878cc0ee804fee407880b Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 06:50:34 +0900
Subject: [PATCH 035/122] chore: focus in signals
---
dzgui.sh | 6 +++---
helpers/funcs | 2 +-
helpers/ui.py | 25 +++++++++++++------------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 0a17188..a7db1c9 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-6
+version=5.0.0.rc-7
#CONSTANTS
aid=221100
@@ -528,7 +528,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="a6d80a2cfff27e7c02e16499a0983f8e"
+ ["ui.py"]="a4adb00c54d71ad9268cf3cbf8df0a1e"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
@@ -790,7 +790,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
- fetch_helpers > >(pdialog "Fetching additional helper files")
+# fetch_helpers > >(pdialog "Fetching additional helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index 8ae9a4e..b8f44ef 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version="5.0.0.rc-2"
+version="5.0.0.rc-7"
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index eaefb8f..b4cb48f 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.1
+# 5.0.0-rc.7
app_name = "DZGUI"
cache = {}
@@ -434,7 +434,7 @@ def reinit_checks():
class OuterWindow(Gtk.Window):
- def __init__(self):
+ def __init__(self, is_steam_deck):
super().__init__()
self.connect("destroy", self.halt_proc_and_quit)
@@ -447,7 +447,7 @@ class OuterWindow(Gtk.Window):
app > win > grid > scrollable > treeview [row/server/mod store]
app > win > grid > vbox > buttonbox > filterpanel > combo [map store]
"""
- self.grid = Grid()
+ self.grid = Grid(is_steam_deck)
self.add(self.grid)
self.hb = AppHeaderBar()
self.set_titlebar(self.hb)
@@ -1391,7 +1391,7 @@ class EntryDialog(GenericDialog):
class Grid(Gtk.Grid):
- def __init__(self):
+ def __init__(self, is_steam_deck):
super().__init__()
Gtk.Grid()
self.set_column_homogeneous(True)
@@ -1399,12 +1399,6 @@ class Grid(Gtk.Grid):
_news = sys.argv[2]
self._version = "%s %s" %(app_name, sys.argv[3])
- _isd = int(sys.argv[4])
-
- if _isd == 1:
- is_steam_deck = True
- else:
- is_steam_deck = False
if _news != "null":
self.news = NewsHeader(_news)
@@ -1484,9 +1478,16 @@ def toggle_signal(owner, widget, func_name, bool):
class App(Gtk.Application):
def __init__(self):
- self.win = OuterWindow()
+ _isd = sys.argv[4]
+ if _isd == 1:
+ is_steam_deck = True
+ else:
+ is_steam_deck = False
- self.win.fullscreen()
+ self.win = OuterWindow(is_steam_deck)
+
+ if is_steam_deck == 1:
+ self.win.fullscreen()
accel = Gtk.AccelGroup()
accel.connect(Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE, self._halt_window_subprocess)
From c6a654d25a21b63c5518d83d13e2d2b26495d39d Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 07:07:45 +0900
Subject: [PATCH 036/122] chore: update keybindings dialog
---
dzgui.sh | 4 ++--
helpers/funcs | 2 +-
helpers/ui.py | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index a7db1c9..7786144 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-7
+version=5.0.0.rc-8
#CONSTANTS
aid=221100
@@ -528,7 +528,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="a4adb00c54d71ad9268cf3cbf8df0a1e"
+ ["ui.py"]="309e9f77f7820d4387f148a2b6898bc4"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index b8f44ef..3cf2a2d 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version="5.0.0.rc-7"
+version=5.0.0.rc-8
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index b4cb48f..f76cd42 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.7
+# 5.0.0-rc.8
app_name = "DZGUI"
cache = {}
@@ -1262,6 +1262,7 @@ def KeysDialog(parent, text, mode):
Ctrl-q: quit
Enter/Space/Double click: select row item
Up, Down: navigate through row items
+ ?: open this dialog
Button navigation
Right: jump from main view to side buttons
From cadcae9b9d1770bf45a25e16670828057055a1f0 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 07:15:17 +0900
Subject: [PATCH 037/122] fix: stray output in stdout
---
dzgui.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 7786144..54d2a88 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-8
+version=5.0.0.rc-9
#CONSTANTS
aid=221100
@@ -232,7 +232,6 @@ watcher_deps(){
logger INFO "Found DZG Watcher dependencies"
}
format_version_url(){
- echo FORMAT
case "$branch" in
"stable")
version_url="$stable_url/dzgui.sh"
From 1e17b9b9a3ac39aae828768503d419bc9ec519e1 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 07:25:36 +0900
Subject: [PATCH 038/122] fix: type coercion
---
dzgui.sh | 6 +++---
helpers/funcs | 2 +-
helpers/ui.py | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 54d2a88..8c72c02 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-9
+version=5.0.0.rc-10
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="309e9f77f7820d4387f148a2b6898bc4"
+ ["ui.py"]="bafc59a53216c12e3d3b605512cbe900"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
@@ -789,7 +789,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
-# fetch_helpers > >(pdialog "Fetching additional helper files")
+ fetch_helpers > >(pdialog "Fetching additional helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index 3cf2a2d..c9a8bde 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-8
+version=5.0.0.rc-10
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index f76cd42..9d8febf 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.8
+# 5.0.0-rc.10
app_name = "DZGUI"
cache = {}
@@ -1479,7 +1479,7 @@ def toggle_signal(owner, widget, func_name, bool):
class App(Gtk.Application):
def __init__(self):
- _isd = sys.argv[4]
+ _isd = int(sys.argv[4])
if _isd == 1:
is_steam_deck = True
else:
From e5c78f95ad8a4cb164138ae5129c8de85fd258c3 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 09:52:38 +0900
Subject: [PATCH 039/122] fix: grid allocation
---
dzgui.sh | 4 ++--
helpers/funcs | 2 +-
helpers/ui.py | 40 +++++++++++++++++++---------------------
3 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 8c72c02..e86e143 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-10
+version=5.0.0.rc-11
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="bafc59a53216c12e3d3b605512cbe900"
+ ["ui.py"]="16db16b6fba95758e866ee955b573f01"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index c9a8bde..1061b49 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-10
+version=5.0.0.rc-11
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 9d8febf..babcbd6 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.10
+# 5.0.0-rc.11
app_name = "DZGUI"
cache = {}
@@ -123,7 +123,7 @@ filters = {
"Duplicate": False
}
side_buttons = [
- "Connect",
+ "Main menu",
"Manage",
"Options",
"Help",
@@ -584,7 +584,7 @@ class ButtonBox(Gtk.Box):
match context:
case 'Manage': self._populate(manage)
- case 'Connect': self._populate(connect)
+ case 'Main menu': self._populate(connect)
case 'Options': self._populate(options)
case 'Help': self._populate(help)
@@ -637,7 +637,7 @@ class TreeView(Gtk.TreeView):
self.set_model(row_store)
for i, column_title in enumerate(
- ["Connect"]
+ ["Main menu"]
):
renderer = Gtk.CellRendererText()
column = Gtk.TreeViewColumn(column_title, renderer, text=i)
@@ -1394,7 +1394,6 @@ class EntryDialog(GenericDialog):
class Grid(Gtk.Grid):
def __init__(self, is_steam_deck):
super().__init__()
- Gtk.Grid()
self.set_column_homogeneous(True)
#self.set_row_homogeneous(True)
@@ -1406,7 +1405,13 @@ class Grid(Gtk.Grid):
self.attach(self.news, 0, -1, 8, 10)
self.scrollable_treelist = ScrollableTree(is_steam_deck)
- self.scrollable_treelist.set_vexpand(True)
+ if is_steam_deck is True:
+ self.scrollable_treelist.set_hexpand(False)
+ self.scrollable_treelist.set_vexpand(False)
+ else:
+ self.scrollable_treelist.set_hexpand(True)
+ self.scrollable_treelist.set_vexpand(True)
+
self.right_panel = RightPanel(is_steam_deck)
@@ -1420,9 +1425,14 @@ class Grid(Gtk.Grid):
self.bar.add(self.status_right_label)
self.update_right_statusbar()
- self.attach(self.scrollable_treelist, 0, 0, 8, 10)
- self.attach_next_to(self.bar, self.scrollable_treelist, Gtk.PositionType.BOTTOM, 8, 1)
- self.attach_next_to(self.right_panel, self.scrollable_treelist, Gtk.PositionType.RIGHT, 1, 1)
+ if is_steam_deck is True:
+ self.attach(self.scrollable_treelist, 0, 0, 5, 3)
+ self.attach_next_to(self.bar, self.scrollable_treelist, Gtk.PositionType.BOTTOM, 5, 1)
+ self.attach_next_to(self.right_panel, self.scrollable_treelist, Gtk.PositionType.RIGHT, 3, 1)
+ else:
+ self.attach(self.scrollable_treelist, 0, 0, 7, 5)
+ self.attach_next_to(self.bar, self.scrollable_treelist, Gtk.PositionType.BOTTOM, 7, 1)
+ self.attach_next_to(self.right_panel, self.scrollable_treelist, Gtk.PositionType.RIGHT, 1, 1)
def update_right_statusbar(self):
config_vals.clear()
@@ -1526,8 +1536,6 @@ class FilterPanel(Gtk.Box):
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_esc_pressed)
- self.keyword_entry.connect("focus-in-event", self._on_keyword_focused)
- self.keyword_entry.connect("focus-out-event", self._on_keyword_unfocused)
renderer_text = Gtk.CellRendererText(ellipsize=Pango.EllipsizeMode.END)
self.maps_combo = Gtk.ComboBox.new_with_model(map_store)
@@ -1549,16 +1557,6 @@ class FilterPanel(Gtk.Box):
self.pack_start(self.debug_toggle, False, False, 0)
- def _on_keyword_unfocused(self, widget):
- print("user unfocused keyword field")
- win = self.get_outer_window()
- win.set_keep_below(False)
-
- def _on_keyword_focused(self, widget):
- print("user focused keyword field")
- win = self.get_outer_window()
- win.set_keep_below(True)
-
def _on_button_toggled(self, button, command):
transient_parent = self.get_outer_window()
grid = self.get_outer_grid()
From 0bc160c13f9e5804b116268b9b73da75d1ec1c84 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 09:54:17 +0900
Subject: [PATCH 040/122] fix: drop fullscreen
---
dzgui.sh | 2 +-
helpers/funcs | 2 +-
helpers/ui.py | 5 +----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index e86e143..8c7bfe0 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="16db16b6fba95758e866ee955b573f01"
+ ["ui.py"]="5b614859376857b3579dbc7fd1db783d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index 1061b49..6c50b81 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-11
+version=5.0.0.rc-12
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index babcbd6..000e8ac 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.11
+# 5.0.0-rc.12
app_name = "DZGUI"
cache = {}
@@ -1497,9 +1497,6 @@ class App(Gtk.Application):
self.win = OuterWindow(is_steam_deck)
- if is_steam_deck == 1:
- self.win.fullscreen()
-
accel = Gtk.AccelGroup()
accel.connect(Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE, self._halt_window_subprocess)
self.win.add_accel_group(accel)
From de3dec41a3b693254e9e77499c3f7ff1aadce8d2 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 10:47:02 +0900
Subject: [PATCH 041/122] fix; align grid elements
---
dzgui.sh | 4 ++--
helpers/funcs | 2 +-
helpers/ui.py | 19 ++++++++++++-------
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 8c7bfe0..fe3383a 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-11
+version=5.0.0.rc-13
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="5b614859376857b3579dbc7fd1db783d"
+ ["ui.py"]="b3e8dca80ed61c1da896ac37bec70ca8"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index 6c50b81..168a024 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-12
+version=5.0.0.rc-13
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 000e8ac..d166d6e 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.12
+# 5.0.0-rc.13
app_name = "DZGUI"
cache = {}
@@ -450,7 +450,12 @@ class OuterWindow(Gtk.Window):
self.grid = Grid(is_steam_deck)
self.add(self.grid)
self.hb = AppHeaderBar()
- self.set_titlebar(self.hb)
+
+ if is_steam_deck is not 1:
+ self.set_titlebar(self.hb)
+ if is_steam_deck is 1:
+ self.maximize()
+ self.set_decorated(False)
# Hide FilterPanel on main menu
self.show_all()
@@ -933,6 +938,7 @@ class TreeView(Gtk.TreeView):
toggle_signal(self.get_outer_grid().right_panel.filters_vbox, check, '_on_check_toggle', True)
toggle_signal(self, self, '_on_keypress', True)
+ self.get_parent().set_vexpand(False)
wait_dialog = GenericDialog(transient_parent, "Fetching server metadata", "WAIT")
wait_dialog.show_all()
thread = threading.Thread(target=self._background, args=(wait_dialog, mode))
@@ -1297,7 +1303,6 @@ class ModDialog(GenericDialog):
self.scrollable = Gtk.ScrolledWindow()
self.view = Gtk.TreeView()
- self.scrollable.set_vexpand(True)
self.scrollable.add(self.view)
set_surrounding_margins(self.scrollable, 20)
@@ -1407,7 +1412,7 @@ class Grid(Gtk.Grid):
self.scrollable_treelist = ScrollableTree(is_steam_deck)
if is_steam_deck is True:
self.scrollable_treelist.set_hexpand(False)
- self.scrollable_treelist.set_vexpand(False)
+ self.scrollable_treelist.set_vexpand(True)
else:
self.scrollable_treelist.set_hexpand(True)
self.scrollable_treelist.set_vexpand(True)
@@ -1426,9 +1431,9 @@ class Grid(Gtk.Grid):
self.update_right_statusbar()
if is_steam_deck is True:
- self.attach(self.scrollable_treelist, 0, 0, 5, 3)
- self.attach_next_to(self.bar, self.scrollable_treelist, Gtk.PositionType.BOTTOM, 5, 1)
- self.attach_next_to(self.right_panel, self.scrollable_treelist, Gtk.PositionType.RIGHT, 3, 1)
+ self.attach(self.scrollable_treelist, 0, 0, 4, 1)
+ self.attach_next_to(self.bar, self.scrollable_treelist, Gtk.PositionType.BOTTOM, 4, 1)
+ self.attach_next_to(self.right_panel, self.scrollable_treelist, Gtk.PositionType.RIGHT, 1, 1)
else:
self.attach(self.scrollable_treelist, 0, 0, 7, 5)
self.attach_next_to(self.bar, self.scrollable_treelist, Gtk.PositionType.BOTTOM, 7, 1)
From 2dac511608fd1eea95c54e82f24d511c3251adb9 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 10:53:12 +0900
Subject: [PATCH 042/122] fix: else statement
---
dzgui.sh | 4 ++--
helpers/funcs | 2 +-
helpers/ui.py | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index fe3383a..d9fc71e 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-13
+version=5.0.0.rc-14
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="b3e8dca80ed61c1da896ac37bec70ca8"
+ ["ui.py"]="af590bd7ac031409beb8fbc669398721"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index 168a024..5869527 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-13
+version=5.0.0.rc-14
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index d166d6e..5659883 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.13
+# 5.0.0-rc.14
app_name = "DZGUI"
cache = {}
@@ -451,11 +451,11 @@ class OuterWindow(Gtk.Window):
self.add(self.grid)
self.hb = AppHeaderBar()
- if is_steam_deck is not 1:
- self.set_titlebar(self.hb)
if is_steam_deck is 1:
self.maximize()
self.set_decorated(False)
+ else:
+ self.set_titlebar(self.hb)
# Hide FilterPanel on main menu
self.show_all()
From c8fed9757539516d6693970d2042eb60ce4b304f Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 11:04:32 +0900
Subject: [PATCH 043/122] fix: conditional
---
dzgui.sh | 4 ++--
helpers/funcs | 2 +-
helpers/ui.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index d9fc71e..ea2503b 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-14
+version=5.0.0.rc-15
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="af590bd7ac031409beb8fbc669398721"
+ ["ui.py"]="f4937dc60184eb7d53b9d14070820947"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index 5869527..6fbce1f 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-14
+version=5.0.0.rc-15
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 5659883..3b637cc 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.14
+# 5.0.0-rc.15
app_name = "DZGUI"
cache = {}
@@ -451,7 +451,7 @@ class OuterWindow(Gtk.Window):
self.add(self.grid)
self.hb = AppHeaderBar()
- if is_steam_deck is 1:
+ if is_steam_deck is True:
self.maximize()
self.set_decorated(False)
else:
From 0ca94a68d06fa31c1e796d287b30f53e5a2c8e4f Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 11:09:42 +0900
Subject: [PATCH 044/122] chore: test vexpand
---
dzgui.sh | 4 ++--
helpers/funcs | 2 +-
helpers/ui.py | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index ea2503b..cd85428 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-15
+version=5.0.0.rc-16
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="f4937dc60184eb7d53b9d14070820947"
+ ["ui.py"]="275629a53b5b7c28d897eb9902c23d19"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index 6fbce1f..2618194 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-15
+version=5.0.0.rc-16
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 3b637cc..8001283 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.15
+# 5.0.0-rc.16
app_name = "DZGUI"
cache = {}
@@ -471,7 +471,6 @@ class ScrollableTree(Gtk.ScrolledWindow):
def __init__(self, is_steam_deck):
super().__init__()
#self.set_propagate_natural_height(False)
- self.set_vexpand(False)
self.treeview = TreeView(is_steam_deck)
self.add(self.treeview)
@@ -938,7 +937,6 @@ class TreeView(Gtk.TreeView):
toggle_signal(self.get_outer_grid().right_panel.filters_vbox, check, '_on_check_toggle', True)
toggle_signal(self, self, '_on_keypress', True)
- self.get_parent().set_vexpand(False)
wait_dialog = GenericDialog(transient_parent, "Fetching server metadata", "WAIT")
wait_dialog.show_all()
thread = threading.Thread(target=self._background, args=(wait_dialog, mode))
From bb07cf3ac7f2e3f7d215c2dc65a98635b0ad735c Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 11:20:40 +0900
Subject: [PATCH 045/122] fix: changelog URL
---
dzgui.sh | 4 ++--
helpers/funcs | 6 +++---
helpers/ui.py | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index cd85428..df3ecff 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-16
+version=5.0.0.rc-17
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="275629a53b5b7c28d897eb9902c23d19"
+ ["ui.py"]="1c0c003c2dd9e5ed53c6bf193127d42d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index 2618194..9119ddf 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-16
+version=5.0.0.rc-17
#CONSTANTS
aid=221100
@@ -723,7 +723,7 @@ dl_changelog(){
local mdbranch
local file="CHANGELOG.md"
[[ $branch == "stable" ]] && mdbranch="dzgui"
- [[ $branch == "" ]] && mdbranch="testing"
+ [[ $branch == "testing" ]] && mdbranch="testing"
local md="https://raw.githubusercontent.com/$author/$repo/${mdbranch}/$file"
curl -Ls "$md" > "$state_path/$file"
}
@@ -1162,7 +1162,7 @@ manual_mod_install(){
if [[ -z $diff ]]; then
launch "$ip" "$gameport" "$sanitized_mods"
else
- printf "Some mods may have failed to download. Try connecting again to resync"
+ printf "Some mods may have failed to download. Try connecting again to resync."
exit 1
fi
}
diff --git a/helpers/ui.py b/helpers/ui.py
index 8001283..9300e9e 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.16
+# 5.0.0-rc.17
app_name = "DZGUI"
cache = {}
@@ -489,13 +489,13 @@ class RightPanel(Gtk.Box):
self.pack_start(self.filters_vbox, False, False, 0)
self.question_button = Gtk.Button(label="?")
- #TODO: too big on top
self.question_button.set_margin_top(10)
self.question_button.set_margin_start(50)
self.question_button.set_margin_end(50)
-# set_surrounding_margins(self.question_label, 50)
- self.pack_start(self.question_button, False, True, 0)
self.question_button.connect("clicked", self._on_button_clicked)
+ set_surrounding_margins(self.question_label, 50)
+ if is_steam_deck is False:
+ self.pack_start(self.question_button, False, True, 0)
def _on_button_clicked(self, button):
grid = self.get_parent()
From 208e9ef7ad2ff56c3ee61f88fe9f882f6ca48a92 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 11:32:12 +0900
Subject: [PATCH 046/122] fix: strip SOH codes
---
dzgui.sh | 4 ++--
helpers/funcs | 5 +++--
helpers/ui.py | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index df3ecff..8ac61dc 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-17
+version=5.0.0.rc-18
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="1c0c003c2dd9e5ed53c6bf193127d42d"
+ ["ui.py"]="0cecc039d2026a65094f41587aeeea53"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index 9119ddf..d0c2eaa 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-17
+version=5.0.0.rc-18
#CONSTANTS
aid=221100
@@ -528,7 +528,8 @@ sanitize(){
}
parse_server_json(){
local response="$1"
- <<< "$response" jq -r '
+ # some servers pad SOH in name
+ <<< "$response" sed 's/\\u0001//g' | jq -r '
.[]|"\(.name)␞" +
"\(.map|if type == "string" then ascii_downcase else "null" end)␞" +
"\(if .gametype == null then "null" else (.gametype|split(",")|if any(. == "no3rd") then "1PP" else "3PP" end) end)␞" +
diff --git a/helpers/ui.py b/helpers/ui.py
index 9300e9e..9e50ece 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.17
+# 5.0.0-rc.18
app_name = "DZGUI"
cache = {}
From af1bed9319b9b4c0127180a2991be0d8e69a7890 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 11:35:51 +0900
Subject: [PATCH 047/122] fix: element name
---
dzgui.sh | 4 ++--
helpers/funcs | 2 +-
helpers/ui.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 8ac61dc..bbffbd9 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-18
+version=5.0.0.rc-19
#CONSTANTS
aid=221100
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="0cecc039d2026a65094f41587aeeea53"
+ ["ui.py"]="67d9b617cf53213965bebfc91aae1e6e"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
diff --git a/helpers/funcs b/helpers/funcs
index d0c2eaa..0ba98cc 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-18
+version=5.0.0.rc-19
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 9e50ece..36fb350 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.18
+# 5.0.0-rc.19
app_name = "DZGUI"
cache = {}
@@ -493,7 +493,7 @@ class RightPanel(Gtk.Box):
self.question_button.set_margin_start(50)
self.question_button.set_margin_end(50)
self.question_button.connect("clicked", self._on_button_clicked)
- set_surrounding_margins(self.question_label, 50)
+ set_surrounding_margins(self.question_button, 50)
if is_steam_deck is False:
self.pack_start(self.question_button, False, True, 0)
From 87ba21a26a06f8e0c2980a6f28f6ad14fb3543f4 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 14:57:23 +0900
Subject: [PATCH 048/122] fix: restore URLs
---
dzgui.sh | 6 +++---
helpers/funcs | 48 ++++++++++++++++++------------------------------
helpers/ui.py | 6 +-----
3 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index bbffbd9..40d2408 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-19
+version=5.0.0.rc-20
#CONSTANTS
aid=221100
@@ -527,10 +527,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="67d9b617cf53213965bebfc91aae1e6e"
+ ["ui.py"]="62133c6c603584a283e86b4629c9c5aa"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="d9b0e6fa68314c18ac7aad565645948f"
+ ["funcs"]="8b5f43cb3647d96ffdcb8ce17822e104"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 0ba98cc..7c0eb8b 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-19
+version=5.0.0.rc-20
#CONSTANTS
aid=221100
@@ -299,33 +299,6 @@ list_mods(){
installed_mods(){
ls -1 "$workshop_dir"
}
-open_url(){
- local context="$1"
- local url
- case "$context" in
- "Help file ⧉")
- url="$help_url"
- ;;
- "Report a bug ⧉")
- url="$issues_url"
- ;;
- "Forum ⧉")
- url="$forum_url"
- ;;
- "Sponsor ⧉")
- url="$sponsor_url"
- ;;
- "Hall of fame ⧉")
- url="${help_url}#_hall_of_fame"
- ;;
- esac
-
- if [[ -n "$BROWSER" ]]; then
- "$BROWSER" "$url" 2>/dev/null
- return
- fi
- xdg-open "$url" 2>/dev/null
-}
local_latlon(){
local url="http://ip-api.com/json/$local_ip"
local local_ip
@@ -897,10 +870,25 @@ open_link(){
"Open Battlemetrics API page")
url="$battlemetrics_api_url"
;;
+ "Help file ⧉")
+ url="$help_url"
+ ;;
+ "Report a bug ⧉")
+ url="$issues_url"
+ ;;
+ "Forum ⧉")
+ url="$forum_url"
+ ;;
+ "Sponsor ⧉")
+ url="$sponsor_url"
+ ;;
+ "Hall of fame ⧉")
+ url="${help_url}#_hall_of_fame"
+ ;;
esac
-#if [[ $is_steam_deck -eq 1 ]]; then
-#$steam_cmd steam://openurl/"$1" 2>/dev/null
+ #if [[ $is_steam_deck -eq 1 ]]; then
+ #$steam_cmd steam://openurl/"$1" 2>/dev/null
if [[ -n "$BROWSER" ]]; then
logger INFO "Opening '$url' in '$BROWSER'"
"$BROWSER" "$url"
diff --git a/helpers/ui.py b/helpers/ui.py
index 36fb350..43073a0 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.19
+# 5.0.0-rc.20
app_name = "DZGUI"
cache = {}
@@ -493,7 +493,6 @@ class RightPanel(Gtk.Box):
self.question_button.set_margin_start(50)
self.question_button.set_margin_end(50)
self.question_button.connect("clicked", self._on_button_clicked)
- set_surrounding_margins(self.question_button, 50)
if is_steam_deck is False:
self.pack_start(self.question_button, False, True, 0)
@@ -646,9 +645,6 @@ class TreeView(Gtk.TreeView):
renderer = Gtk.CellRendererText()
column = Gtk.TreeViewColumn(column_title, renderer, text=i)
self.append_column(column)
- # TODO: change font size on the fly
- if is_steam_deck is True:
- renderer.set_property("size-points", 20)
self.connect("row-activated", self._on_row_activated)
self.connect("key-press-event", self._on_keypress)
From 03ab264e28d995d3c3bd5ec563429a30b961d2cf Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 15:14:09 +0900
Subject: [PATCH 049/122] feat: early connection test
---
dzgui.sh | 13 ++++++++++---
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 40d2408..ea304ef 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-20
+version=5.0.0.rc-21
#CONSTANTS
aid=221100
@@ -527,10 +527,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="62133c6c603584a283e86b4629c9c5aa"
+ ["ui.py"]="62731f2c617f11c057c43951283807b5"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="8b5f43cb3647d96ffdcb8ce17822e104"
+ ["funcs"]="73898be7185d77ccdc67ace906a7db2c"
)
local author="aclist"
local repo="dztui"
@@ -772,6 +772,12 @@ is_steam_running(){
return 0
fi
}
+test_connection(){
+ ping -c1 -4 github.com 1>/dev/null 2>&1
+ if [[ ! $? -eq 0 ]]; then
+ raise_error_and_quit "DZGUI requires an active Internet connection, but no connection could be established. The remote may be down."
+ fi
+}
initial_setup(){
setup_dirs
setup_state_files
@@ -780,6 +786,7 @@ initial_setup(){
test_gobject
watcher_deps
check_architecture
+ test_connection
varcheck
source "$config_file"
lock
diff --git a/helpers/funcs b/helpers/funcs
index 7c0eb8b..fcba496 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-20
+version=5.0.0.rc-21
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 43073a0..89142d7 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.20
+# 5.0.0-rc.21
app_name = "DZGUI"
cache = {}
From 42bee23108a94c0d715df853c55282212462cd29 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 13 Jan 2024 15:18:34 +0900
Subject: [PATCH 050/122] feat: extra sum check
---
dzgui.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dzgui.sh b/dzgui.sh
index ea304ef..bcf9acd 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -552,6 +552,9 @@ fetch_helpers_by_sum(){
if [[ ! $? -eq 0 ]]; then
raise_error_and_quit "Failed to fetch the file '$file'. Possible timeout?"
fi
+ if [[ $(get_hash) $full_path != $sum ]]; then
+ logger WARN "Downloaded new '$file', but checksum != '$sum'"
+ fi
logger INFO "Updated '$full_path' to sum '$sum'"
fi
[[ $file == "funcs" ]] && chmod +x "$full_path"
From 2202483a4f12651d3b1c9b130a05f1f3464c027c Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sun, 14 Jan 2024 05:15:52 +0900
Subject: [PATCH 051/122] fix: unclosed braces
---
dzgui.sh | 4 ++--
helpers/ui.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index bcf9acd..7f07460 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="62731f2c617f11c057c43951283807b5"
+ ["ui.py"]="5e1d2af6cdd122d810de01a2252d1839"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="73898be7185d77ccdc67ace906a7db2c"
@@ -552,7 +552,7 @@ fetch_helpers_by_sum(){
if [[ ! $? -eq 0 ]]; then
raise_error_and_quit "Failed to fetch the file '$file'. Possible timeout?"
fi
- if [[ $(get_hash) $full_path != $sum ]]; then
+ if [[ $(get_hash $full_path) != $sum ]]; then
logger WARN "Downloaded new '$file', but checksum != '$sum'"
fi
logger INFO "Updated '$full_path' to sum '$sum'"
diff --git a/helpers/ui.py b/helpers/ui.py
index 89142d7..5bf28b9 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -1396,12 +1396,12 @@ class Grid(Gtk.Grid):
self.set_column_homogeneous(True)
#self.set_row_homogeneous(True)
- _news = sys.argv[2]
self._version = "%s %s" %(app_name, sys.argv[3])
+ _news = sys.argv[2]
if _news != "null":
self.news = NewsHeader(_news)
- self.attach(self.news, 0, -1, 8, 10)
+ #self.attach(self.news, 0, -1, 8, 10)
self.scrollable_treelist = ScrollableTree(is_steam_deck)
if is_steam_deck is True:
From 08686bb9615a147b06c6cd2c22d4ed68e4d076f0 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:08:24 +0900
Subject: [PATCH 052/122] chore: drop news
---
dzgui.sh | 12 +++++++-----
helpers/ui.py | 19 ++-----------------
2 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 7f07460..aab504c 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -527,7 +527,7 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="5e1d2af6cdd122d810de01a2252d1839"
+ ["ui.py"]="980b2363ff51c6d5b53573823413de35"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="73898be7185d77ccdc67ace906a7db2c"
@@ -778,7 +778,11 @@ is_steam_running(){
test_connection(){
ping -c1 -4 github.com 1>/dev/null 2>&1
if [[ ! $? -eq 0 ]]; then
- raise_error_and_quit "DZGUI requires an active Internet connection, but no connection could be established. The remote may be down."
+ raise_error_and_quit "No connection could be established to the remote server (github.com)."
+ fi
+ ping -c1 -4 api.steampowered.com 1>/dev/null 2>&1
+ if [[ ! $? -eq 0 ]]; then
+ raise_error_and_quit "No connection could be established to the remote server (steampowered.com)."
fi
}
initial_setup(){
@@ -811,11 +815,9 @@ main(){
printf "Initializing setup...\n"
initial_setup
- local news=$(check_news)
printf "All OK. Kicking off UI...\n"
- [[ -z $news ]] && news="null"
- python3 "$ui_helper" "--init-ui" "$news" "$version" "$is_steam_deck"
+ python3 "$ui_helper" "--init-ui" "$version" "$is_steam_deck"
}
main
#TODO: tech debt: cruddy handling for steam forking
diff --git a/helpers/ui.py b/helpers/ui.py
index 5bf28b9..a5cf826 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -1163,16 +1163,6 @@ class AppHeaderBar(Gtk.HeaderBar):
self.set_show_close_button(True)
-class NewsHeader(Gtk.Box):
- def __init__(self, news):
- super().__init__()
- Gtk.Box(spacing=1)
- self.set_valign(Gtk.Align.START)
- news_label = Gtk.Label(label=news)
- news_label.set_ellipsize(Pango.EllipsizeMode.END)
- self.pack_start(news_label, False, False, 0)
-
-
class GenericDialog(Gtk.MessageDialog):
def __init__(self, parent, text, mode):
@@ -1396,12 +1386,7 @@ class Grid(Gtk.Grid):
self.set_column_homogeneous(True)
#self.set_row_homogeneous(True)
- self._version = "%s %s" %(app_name, sys.argv[3])
- _news = sys.argv[2]
-
- if _news != "null":
- self.news = NewsHeader(_news)
- #self.attach(self.news, 0, -1, 8, 10)
+ self._version = "%s %s" %(app_name, sys.argv[2])
self.scrollable_treelist = ScrollableTree(is_steam_deck)
if is_steam_deck is True:
@@ -1488,7 +1473,7 @@ def toggle_signal(owner, widget, func_name, bool):
class App(Gtk.Application):
def __init__(self):
- _isd = int(sys.argv[4])
+ _isd = int(sys.argv[3])
if _isd == 1:
is_steam_deck = True
else:
From 359d57a3efec6d39ff54b8f584c30e640787ca2d Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:09:27 +0900
Subject: [PATCH 053/122] chore: bump version
---
dzgui.sh | 6 +++---
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index aab504c..e9416b6 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-21
+version=5.0.0.rc-22
#CONSTANTS
aid=221100
@@ -527,10 +527,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="980b2363ff51c6d5b53573823413de35"
+ ["ui.py"]="920f67b7e1e18aef83a4da346fb08d9f"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="73898be7185d77ccdc67ace906a7db2c"
+ ["funcs"]="37e7a32b5ac1fc5cefb8d9afb431beb2"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index fcba496..7a44069 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-21
+version=5.0.0.rc-22
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index a5cf826..48a62ae 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.21
+# 5.0.0-rc.22
app_name = "DZGUI"
cache = {}
From 86d35c7868088776d1b834e87bd792956f5d347e Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Mon, 22 Jan 2024 14:22:09 +0900
Subject: [PATCH 054/122] feat: set im module
---
dzgui.sh | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index e9416b6..6802215 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-22
+version=5.0.0.rc-23
#CONSTANTS
aid=221100
@@ -63,6 +63,15 @@ releases_url="https://github.com/$author/$repo/releases/download/browser"
km_helper_url="$releases_url/latlon"
geo_file_url="$releases_url/ips.csv.gz"
+set_im_module(){
+ pgrep -a gamescope | grep -q "generate-drm-mode"
+ if [[ $? -eq 0 ]]; then
+ GTK_IM_MODULE=""
+ logger INFO "Detected Steam Deck (Game Mode), unsetting GTK_IM_MODULE"
+ else
+ return
+ fi
+}
logger(){
local date="$(date "+%F %T,%3N")"
local tag="$1"
@@ -812,6 +821,7 @@ initial_setup(){
main(){
local zenv=$(zenity --version 2>/dev/null)
[[ -z $zenv ]] && { echo "Requires zenity <= 3.44.1"; exit 1; }
+ set_im_module
printf "Initializing setup...\n"
initial_setup
From 896a564764ad5bd375c45de27d18ae66a3b0596c Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Tue, 23 Jan 2024 14:30:43 +0900
Subject: [PATCH 055/122] feat: automod
---
dzgui.sh | 4 +-
helpers/funcs | 178 ++++++++++++++++++++++++++++++++++++++++++++++----
helpers/ui.py | 2 +-
3 files changed, 170 insertions(+), 14 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 6802215..43adfbc 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="920f67b7e1e18aef83a4da346fb08d9f"
+ ["ui.py"]="e7bde2fe61a1edb549c9294e5309ca67"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="37e7a32b5ac1fc5cefb8d9afb431beb2"
+ ["funcs"]="42c38038aa8d915d1207f06c936df288"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 7a44069..1f1efdf 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-22
+version=5.0.0.rc-23
#CONSTANTS
aid=221100
@@ -1024,17 +1024,10 @@ try_connect(){
logger INFO "Connection attempt for $ip:$qport"
update_history "$record"
- #
- if [[ -n $auto_install ]]; then
- #TODO: remove when ready
- printf "Auto install mode currently disabled"
- return 1
+
+ if [[ -z $auto_install ]]; then
+ diff=$(merge_modlists "$diff")
fi
- #TODO: publishedfileid,timestamp
- #if [[ -z $auto_install ]]; then
- # merge_modlists
- #fi
- #
if [[ -n $diff ]]; then
if [[ $is_steam_deck -eq 1 ]] && [[ $(test_display_mode) == "gm" ]]; then
printf "Use Desktop Mode to download mods on Steam Deck"
@@ -1048,6 +1041,165 @@ try_connect(){
launch "$ip" "$gameport" "$sanitized_mods"
fi
}
+focus_beta_client(){
+ _wid(){
+ wmctrl -ilx |\
+ awk 'tolower($3) == "steamwebhelper.steam"' |\
+ awk '$5 ~ /^Steam|Steam Games List/' |\
+ awk '{print $1}'
+ }
+ $steam_cmd steam://open/library 2>/dev/null 1>&2 &&
+ $steam_cmd steam://open/console 2>/dev/null 1>&2 &&
+ sleep 1s
+ until [[ -n $(_wid) ]]; do
+ sleep 0.1s
+ done
+ wmctrl -ia $(_wid)
+ sleep 0.1s
+
+ local wid=$(xdotool getactivewindow)
+ local geo=$(xdotool getwindowgeometry $wid)
+ local pos=$(<<< "$geo" awk 'NR==2 {print $2}' | sed 's/,/ /')
+ local dim=$(<<< "$geo" awk 'NR==3 {print $2}' | sed 's/x/ /')
+ local pos1=$(<<< "$pos" awk '{print $1}')
+ local pos2=$(<<< "$pos" awk '{print $2}')
+ local dim1=$(<<< "$dim" awk '{print $1}')
+ local dim2=$(<<< "$dim" awk '{print $2}')
+ local dim1=$(((dim1/2)+pos1))
+ local dim2=$(((dim2/2)+pos2))
+
+ xdotool mousemove $dim1 $dim2
+ xdotool click 1
+ sleep 0.5s
+ xdotool key Tab
+}
+auto_mod_install(){
+ local ip="$1"
+ local gameport="$2"
+ local diff="$3"
+ local sanitized_mods="$4"
+
+ console_dl "$diff" &&
+ $steam_cmd steam://open/downloads
+
+ until [[ -z $(compare $diff) ]]; do
+ local missing=$(compare $diff | wc -l)
+ echo "# Downloaded $((${#modids[@]}-missing)) of ${#modids[@]} mods. ESC cancels"
+ done | $steamsafe_zenity --pulsate --progress --title="DZG Watcher" --auto-close --no-cancel --width=500 2>/dev/null
+
+ local diff=$(compare "$sanitized_mods")
+
+ if [[ -z $diff ]]; then
+ #wipe old version file and replace with latest stamps
+ rm "$versions_file"
+ check_timestamps
+ logger INFO "Local modlist matches remote, initiating launch request"
+ launch "$ip" "$gameport" "$sanitized_mods"
+ fi
+}
+force_update(){
+ rm "$versions_file"
+ local update=$(check_timestamps)
+ console_dl "$update" &&
+ $steam_cmd steam://open/downloads
+}
+console_dl(){
+ readarray -t modids <<< "$@"
+ focus_beta_client
+ sleep 1.5s
+ for i in "${modids[@]}"; do
+ xdotool type --delay 0 "workshop_download_item $aid $i"
+ sleep 0.5s
+ xdotool key Return
+ sleep 0.5s
+ done
+}
+get_local_stamps(){
+ local modlist="$1"
+ local max="${#modlist[@]}"
+ _concat(){
+ for ((i=0;i<$max;i++)); do
+ echo "publishedfileids[$i]=${modlist[$i]}&"
+ done | awk '{print}' ORS=''
+ }
+ _payload(){
+ echo -e "itemcount=${max}&$(_concat)"
+ }
+ _post(){
+ curl -s -X POST \
+ -H "Content-Type:application/x-www-form-urlencoded" \
+ -d "$(_payload)" 'https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1/?format=json'
+ }
+
+ _post
+}
+update_stamps(){
+ readarray stamps <<< "$1"
+ for((i=0;i<${#stamps[@]};i++)); do
+ 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}'
+ readarray -t old_ids < <(< $version_file awk -F, '{print 1}'
+ readarray -t old_times < <(< $version_file 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" "${old_ids[$@]}"
+ return 0
+ fi
+
+ 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
+ #TODO: if flag is update all
+ #fetch list again and write all new stamps into it
+
+ 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)
+ #awk -v var=$id -v var2=$time '$1 == var {$2=var2;print $1","$2; next;};{print}' "$version_file" > "$version_file.new" &&
+ #mv "$versions_file.new" "$version_file"
+ #TODO: but what if they cancel
+ #TODO: update timestamps AFTER downloading
+ fi
+ done
+ echo "${needs_update[@]}"
+}
+merge_modlists(){
+ local diff="$1"
+ readarray -t needs_update < <(check_timestamps)
+ if [[ ${#needs_update[@]} -eq 0]]; then
+ echo "$diff"
+ return 0
+ fi
+ if [[ -z "$diff" ]] && [[ ${#needs_update[@]} -gt 0 ]]; then
+ printf "%s\n" "${needs_update[@]}"
+ else
+ printf "%s\n%s\n" "$diff" "${needs_update[@]}"
+ fi
+}
concat_mods(){
readarray -t concat_arr <<< "$@"
local id
@@ -1087,6 +1239,7 @@ launch(){
fi
echo "$concat" > "$_cache_launch"
echo "$ip:$gameport" > "$_cache_address"
+ logger INFO "Saved launch params: '$concat'"
printf "Launch conditions satisfied. DayZ will now launch after you confirm this dialog."
return 100
}
@@ -1095,13 +1248,16 @@ final_handshake(){
local saved_address=$(< "$_cache_address")
local res=$(is_dayz_running)
if [[ $res -eq 1 ]]; then
+ logger WARN "DayZ appears to already be running"
printf "Is DayZ already running? DZGUI cannot launch DayZ if another process is using it."
return 1
fi
+ logger INFO "Kicking off Steam launch"
$steam_cmd -applaunch $aid -connect=$saved_address -nolauncher -nosplash -skipintro -name=$name \"-mod=$saved_mods\" &
until [[ $(is_dayz_running) -eq 1 ]]; do
sleep 0.1s
done
+ logger INFO "Caught DayZ process"
return 6
}
manual_mod_install(){
diff --git a/helpers/ui.py b/helpers/ui.py
index 48a62ae..2a541b3 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.22
+# 5.0.0-rc.23
app_name = "DZGUI"
cache = {}
From 2ca5bf31d1ff21735f09e724f1c1289566fd83f7 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Tue, 23 Jan 2024 14:40:45 +0900
Subject: [PATCH 056/122] fix: close parens
---
dzgui.sh | 6 +++---
helpers/funcs | 10 +++++-----
helpers/ui.py | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 43adfbc..0f7d652 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-23
+version=5.0.0.rc-24
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="e7bde2fe61a1edb549c9294e5309ca67"
+ ["ui.py"]="569a966fd97eddb8f4d0139364f161b2"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="42c38038aa8d915d1207f06c936df288"
+ ["funcs"]="f290a5d7c16f6ac2a124b78ed473f9ac"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 1f1efdf..ad1038d 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-23
+version=5.0.0.rc-24
#CONSTANTS
aid=221100
@@ -1150,10 +1150,10 @@ check_timestamps(){
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}'
- readarray -t old_ids < <(< $version_file awk -F, '{print 1}'
- readarray -t old_times < <(< $version_file awk -F, '{print 2}'
+ readarray -t remote_ids < <(<<< "$aligned" awk -F, '{print $1}')
+ readarray -t remote_times < <(<<< "$aligned" awk -F, '{print $2}')
+ readarray -t old_ids < <(< $version_file awk -F, '{print 1}')
+ readarray -t old_times < <(< $version_file awk -F, '{print 2}')
if [[ ! -f $versions_file ]]; then
logger INFO "No prior versions file found, creating"
diff --git a/helpers/ui.py b/helpers/ui.py
index 2a541b3..04b4636 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.23
+# 5.0.0-rc.24
app_name = "DZGUI"
cache = {}
From 858bd066d7ac1668ad186267dacd563c67cca623 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Tue, 23 Jan 2024 14:47:14 +0900
Subject: [PATCH 057/122] fix: conditional expression
---
dzgui.sh | 10 +++++-----
helpers/funcs | 4 ++--
helpers/ui.py | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 0f7d652..86414d4 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-24
+version=5.0.0.rc-25
#CONSTANTS
aid=221100
@@ -449,8 +449,8 @@ steam_deps(){
migrate_files(){
if [[ ! -f $config_path/dztuirc.oldapi ]]; then
cp $config_file $config_path/dztuirc.oldapi
+ logger INFO "Migrated old API file"
fi
- logger INFO "Migrated old API file"
[[ ! -f $hist_file ]] && return
rm $hist_file
logger INFO "Wiped old history file"
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="569a966fd97eddb8f4d0139364f161b2"
+ ["ui.py"]="52005a27aa00eb2801068b08838eb58f"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="f290a5d7c16f6ac2a124b78ed473f9ac"
+ ["funcs"]="2668e6d1df5cb68e35202471228bb1fc"
)
local author="aclist"
local repo="dztui"
@@ -554,7 +554,7 @@ fetch_helpers_by_sum(){
full_path="$helpers_path/$file"
url="https://raw.githubusercontent.com/$author/$repo/$branch/helpers/$file"
if [[ -f "$full_path" ]] && [[ $(get_hash "$full_path") == $sum ]]; then
- logger INFO "'$file' is current"
+ logger INFO "$file is current"
else
logger WARN "File '$full_path' checksum != '$sum'"
curl -Ls "$url" > "$full_path"
diff --git a/helpers/funcs b/helpers/funcs
index ad1038d..8d1165d 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-24
+version=5.0.0.rc-25
#CONSTANTS
aid=221100
@@ -1190,7 +1190,7 @@ check_timestamps(){
merge_modlists(){
local diff="$1"
readarray -t needs_update < <(check_timestamps)
- if [[ ${#needs_update[@]} -eq 0]]; then
+ if [[ ${#needs_update[@]} -eq 0 ]]; then
echo "$diff"
return 0
fi
diff --git a/helpers/ui.py b/helpers/ui.py
index 04b4636..9456a0a 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.24
+# 5.0.0-rc.25
app_name = "DZGUI"
cache = {}
From ecedc4e147433dabdc7184e9d6eba923fa2a7960 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:21:43 +0900
Subject: [PATCH 058/122] fix: automod toggle
---
dzgui.sh | 4 ++--
helpers/funcs | 10 ++--------
helpers/ui.py | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 86414d4..f49ef82 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="52005a27aa00eb2801068b08838eb58f"
+ ["ui.py"]="4dc76532cd01c221755e59e803456b57"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="2668e6d1df5cb68e35202471228bb1fc"
+ ["funcs"]="a41432675455a4983c7ba6d2e6681f05"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 8d1165d..be4879f 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-25
+version=5.0.0.rc-26
#CONSTANTS
aid=221100
@@ -1025,7 +1025,7 @@ try_connect(){
logger INFO "Connection attempt for $ip:$qport"
update_history "$record"
- if [[ -z $auto_install ]]; then
+ if [[ -n $auto_install ]]; then
diff=$(merge_modlists "$diff")
fi
if [[ -n $diff ]]; then
@@ -1169,8 +1169,6 @@ check_timestamps(){
for((i = 0; i < ${remote_ids[@]}; ++i)); do
remote_version[$remote_ids[$i]]=${remote_times[$i]}
done
- #TODO: if flag is update all
- #fetch list again and write all new stamps into it
needs_update=()
for((i=0;i<${#old_ids[@]};i++)); do
@@ -1179,10 +1177,6 @@ check_timestamps(){
if [[ $time != ${remote_version[$id]} ]]; then
logger WARN "Mod '$id' timestamp '$time' != '${remote_version[$id]}'"
needs_update+=($id)
- #awk -v var=$id -v var2=$time '$1 == var {$2=var2;print $1","$2; next;};{print}' "$version_file" > "$version_file.new" &&
- #mv "$versions_file.new" "$version_file"
- #TODO: but what if they cancel
- #TODO: update timestamps AFTER downloading
fi
done
echo "${needs_update[@]}"
diff --git a/helpers/ui.py b/helpers/ui.py
index 9456a0a..befe546 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.25
+# 5.0.0-rc.26
app_name = "DZGUI"
cache = {}
From 7d66ffe418d42a659069757ee71428183eb62055 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:04:07 +0900
Subject: [PATCH 059/122] fix: set debug state on boot
---
dzgui.sh | 6 +++---
helpers/funcs | 7 ++++---
helpers/ui.py | 4 +++-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index f49ef82..a918538 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-25
+version=5.0.0.rc-27
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="4dc76532cd01c221755e59e803456b57"
+ ["ui.py"]="ce3940391b9c7e80eb7af190e40fae41"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="a41432675455a4983c7ba6d2e6681f05"
+ ["funcs"]="ded1276c0555577cc03cc36e9381a373"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index be4879f..c80a851 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-26
+version=5.0.0.rc-27
#CONSTANTS
aid=221100
@@ -362,7 +362,7 @@ get_unique_maps(){
< "$filter_file" awk -F$separator '{print $2}' | sort -u
}
query_config(){
- local key="$1"
+ [[ -n $2 ]] && local key=$2
keys=(
"branch"
"debug"
@@ -1026,6 +1026,7 @@ try_connect(){
update_history "$record"
if [[ -n $auto_install ]]; then
+ logger INFO "Merging modlists"
diff=$(merge_modlists "$diff")
fi
if [[ -n $diff ]]; then
@@ -1167,7 +1168,7 @@ check_timestamps(){
declare -A local_version
for((i = 0; i < ${remote_ids[@]}; ++i)); do
- remote_version[$remote_ids[$i]]=${remote_times[$i]}
+ remote_version[${remote_ids[$i]}]=${remote_times[$i]}
done
needs_update=()
diff --git a/helpers/ui.py b/helpers/ui.py
index befe546..822f6d1 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -15,7 +15,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.26
+# 5.0.0-rc.27
app_name = "DZGUI"
cache = {}
@@ -1526,6 +1526,8 @@ class FilterPanel(Gtk.Box):
self.maps_combo.connect("key-press-event", self._on_esc_pressed)
self.debug_toggle = Gtk.ToggleButton(label="Debug mode")
+ if query_config(None, "debug")[0] == '1':
+ self.debug_toggle.set_active(True)
self.debug_toggle.connect("toggled", self._on_button_toggled, "Toggle debug mode")
set_surrounding_margins(self.debug_toggle, 10)
From 8effa44a0816be95ee5d7a7c763546a35190c9d6 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:14:47 +0900
Subject: [PATCH 060/122] fix: automod, wrapping
---
dzgui.sh | 6 +++---
helpers/funcs | 22 +++++++++++++---------
helpers/ui.py | 10 ++++++++--
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index a918538..fafdccf 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-27
+version=5.0.0.rc-28
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="ce3940391b9c7e80eb7af190e40fae41"
+ ["ui.py"]="9b6c643d096c5b2e677b4eb17ec09750"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="ded1276c0555577cc03cc36e9381a373"
+ ["funcs"]="bd5dbe82a840a25704b899e62aab0c5b"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index c80a851..5f8f97c 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-27
+version=5.0.0.rc-28
#CONSTANTS
aid=221100
@@ -1071,8 +1071,8 @@ focus_beta_client(){
xdotool mousemove $dim1 $dim2
xdotool click 1
- sleep 0.5s
- xdotool key Tab
+ $steam_cmd steam://open/library 2>/dev/null 1>&2 &&
+ $steam_cmd steam://open/console 2>/dev/null 1>&2
}
auto_mod_install(){
local ip="$1"
@@ -1083,10 +1083,14 @@ auto_mod_install(){
console_dl "$diff" &&
$steam_cmd steam://open/downloads
+ local total=$(<<< "$diff" wc -l)
until [[ -z $(compare $diff) ]]; do
local missing=$(compare $diff | wc -l)
- echo "# Downloaded $((${#modids[@]}-missing)) of ${#modids[@]} mods. ESC cancels"
+ echo "# Downloaded $(($total-missing)) of $total mods. ESC cancels"
done | $steamsafe_zenity --pulsate --progress --title="DZG Watcher" --auto-close --no-cancel --width=500 2>/dev/null
+ if [[ ! $? -eq 0 ]]; then
+ exit 7
+ fi
local diff=$(compare "$sanitized_mods")
@@ -1116,11 +1120,11 @@ console_dl(){
done
}
get_local_stamps(){
- local modlist="$1"
+ readarray -t modlist < <(printf "%s\n" "$@")
local max="${#modlist[@]}"
_concat(){
for ((i=0;i<$max;i++)); do
- echo "publishedfileids[$i]=${modlist[$i]}&"
+ printf "publishedfileids[$i]=${modlist[$i]}&"
done | awk '{print}' ORS=''
}
_payload(){
@@ -1135,7 +1139,7 @@ get_local_stamps(){
_post
}
update_stamps(){
- readarray stamps <<< "$1"
+ readarray -t stamps <<< "$1"
for((i=0;i<${#stamps[@]};i++)); do
printf "%s\n" "${stamps[$i]}" >> $versions_file
done
@@ -1153,8 +1157,8 @@ check_timestamps(){
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}')
- readarray -t old_ids < <(< $version_file awk -F, '{print 1}')
- readarray -t old_times < <(< $version_file awk -F, '{print 2}')
+ readarray -t old_ids < <(< $versions_file awk -F, '{print 1}')
+ readarray -t old_times < <(< $versions_file awk -F, '{print 2}')
if [[ ! -f $versions_file ]]; then
logger INFO "No prior versions file found, creating"
diff --git a/helpers/ui.py b/helpers/ui.py
index 822f6d1..832b8cd 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -8,6 +8,7 @@ import multiprocessing
import re
import subprocess
import sys
+import textwrap
import threading
import time
@@ -15,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.27
+# 5.0.0-rc.28
app_name = "DZGUI"
cache = {}
@@ -307,6 +308,11 @@ def process_shell_return_code(transient_parent, msg, code, original_input):
case 6:
# return silently
pass
+ case 7:
+ # catch zenity dialog cancel and rewrite message
+ msg = "User canceled connect process. Steam may have mods pending for download."
+ spawn_dialog(transient_parent, msg, "NOTIFY")
+
case 90:
# used to update configs and metadata in-place
treeview = transient_parent.grid.scrollable_treelist.treeview
@@ -1198,7 +1204,7 @@ class GenericDialog(Gtk.MessageDialog):
flags=0,
message_type=dialog_type,
text=header_text,
- secondary_text=text,
+ secondary_text=textwrap.fill(text, 50),
buttons=button_type,
title=app_name,
modal=True,
From 04cb132219115ca5675bde1a8bed10aab75c7bd3 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:50:47 +0900
Subject: [PATCH 061/122] fix: automod WIP
---
dzgui.sh | 6 +++---
helpers/funcs | 36 +++++++++++++++++-------------------
helpers/ui.py | 9 +++++----
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index fafdccf..d3748d9 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-28
+version=5.0.0.rc-29
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="9b6c643d096c5b2e677b4eb17ec09750"
+ ["ui.py"]="12fac5997612367c0716f8575046ac6d"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="bd5dbe82a840a25704b899e62aab0c5b"
+ ["funcs"]="d2afc23090f4f1e670ac8eb1a5412579"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 5f8f97c..71622ba 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-28
+version=5.0.0.rc-29
#CONSTANTS
aid=221100
@@ -161,15 +161,6 @@ validate_and_connect(){
esac
try_connect "$record"
}
-force_update(){
- if [[ ! $auto_install -eq 1 ]]; then
- printf "Only available when mod auto-install is ON"
- return 1
- fi
- #TODO: force update
- printf "Currently does nothing"
- return 0
-}
map_id_to_ip(){
local id="$1"
local res=$(curl -s "$bm_api" -H "Authorization: Bearer "$api_key"" \
@@ -1084,12 +1075,13 @@ auto_mod_install(){
$steam_cmd steam://open/downloads
local total=$(<<< "$diff" wc -l)
- until [[ -z $(compare $diff) ]]; do
- local missing=$(compare $diff | wc -l)
+ until [[ -z $(compare "$diff") ]]; do
+ local missing=$(compare "$diff" | wc -l)
echo "# Downloaded $(($total-missing)) of $total mods. ESC cancels"
done | $steamsafe_zenity --pulsate --progress --title="DZG Watcher" --auto-close --no-cancel --width=500 2>/dev/null
if [[ ! $? -eq 0 ]]; then
- exit 7
+ echo "User canceled connect process. Steam may have mods pending for download."
+ exit 1
fi
local diff=$(compare "$sanitized_mods")
@@ -1103,10 +1095,15 @@ auto_mod_install(){
fi
}
force_update(){
+ if [[ ! $auto_install -eq 1 ]]; then
+ printf "Only available when mod auto-install is ON"
+ return 1
+ fi
rm "$versions_file"
local update=$(check_timestamps)
console_dl "$update" &&
$steam_cmd steam://open/downloads
+ return 8
}
console_dl(){
readarray -t modids <<< "$@"
@@ -1157,21 +1154,21 @@ check_timestamps(){
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}')
- readarray -t old_ids < <(< $versions_file awk -F, '{print 1}')
- readarray -t old_times < <(< $versions_file awk -F, '{print 2}')
+ readarray -t old_ids < <(< $versions_file awk -F, '{print $1}')
+ readarray -t old_times < <(< $versions_file 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" "${old_ids[$@]}"
+ printf "%s\n" "${remote_ids[$@]}"
return 0
fi
declare -A remote_version
declare -A local_version
- for((i = 0; i < ${remote_ids[@]}; ++i)); do
+ for((i = 0; i < ${#remote_ids[@]}; ++i)); do
remote_version[${remote_ids[$i]}]=${remote_times[$i]}
done
@@ -1184,7 +1181,7 @@ check_timestamps(){
needs_update+=($id)
fi
done
- echo "${needs_update[@]}"
+ printf "%s\n" "${needs_update[@]}"
}
merge_modlists(){
local diff="$1"
@@ -1196,7 +1193,8 @@ merge_modlists(){
if [[ -z "$diff" ]] && [[ ${#needs_update[@]} -gt 0 ]]; then
printf "%s\n" "${needs_update[@]}"
else
- printf "%s\n%s\n" "$diff" "${needs_update[@]}"
+ printf "%s\n" "$diff"
+ printf "%s\n" "${needs_update[@]}"
fi
}
concat_mods(){
diff --git a/helpers/ui.py b/helpers/ui.py
index 832b8cd..bbe166b 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.28
+# 5.0.0-rc.29
app_name = "DZGUI"
cache = {}
@@ -309,10 +309,11 @@ def process_shell_return_code(transient_parent, msg, code, original_input):
# return silently
pass
case 7:
- # catch zenity dialog cancel and rewrite message
- msg = "User canceled connect process. Steam may have mods pending for download."
+ msg = "Some mods may have failed to download. Try connecting again to resync."
+ spawn_dialog(transient_parent, msg, "NOTIFY")
+ case 8:
+ msg = "Finished requesting mod updates. Steam may have mods pending for download."
spawn_dialog(transient_parent, msg, "NOTIFY")
-
case 90:
# used to update configs and metadata in-place
treeview = transient_parent.grid.scrollable_treelist.treeview
From 2f9c74e13b5bac595bc91a0f23228c9ca4baee2f Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:56:47 +0900
Subject: [PATCH 062/122] fix: automod WIP
---
dzgui.sh | 6 +++---
helpers/funcs | 7 ++++---
helpers/ui.py | 14 ++++----------
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index d3748d9..9a63630 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-29
+version=5.0.0.rc-30
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="12fac5997612367c0716f8575046ac6d"
+ ["ui.py"]="ad04fee7066d5fe30fb39e875ff870d2"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="d2afc23090f4f1e670ac8eb1a5412579"
+ ["funcs"]="26a4200acd85c0e0fc71a7fe57b1e13e"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 71622ba..b2a61a0 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-29
+version=5.0.0.rc-30
#CONSTANTS
aid=221100
@@ -1080,7 +1080,7 @@ auto_mod_install(){
echo "# Downloaded $(($total-missing)) of $total mods. ESC cancels"
done | $steamsafe_zenity --pulsate --progress --title="DZG Watcher" --auto-close --no-cancel --width=500 2>/dev/null
if [[ ! $? -eq 0 ]]; then
- echo "User canceled connect process. Steam may have mods pending for download."
+ echo "User aborted connect process. Steam may have mods pending for download."
exit 1
fi
@@ -1103,7 +1103,8 @@ force_update(){
local update=$(check_timestamps)
console_dl "$update" &&
$steam_cmd steam://open/downloads
- return 8
+ echo "Finished requesting mod updates. Steam may have some mods pending for download."
+ return 0
}
console_dl(){
readarray -t modids <<< "$@"
diff --git a/helpers/ui.py b/helpers/ui.py
index bbe166b..56a4ce3 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.29
+# 5.0.0-rc.30
app_name = "DZGUI"
cache = {}
@@ -283,13 +283,11 @@ def process_shell_return_code(transient_parent, msg, code, original_input):
case 0:
# success with notice popup
spawn_dialog(transient_parent, msg, "NOTIFY")
- pass
case 1:
# error with notice popup
if msg == "":
msg = "Something went wrong"
spawn_dialog(transient_parent, msg, "NOTIFY")
- pass
case 2:
# warn and recurse (e.g. validation failed)
spawn_dialog(transient_parent, msg, "NOTIFY")
@@ -308,12 +306,6 @@ def process_shell_return_code(transient_parent, msg, code, original_input):
case 6:
# return silently
pass
- case 7:
- msg = "Some mods may have failed to download. Try connecting again to resync."
- spawn_dialog(transient_parent, msg, "NOTIFY")
- case 8:
- msg = "Finished requesting mod updates. Steam may have mods pending for download."
- spawn_dialog(transient_parent, msg, "NOTIFY")
case 90:
# used to update configs and metadata in-place
treeview = transient_parent.grid.scrollable_treelist.treeview
@@ -1010,7 +1002,9 @@ class TreeView(Gtk.TreeView):
def load():
dialog.destroy()
transient = self.get_outer_window()
- process_shell_return_code(transient, proc.stdout, proc.returncode, record)
+ out = proc.stdout.splitlines()
+ msg = out[-1]
+ process_shell_return_code(transient, msg, proc.returncode, record)
proc = call_out(self, "Connect from table", record)
GLib.idle_add(load)
From 0fde301c2143074bbeedcbd440e903533926c4c7 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Thu, 25 Jan 2024 13:29:57 +0900
Subject: [PATCH 063/122] fix: debug key not echoing
---
dzgui.sh | 6 +++---
helpers/funcs | 3 ++-
helpers/ui.py | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 9a63630..5c31bc5 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-30
+version=5.0.0.rc-31
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="ad04fee7066d5fe30fb39e875ff870d2"
+ ["ui.py"]="dc5f2ea7d90e93f9405283374aa98a8b"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="26a4200acd85c0e0fc71a7fe57b1e13e"
+ ["funcs"]="205c27f0ac0f2c89d0aaf1ba1fb73082"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index b2a61a0..da46039 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-30
+version=5.0.0.rc-31
#CONSTANTS
aid=221100
@@ -367,6 +367,7 @@ query_config(){
echo "${!key}"
return 0
else
+ echo ""
return 1
fi
fi
diff --git a/helpers/ui.py b/helpers/ui.py
index 56a4ce3..e20b564 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.30
+# 5.0.0-rc.31
app_name = "DZGUI"
cache = {}
From e2781c07cf97f4e31ac7483d568ea428d8d8e943 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Thu, 25 Jan 2024 15:00:18 +0900
Subject: [PATCH 064/122] fix: destroy signals
---
dzgui.sh | 6 +++---
helpers/funcs | 2 +-
helpers/ui.py | 28 ++++++++++++++++------------
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 5c31bc5..f6ffe7a 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-31
+version=5.0.0.rc-32
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="dc5f2ea7d90e93f9405283374aa98a8b"
+ ["ui.py"]="34dc74d1330932e36087d2b52e0e42eb"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="205c27f0ac0f2c89d0aaf1ba1fb73082"
+ ["funcs"]="ae54854dfb45804c92a81f4b95bf3c54"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index da46039..74b8921 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-31
+version=5.0.0.rc-32
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index e20b564..26d4ce6 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.31
+# 5.0.0-rc.32
app_name = "DZGUI"
cache = {}
@@ -393,7 +393,7 @@ def process_tree_option(input, treeview):
case "Connect by IP" | "Add server by IP" | "Change favorite server":
flag = True
link_label = ""
- prompt = "Enter IP in IP:Queryport format\nE.g. 192.168.1.1:27016"
+ prompt = "Enter IP in IP:Queryport format (e.g. 192.168.1.1:27016)"
case "Connect by ID" | "Add server by ID":
flag = True
link_label = "Open Battlemetrics"
@@ -436,7 +436,6 @@ class OuterWindow(Gtk.Window):
def __init__(self, is_steam_deck):
super().__init__()
- self.connect("destroy", self.halt_proc_and_quit)
self.connect("delete-event", self.halt_proc_and_quit)
# Deprecated in GTK 4.0
self.set_border_width(10)
@@ -461,7 +460,7 @@ class OuterWindow(Gtk.Window):
self.grid.right_panel.set_filter_visibility(False)
self.grid.scrollable_treelist.treeview.grab_focus()
- def halt_proc_and_quit(self, window):
+ def halt_proc_and_quit(self, window, event):
self.grid.terminate_treeview_process()
Gtk.main_quit()
@@ -469,7 +468,6 @@ class OuterWindow(Gtk.Window):
class ScrollableTree(Gtk.ScrolledWindow):
def __init__(self, is_steam_deck):
super().__init__()
- #self.set_propagate_natural_height(False)
self.treeview = TreeView(is_steam_deck)
self.add(self.treeview)
@@ -822,14 +820,14 @@ class TreeView(Gtk.TreeView):
return False
def _on_keypress(self, treeview, event):
- if self.get_first_col == "Mod":
- return
keyname = Gdk.keyval_name(event.keyval)
grid = self.get_outer_grid()
cur_proc = grid.scrollable_treelist.treeview.current_proc
if event.state is Gdk.ModifierType.CONTROL_MASK:
match event.keyval:
case Gdk.KEY_d:
+ if self.get_first_col() == "Mod":
+ return
debug = grid.right_panel.filters_vbox.debug_toggle
if debug.get_active():
debug.set_active(False)
@@ -838,13 +836,19 @@ class TreeView(Gtk.TreeView):
case Gdk.KEY_l:
self._on_button_release(self, event)
case Gdk.KEY_f:
+ if self.get_first_col() == "Mod":
+ return
grid.right_panel.filters_vbox.grab_keyword_focus()
case Gdk.KEY_m:
+ if self.get_first_col() == "Mod":
+ return
grid.right_panel.filters_vbox.maps_combo.grab_focus()
grid.right_panel.filters_vbox.maps_combo.popup()
case _:
return False
elif keyname.isnumeric() and int(keyname) > 0:
+ if self.get_first_col() == "Mod":
+ return
digit = (int(keyname) - 1)
grid.right_panel.filters_vbox.toggle_check(checks[digit])
else:
@@ -895,6 +899,7 @@ class TreeView(Gtk.TreeView):
self.grab_focus()
size = locale.format_string('%.3f', total_size, grouping=True)
grid.update_statusbar("Found %s mods taking up %s MiB" %(f'{total_mods:n}', size))
+ toggle_signal(self, self, '_on_keypress', True)
grid = self.get_outer_grid()
right_panel = grid.right_panel
@@ -918,11 +923,10 @@ class TreeView(Gtk.TreeView):
renderer = Gtk.CellRendererText()
column = Gtk.TreeViewColumn(column_title, renderer, text=i)
column.set_sort_column_id(i)
- #"""Prevent columns from auto-adjusting"""
if ("Name" in column_title):
column.set_fixed_width(800)
- #if (column_title == "Map"):
- # column.set_fixed_width(300)
+ if (column_title == "Map"):
+ column.set_fixed_width(300)
self.append_column(column)
self.update_first_col(mode)
@@ -1159,8 +1163,8 @@ def filter_servers(transient_parent, filters_vbox, treeview, context):
class AppHeaderBar(Gtk.HeaderBar):
def __init__(self):
super().__init__()
- Gtk.HeaderBar()
self.props.title = app_name
+ self.set_decoration_layout("menu:minimize,maximize,close")
self.set_show_close_button(True)
@@ -1490,7 +1494,7 @@ class App(Gtk.Application):
Gtk.main()
def _halt_window_subprocess(self, accel_group, window, code, flag):
- self.win.halt_proc_and_quit(self)
+ self.win.halt_proc_and_quit(self, None)
class FilterPanel(Gtk.Box):
From 9b84a168b8c8c99ce51237d226519e3c86960759 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Thu, 25 Jan 2024 15:29:12 +0900
Subject: [PATCH 065/122] fix: remove duplicates
---
dzgui.sh | 6 +++---
helpers/funcs | 12 ++++++++----
helpers/ui.py | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index f6ffe7a..7b9e593 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-32
+version=5.0.0.rc-33
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="34dc74d1330932e36087d2b52e0e42eb"
+ ["ui.py"]="24c16220d76b5fb8c6964648d509d684"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="ae54854dfb45804c92a81f4b95bf3c54"
+ ["funcs"]="91144c992c4786c855da659f384caebd"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 74b8921..b4ac4ea 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-32
+version=5.0.0.rc-33
#CONSTANTS
aid=221100
@@ -1187,6 +1187,10 @@ check_timestamps(){
}
merge_modlists(){
local diff="$1"
+ _sort(){
+ printf "%s\n" "$diff"
+ printf "%s\n" "${needs_update[@]}"
+ }
readarray -t needs_update < <(check_timestamps)
if [[ ${#needs_update[@]} -eq 0 ]]; then
echo "$diff"
@@ -1195,8 +1199,8 @@ merge_modlists(){
if [[ -z "$diff" ]] && [[ ${#needs_update[@]} -gt 0 ]]; then
printf "%s\n" "${needs_update[@]}"
else
- printf "%s\n" "$diff"
- printf "%s\n" "${needs_update[@]}"
+ # remove duplicates
+ _sort | sort -u
fi
}
concat_mods(){
@@ -1306,7 +1310,7 @@ manual_mod_install(){
if [[ -z $diff ]]; then
launch "$ip" "$gameport" "$sanitized_mods"
else
- printf "Some mods may have failed to download. Try connecting again to resync."
+ printf "User aborted download process, or some mods may have failed to download. Try connecting again to resync."
exit 1
fi
}
diff --git a/helpers/ui.py b/helpers/ui.py
index 26d4ce6..1b5e0f2 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.32
+# 5.0.0-rc.33
app_name = "DZGUI"
cache = {}
From 62613d953338d48c8cecc687b6f42d4b3dd1844e Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 26 Jan 2024 18:24:06 +0900
Subject: [PATCH 066/122] fix: set titlebar correctly
---
dzgui.sh | 8 ++++----
helpers/funcs | 2 +-
helpers/ui.py | 17 +++++++++--------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 7b9e593..f5e0376 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-33
+version=5.0.0.rc-34
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="24c16220d76b5fb8c6964648d509d684"
+ ["ui.py"]="b4e3ffaede349a6817132a5a7df45bf8"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="91144c992c4786c855da659f384caebd"
+ ["funcs"]="0ad23d86fe24507c177e9db95c917354"
)
local author="aclist"
local repo="dztui"
@@ -812,7 +812,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
- fetch_helpers > >(pdialog "Fetching additional helper files")
+ fetch_helpers > >(pdialog "Checking helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index b4ac4ea..dd4263e 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-33
+version=5.0.0.rc-34
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 1b5e0f2..a185615 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.33
+# 5.0.0-rc.34
app_name = "DZGUI"
cache = {}
@@ -434,7 +434,7 @@ def reinit_checks():
class OuterWindow(Gtk.Window):
def __init__(self, is_steam_deck):
- super().__init__()
+ super().__init__(title=app_name)
self.connect("delete-event", self.halt_proc_and_quit)
# Deprecated in GTK 4.0
@@ -447,13 +447,14 @@ class OuterWindow(Gtk.Window):
"""
self.grid = Grid(is_steam_deck)
self.add(self.grid)
- self.hb = AppHeaderBar()
+# self.hb = AppHeaderBar()
- if is_steam_deck is True:
- self.maximize()
- self.set_decorated(False)
- else:
- self.set_titlebar(self.hb)
+# if is_steam_deck is True:
+# self.maximize()
+# self.set_decorated(False)
+# else:
+# pass
+# self.set_titlebar(self.hb)
# Hide FilterPanel on main menu
self.show_all()
From 1a8fd02b60c7c37a4a37efe40aaf258736099aa9 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 26 Jan 2024 18:36:17 +0900
Subject: [PATCH 067/122] fix: newline in modlist
---
dzgui.sh | 8 ++++----
helpers/funcs | 4 ++--
helpers/ui.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index f5e0376..c580d1b 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-34
+version=5.0.0.rc-35
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="b4e3ffaede349a6817132a5a7df45bf8"
+ ["ui.py"]="e8f3f1ff2a46c6a4bb8a692f42da550b"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="0ad23d86fe24507c177e9db95c917354"
+ ["funcs"]="a37820c4c5da21811bae77f6c43ed9a6"
)
local author="aclist"
local repo="dztui"
@@ -812,7 +812,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
- fetch_helpers > >(pdialog "Checking helper files")
+# fetch_helpers > >(pdialog "Checking helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index dd4263e..80bbb2c 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-34
+version=5.0.0.rc-35
#CONSTANTS
aid=221100
@@ -1192,7 +1192,7 @@ merge_modlists(){
printf "%s\n" "${needs_update[@]}"
}
readarray -t needs_update < <(check_timestamps)
- if [[ ${#needs_update[@]} -eq 0 ]]; then
+ if [[ -z ${needs_update[@]} ]]; then
echo "$diff"
return 0
fi
diff --git a/helpers/ui.py b/helpers/ui.py
index a185615..57a156a 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.34
+# 5.0.0-rc.35
app_name = "DZGUI"
cache = {}
From 4beb44efa78187aebf93a9329ef3b75a48ad46b4 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Fri, 26 Jan 2024 18:37:28 +0900
Subject: [PATCH 068/122] fix: uncomment fetch helpers
---
dzgui.sh | 8 ++++----
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index c580d1b..b3bad56 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-35
+version=5.0.0.rc-36
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="e8f3f1ff2a46c6a4bb8a692f42da550b"
+ ["ui.py"]="4cc79aacfc87ded6989e7a7e077a9b23"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="a37820c4c5da21811bae77f6c43ed9a6"
+ ["funcs"]="c05444b8db8cb010909eb2763100450a"
)
local author="aclist"
local repo="dztui"
@@ -812,7 +812,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
-# fetch_helpers > >(pdialog "Checking helper files")
+ fetch_helpers > >(pdialog "Checking helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index 80bbb2c..70d592d 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-35
+version=5.0.0.rc-36
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 57a156a..02261fa 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.35
+# 5.0.0-rc.36
app_name = "DZGUI"
cache = {}
From e197e07e84adb62dac4d4bb6c48cc3cec54dd9b9 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:09:48 +0900
Subject: [PATCH 069/122] fix: clean up leaky dialogs
---
dzgui.sh | 6 +++---
helpers/funcs | 8 +++++---
helpers/ui.py | 15 +++++++++------
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index b3bad56..b8a1e4e 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-36
+version=5.0.0.rc-37
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="4cc79aacfc87ded6989e7a7e077a9b23"
+ ["ui.py"]="26032cc056ff1ce25660a2ca58cffc81"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="c05444b8db8cb010909eb2763100450a"
+ ["funcs"]="4f142d4fe883a6936f94c964dbcf0710"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 70d592d..fcd2d37 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-36
+version=5.0.0.rc-37
#CONSTANTS
aid=221100
@@ -89,7 +89,6 @@ else
steam_cmd="flatpak run com.valvesoftware.Steam"
fi
-#TODO: dump servers methods can be merged
declare -A funcs=(
["My servers"]="dump_servers"
["Change player name"]="update_config_val"
@@ -774,8 +773,10 @@ update_favs_from_table(){
local record="$2"
if [[ $context =~ Remove ]]; then
remove_from_favs "$record"
+ echo "Removed $record from saved servers"
else
add_to_favs "$record"
+ echo "Added $record to saved servers"
fi
return 0
}
@@ -837,6 +838,7 @@ update_config_val(){
declare -n nr=$key
nr="$value"
update_config
+ echo "Updated the key '$key' to '$value'"
return 90
}
show_log(){
@@ -1163,7 +1165,7 @@ check_timestamps(){
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[$@]}"
+ printf "%s\n" "${remote_ids[@]}"
return 0
fi
diff --git a/helpers/ui.py b/helpers/ui.py
index 02261fa..450c90b 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.36
+# 5.0.0-rc.37
app_name = "DZGUI"
cache = {}
@@ -134,7 +134,7 @@ status_tooltip = {
"Server browser": "Used to browse the global server list",
"My saved servers": "Browse your saved servers",
"Quick-connect to favorite server": "Connect to your favorite server",
- "Recent servers": "Shows the last 10 servers you connected to",
+ "Recent servers": "Shows the last 10 servers you connected to (includes attempts)",
"Connect by IP": "Connect to a server by IP",
"Connect by ID": "Connect to a server by Battlemetrics ID",
"Add server by IP": "Add a server by IP",
@@ -341,7 +341,8 @@ def process_tree_option(input, treeview):
def _background(subproc, args, dialog):
def _load():
wait_dialog.destroy()
- msg = proc.stdout
+ out = proc.stdout.splitlines()
+ msg = out[-1]
rc = proc.returncode
logger.info("Subprocess returned code %s with message '%s'" %(rc, msg))
process_shell_return_code(transient_parent, msg, rc, input)
@@ -356,7 +357,8 @@ def process_tree_option(input, treeview):
# False is used to bypass wait dialogs
proc = call_out(transient_parent, subproc, args)
rc = proc.returncode
- msg = proc.stdout
+ out = proc.stdout.splitlines()
+ msg = out[-1]
process_shell_return_code(transient_parent, msg, rc, input)
@@ -667,11 +669,12 @@ class TreeView(Gtk.TreeView):
match context_menu_label:
case "Add to my servers" | "Remove from favorites":
record = "%s:%s" %(self.get_column_at_index(6), self.get_column_at_index(7))
- call_out(parent, context_menu_label, record)
+ proc = call_out(parent, context_menu_label, record)
if context == "Name (My saved servers)":
iter = self.get_current_iter()
server_store.remove(iter)
- res = spawn_dialog(parent, "Added %s to favorites" %(record), "NOTIFY")
+ msg = proc.stdout
+ res = spawn_dialog(parent, msg, "NOTIFY")
case "Remove from history":
record = "%s:%s" %(self.get_column_at_index(6), self.get_column_at_index(7))
call_out(parent, context_menu_label, record)
From a1689b5677c507a4f64c72496d879a9a3ae1f26f Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:32:01 +0900
Subject: [PATCH 070/122] fix: force fullscreen on GM
---
dzgui.sh | 22 +++++++++++++++++-----
helpers/funcs | 2 +-
helpers/ui.py | 23 ++++++++++++-----------
3 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index b8a1e4e..ec9d656 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-37
+version=5.0.0.rc-38
#CONSTANTS
aid=221100
@@ -370,10 +370,22 @@ dl_changelog(){
local md="https://raw.githubusercontent.com/$author/dztui/${mdbranch}/CHANGELOG.md"
curl -Ls "$md" > "$state_path/CHANGELOG.md"
}
+test_display_mode(){
+ pgrep -a gamescope | grep -q "generate-drm-mode"
+ if [[ $? -eq 0 ]]; then
+ echo gm
+ else
+ echo dm
+ fi
+}
check_architecture(){
local cpu=$(< /proc/cpuinfo grep "AMD Custom APU 0405")
if [[ -n "$cpu" ]]; then
- is_steam_deck=1
+ if [[ $(test_display_mode) == "gm" ]]; then
+ is_steam_deck=2
+ else
+ is_steam_deck=1
+ fi
logger INFO "Setting architecture to 'Steam Deck'"
else
is_steam_deck=0
@@ -536,10 +548,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="26032cc056ff1ce25660a2ca58cffc81"
+ ["ui.py"]="79f21f63a704389d5aec0731c75b5e0f"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="4f142d4fe883a6936f94c964dbcf0710"
+ ["funcs"]="e49f7a123134d49f622dba9b671b000e"
)
local author="aclist"
local repo="dztui"
@@ -812,7 +824,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
- fetch_helpers > >(pdialog "Checking helper files")
+# fetch_helpers > >(pdialog "Checking helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index fcd2d37..7259960 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-37
+version=5.0.0.rc-38
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 450c90b..e52f8b5 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.37
+# 5.0.0-rc.38
app_name = "DZGUI"
cache = {}
@@ -435,7 +435,7 @@ def reinit_checks():
class OuterWindow(Gtk.Window):
- def __init__(self, is_steam_deck):
+ def __init__(self, is_steam_deck, is_game_mode):
super().__init__(title=app_name)
self.connect("delete-event", self.halt_proc_and_quit)
@@ -449,14 +449,10 @@ class OuterWindow(Gtk.Window):
"""
self.grid = Grid(is_steam_deck)
self.add(self.grid)
-# self.hb = AppHeaderBar()
-
-# if is_steam_deck is True:
-# self.maximize()
-# self.set_decorated(False)
-# else:
-# pass
-# self.set_titlebar(self.hb)
+ if is_game_mode is True:
+ self.fullscreen()
+ else:
+ self.maximize()
# Hide FilterPanel on main menu
self.show_all()
@@ -1485,10 +1481,15 @@ class App(Gtk.Application):
_isd = int(sys.argv[3])
if _isd == 1:
is_steam_deck = True
+ is_game_mode = False
+ elif _isd == 2:
+ is_steam_deck = True
+ is_game_mode = True
else:
is_steam_deck = False
+ is_game_mode = False
- self.win = OuterWindow(is_steam_deck)
+ self.win = OuterWindow(is_steam_deck, is_game_mode)
accel = Gtk.AccelGroup()
accel.connect(Gdk.KEY_q, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE, self._halt_window_subprocess)
From ba32e14e81660e2bd0502a818c248cc1b2f375d3 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:32:44 +0900
Subject: [PATCH 071/122] chore: test changelog
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67cfc88..c585451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## [5.0.0] 2024-01-29
+### Added
+- Test
+
## [4.1.1] 2023-12-18
### Fixed
From aaf3cf8ef8e528429b6dda124ef49ab1e1d6412c Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:33:04 +0900
Subject: [PATCH 072/122] fix: uncomment function
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index ec9d656..71d0297 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -824,7 +824,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
-# fetch_helpers > >(pdialog "Checking helper files")
+ fetch_helpers > >(pdialog "Checking helper files")
local_latlon
is_steam_running
is_dzg_downloading
From 274df41748d95981dea71b30fe8e796d2e8c4245 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Mon, 29 Jan 2024 18:36:50 +0900
Subject: [PATCH 073/122] fix: changelog URL
---
dzgui.sh | 8 ++++----
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 71d0297..4959ad3 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-38
+version=5.0.0.rc-39
#CONSTANTS
aid=221100
@@ -366,7 +366,7 @@ prompt_dl(){
dl_changelog(){
local mdbranch
[[ $branch == "stable" ]] && mdbranch="dzgui"
- [[ $branch == "" ]] && mdbranch="testing"
+ [[ $branch == "testing" ]] && mdbranch="testing"
local md="https://raw.githubusercontent.com/$author/dztui/${mdbranch}/CHANGELOG.md"
curl -Ls "$md" > "$state_path/CHANGELOG.md"
}
@@ -548,10 +548,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="79f21f63a704389d5aec0731c75b5e0f"
+ ["ui.py"]="2c7b337afc5abc8be83bf3c62e043e71"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="e49f7a123134d49f622dba9b671b000e"
+ ["funcs"]="1396887afe48f16096089395914a417d"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 7259960..20e7055 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-38
+version=5.0.0.rc-39
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index e52f8b5..3273aec 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.38
+# 5.0.0-rc.39
app_name = "DZGUI"
cache = {}
From ac8a5f817573f9b7bfe60bed19d02bfa35e11547 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:17:45 +0900
Subject: [PATCH 074/122] fix: set margins
---
dzgui.sh | 8 ++++----
helpers/funcs | 2 +-
helpers/ui.py | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 4959ad3..164ef7e 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-39
+version=5.0.0.rc-40
#CONSTANTS
aid=221100
@@ -548,10 +548,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="2c7b337afc5abc8be83bf3c62e043e71"
+ ["ui.py"]="ff29782f8e6dbc21ffe7c2d620198bfd"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="1396887afe48f16096089395914a417d"
+ ["funcs"]="9d5d376c585a1c34db388cb2c068aa8b"
)
local author="aclist"
local repo="dztui"
@@ -824,7 +824,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
- fetch_helpers > >(pdialog "Checking helper files")
+# fetch_helpers > >(pdialog "Checking helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index 20e7055..532628b 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-39
+version=5.0.0.rc-40
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 3273aec..8aa55b1 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.39
+# 5.0.0-rc.40
app_name = "DZGUI"
cache = {}
@@ -1520,6 +1520,7 @@ class FilterPanel(Gtk.Box):
self.connect("button-release-event", self._on_button_release)
self.set_orientation(Gtk.Orientation.VERTICAL)
set_surrounding_margins(self, 10)
+ self.set_margin_top(1)
self.filters_label = Gtk.Label(label="Filters")
From 419919ffdc65c2d7b42fc4a4a17ce0b56d1841bf Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:19:03 +0900
Subject: [PATCH 075/122] fix: uncomment line
---
dzgui.sh | 8 ++++----
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 164ef7e..992938a 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-40
+version=5.0.0.rc-41
#CONSTANTS
aid=221100
@@ -548,10 +548,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="ff29782f8e6dbc21ffe7c2d620198bfd"
+ ["ui.py"]="cf1542c215b72ded42a3b52068e0653f"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="9d5d376c585a1c34db388cb2c068aa8b"
+ ["funcs"]="c1b73598bddde3fc3b9c9d12061a5b83"
)
local author="aclist"
local repo="dztui"
@@ -824,7 +824,7 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
-# fetch_helpers > >(pdialog "Checking helper files")
+ fetch_helpers > >(pdialog "Checking helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index 532628b..cc485d4 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-40
+version=5.0.0.rc-41
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 8aa55b1..aa8c732 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.40
+# 5.0.0-rc.41
app_name = "DZGUI"
cache = {}
From 3c679aadaae56bcda249e5c1cfac4240c6ebba2b Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:59:25 +0900
Subject: [PATCH 076/122] fix: check for helpers sooner
---
dzgui.sh | 11 +++++++----
helpers/funcs | 2 +-
helpers/ui.py | 8 ++++----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 992938a..25339cb 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-41
+version=5.0.0.rc-42
#CONSTANTS
aid=221100
@@ -548,14 +548,16 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="cf1542c215b72ded42a3b52068e0653f"
+ ["ui.py"]="2331665f5a2fb55cc030621812a309ea"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="c1b73598bddde3fc3b9c9d12061a5b83"
+ ["funcs"]="3f7f374117dd2bbc55e1d055d903cff2"
)
local author="aclist"
local repo="dztui"
local branch="$branch"
+ #TODO: update to 'dzgui' for first time setup
+ [[ -z $branch ]] && branch="testing"
local file
local sum
local full_path
@@ -565,6 +567,7 @@ fetch_helpers_by_sum(){
sum="${sums[$i]}"
full_path="$helpers_path/$file"
url="https://raw.githubusercontent.com/$author/$repo/$branch/helpers/$file"
+ echo "$url" >> $HOME/log
if [[ -f "$full_path" ]] && [[ $(get_hash "$full_path") == $sum ]]; then
logger INFO "$file is current"
else
@@ -815,6 +818,7 @@ initial_setup(){
watcher_deps
check_architecture
test_connection
+ fetch_helpers > >(pdialog "Checking helper files")
varcheck
source "$config_file"
lock
@@ -824,7 +828,6 @@ initial_setup(){
steam_deps
migrate_files
stale_symlinks
- fetch_helpers > >(pdialog "Checking helper files")
local_latlon
is_steam_running
is_dzg_downloading
diff --git a/helpers/funcs b/helpers/funcs
index cc485d4..c33bafd 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-41
+version=5.0.0.rc-42
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index aa8c732..c7f9f12 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.41
+# 5.0.0-rc.42
app_name = "DZGUI"
cache = {}
@@ -663,7 +663,7 @@ class TreeView(Gtk.TreeView):
logger.info("User clicked context menu '%s'" %(context_menu_label))
match context_menu_label:
- case "Add to my servers" | "Remove from favorites":
+ case "Add to my servers" | "Remove from my servers":
record = "%s:%s" %(self.get_column_at_index(6), self.get_column_at_index(7))
proc = call_out(parent, context_menu_label, record)
if context == "Name (My saved servers)":
@@ -722,7 +722,7 @@ class TreeView(Gtk.TreeView):
mod_context_items = ["Open in Steam Workshop", "Delete mod"]
subcontext_items = {"Server browser": ["Add to my servers", "Copy IP to clipboard", "Show server-side mods"],
- "My saved servers": ["Remove from favorites", "Copy IP to clipboard", "Show server-side mods"],
+ "My saved servers": ["Remove from my servers", "Copy IP to clipboard", "Show server-side mods"],
"Recent servers": ["Remove from history", "Copy IP to clipboard", "Show server-side mods"],
}
# submenu hierarchy https://stackoverflow.com/questions/52847909/how-to-add-a-sub-menu-to-a-gtk-menu
@@ -740,7 +740,7 @@ class TreeView(Gtk.TreeView):
record = "%s:%s" %(self.get_column_at_index(6), self.get_column_at_index(7))
proc = call_out(widget, "is_in_favs", record)
if proc.returncode == 0:
- item = "Remove from favorites"
+ item = "Remove from my servers"
item = Gtk.MenuItem(label=item)
item.connect("activate", self._on_menu_click)
self.menu.append(item)
From 23bd692fca622407c0e2a8669ff313f9469a2826 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:21:16 +0900
Subject: [PATCH 077/122] fix: update launch flags
---
dzgui.sh | 8 ++++----
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 25339cb..623ccf7 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-42
+version=5.0.0.rc-43
#CONSTANTS
aid=221100
@@ -393,7 +393,7 @@ check_architecture(){
fi
}
check_map_count(){
- [[ $is_steam_deck -eq 1 ]] && return 0
+ [[ $is_steam_deck -gt 0 ]] && return 0
local count=1048576
local conf_file="/etc/sysctl.d/dayz.conf"
if [[ -f $conf_file ]]; then
@@ -548,10 +548,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="2331665f5a2fb55cc030621812a309ea"
+ ["ui.py"]="2828ecfd733c3ebc7024fbe5c8349cb5"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="3f7f374117dd2bbc55e1d055d903cff2"
+ ["funcs"]="5f9f7af1fae725e295de08a95f14ba6d"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index c33bafd..17d0b8a 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-42
+version=5.0.0.rc-43
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index c7f9f12..45c3ff8 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.42
+# 5.0.0-rc.43
app_name = "DZGUI"
cache = {}
From 85f4f7e7f275799e0c24b2bba43d0ce3c8704db8 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:29:48 +0900
Subject: [PATCH 078/122] fix: check architecture
---
dzgui.sh | 6 +++---
helpers/funcs | 12 ++++++++++--
helpers/ui.py | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 623ccf7..f6697a2 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-43
+version=5.0.0.rc-44
#CONSTANTS
aid=221100
@@ -548,10 +548,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="2828ecfd733c3ebc7024fbe5c8349cb5"
+ ["ui.py"]="9411e901a8572568ab129a4fe472a0a3"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="5f9f7af1fae725e295de08a95f14ba6d"
+ ["funcs"]="722834d7fa7aa60a2cf7f5b7350c5675"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 17d0b8a..cc58af6 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-43
+version=5.0.0.rc-44
#CONSTANTS
aid=221100
@@ -1024,7 +1024,7 @@ try_connect(){
diff=$(merge_modlists "$diff")
fi
if [[ -n $diff ]]; then
- if [[ $is_steam_deck -eq 1 ]] && [[ $(test_display_mode) == "gm" ]]; then
+ if [[ $(check_architecture) -eq 1 ]] && [[ $(test_display_mode) == "gm" ]]; then
printf "Use Desktop Mode to download mods on Steam Deck"
return 1
fi
@@ -1036,6 +1036,14 @@ try_connect(){
launch "$ip" "$gameport" "$sanitized_mods"
fi
}
+check_architecture(){
+ local cpu=$(< /proc/cpuinfo grep "AMD Custom APU 0405")
+ if [[ -n "$cpu" ]]; then
+ echo 1
+ else
+ echo 0
+ fi
+}
focus_beta_client(){
_wid(){
wmctrl -ilx |\
diff --git a/helpers/ui.py b/helpers/ui.py
index 45c3ff8..56f7104 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.43
+# 5.0.0-rc.44
app_name = "DZGUI"
cache = {}
From 155b1850e38e69558b190765ef4b0ffe4adfa97b Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 18:01:10 +0900
Subject: [PATCH 079/122] fix: set branch on update
---
dzgui.sh | 14 +++++++-------
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index f6697a2..9eed3ed 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-44
+version=5.0.0.rc-45
#CONSTANTS
aid=221100
@@ -548,25 +548,25 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="9411e901a8572568ab129a4fe472a0a3"
+ ["ui.py"]="6c6e024633f37915d010bc745fecdf7e"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="722834d7fa7aa60a2cf7f5b7350c5675"
+ ["funcs"]="609cfc212219f43af70cd86e7cf87c8f"
)
local author="aclist"
local repo="dztui"
- local branch="$branch"
- #TODO: update to 'dzgui' for first time setup
- [[ -z $branch ]] && branch="testing"
+ local realbranch
local file
local sum
local full_path
+ [[ -z $branch ]] && realbranch="dzgui"
+ [[ $branch == "testing" ]] && realbranch="$branch"
for i in "${!sums[@]}"; do
file="$i"
sum="${sums[$i]}"
full_path="$helpers_path/$file"
- url="https://raw.githubusercontent.com/$author/$repo/$branch/helpers/$file"
+ url="https://raw.githubusercontent.com/$author/$repo/$realbranch/helpers/$file"
echo "$url" >> $HOME/log
if [[ -f "$full_path" ]] && [[ $(get_hash "$full_path") == $sum ]]; then
logger INFO "$file is current"
diff --git a/helpers/funcs b/helpers/funcs
index cc58af6..9e3c2fe 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-44
+version=5.0.0.rc-45
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 56f7104..3a95431 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.44
+# 5.0.0-rc.45
app_name = "DZGUI"
cache = {}
From dfa70ed3b2c623dcfd6d2b4894b7a7aa90367235 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 18:03:20 +0900
Subject: [PATCH 080/122] docs: update changelog
---
CHANGELOG.md | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c585451..75361a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,30 @@
# Changelog
-## [5.0.0] 2024-01-29
+## [5.0.0] 2024-01-31
### Added
-- Test
+- Context switching: navigate to different pages using side buttons
+- Dynamic statusbar: updates metadata and server distance when selecting rows
+- Show server-side modlist and allow jumping to Steam Workshop pages to browse, and list whether mod is currently installed
+- Print debug logs in-app (Help > Show debug log)
+- Functionality to change API keys in-app (used when revoking old API keys)
+- Print atomic mod sizes when listing installed mods
+- Dialogs show direct links to API key management URLs when changing API keys
+- Toggle dry-run mode directly from server browser
+- Extensive keybindings for fully controlling the application without the mouse
+- Extensive pre-boot sanity checks
+- Keybinding help dialog in main menu
+- Right-click context menus in server browsers/mod list: add/remove from favorites, show server-side mods, delete mod, copy server IP to clipboard
+
+### Changed
+- Utilize GTK bindings and MVC paradigm for UI creation and data flow
+- Filter servers dynamically from within server browser
+- Performance and security improvements to DZGUI helper files
+
+### Fixed
+- First-time setup dialogs respawning repeatedly in certain scenarios
+- Issues with Steam client switching to the wrong page when using auto-mod install
+- Set text input module correctly when launching on Steam Deck
+- Separate current/total player count and use proper integer sort method in table
## [4.1.1] 2023-12-18
### Fixed
From eeffd3a29376077a29e25636e55de624260b3a3d Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 18:06:03 +0900
Subject: [PATCH 081/122] fix: set real branch correctly
---
dzgui.sh | 15 ++++++++++-----
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 9eed3ed..26b6dcd 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-45
+version=5.0.0.rc-46
#CONSTANTS
aid=221100
@@ -548,10 +548,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="6c6e024633f37915d010bc745fecdf7e"
+ ["ui.py"]="a96a6180ac7ddccf4d37ec3dbdbe9c90"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="609cfc212219f43af70cd86e7cf87c8f"
+ ["funcs"]="7b4a5388ece7f723d2d3bbc08bbc3187"
)
local author="aclist"
local repo="dztui"
@@ -559,8 +559,13 @@ fetch_helpers_by_sum(){
local file
local sum
local full_path
- [[ -z $branch ]] && realbranch="dzgui"
- [[ $branch == "testing" ]] && realbranch="$branch"
+
+ # first time setup
+ if [[ -z $branch ]]; then
+ realbranch="dzgui"
+ else
+ realbranch="$branch"
+ fi
for i in "${!sums[@]}"; do
file="$i"
diff --git a/helpers/funcs b/helpers/funcs
index 9e3c2fe..844d5ca 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-45
+version=5.0.0.rc-46
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 3a95431..1e74f48 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.45
+# 5.0.0-rc.46
app_name = "DZGUI"
cache = {}
From e6d62c94fa2b9ebf3dc5d06ef770030f99dbdece Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 18:07:47 +0900
Subject: [PATCH 082/122] chore: drop check news
---
dzgui.sh | 18 +++---------------
helpers/funcs | 2 +-
helpers/ui.py | 2 +-
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 26b6dcd..6e59616 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-46
+version=5.0.0.rc-47
#CONSTANTS
aid=221100
@@ -474,18 +474,6 @@ stale_symlinks(){
unlink $l
done
}
-check_news(){
- [[ $branch == "stable" ]] && news_url="$stable_url/news"
- [[ $branch == "testing" ]] && news_url="$testing_url/news"
- local result=$(curl -Ls "$news_url")
- local sum=$(<<< "$result" md5sum | awk '{print $1}')
- if [[ $sum != "$seen_news" ]]; then
- logger WARN "Local news checksum '$seen_news' != '$sum'"
- seen_news="$sum"
- update_config
- echo "$result"
- fi
-}
local_latlon(){
if [[ -z $(command -v dig) ]]; then
local local_ip=$(curl -Ls "https://ipecho.net/plain")
@@ -548,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="a96a6180ac7ddccf4d37ec3dbdbe9c90"
+ ["ui.py"]="aae6bd048bc4786a914c3ed45bef82da"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="7b4a5388ece7f723d2d3bbc08bbc3187"
+ ["funcs"]="6f853f3f0fa838ce731f203dddb22702"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 844d5ca..5193f8e 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-46
+version=5.0.0.rc-47
#CONSTANTS
aid=221100
diff --git a/helpers/ui.py b/helpers/ui.py
index 1e74f48..e4aa96e 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.46
+# 5.0.0-rc.47
app_name = "DZGUI"
cache = {}
From 7d86af03f17a56f80130d9087ba20d6adbdb3f12 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 18:52:33 +0900
Subject: [PATCH 083/122] fix: variable name
---
dzgui.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index 6e59616..e58f3c5 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -259,8 +259,8 @@ Type=Application
Terminal=false
Exec=$share_path/dzgui.sh
Name=$app_name_upper
-Comment=$appname
-Icon=$share_path/$appname
+Comment=$app_name
+Icon=$share_path/$app_name
Categories=Game
END
}
@@ -272,9 +272,9 @@ freedesktop_dirs(){
for i in dzgui grid.png hero.png logo.png; do
curl -s "$img_url/$i" > "$share_path/$i"
done
- write_desktop_file > "$freedesktop_path/$appname.desktop"
+ write_desktop_file > "$freedesktop_path/$app_name.desktop"
[[ $is_steam_deck -eq 0 ]] && return
- write_desktop_file > "$HOME/Desktop/$appname.desktop"
+ write_desktop_file > "$HOME/Desktop/$app_name.desktop"
}
legacy_vars(){
local suffix="fav"
@@ -313,7 +313,7 @@ check_version(){
version_url="$testing_url/dzgui.sh"
fi
local upstream=$(curl -Ls "$version_url" | awk -F= '/^version=/ {print $2}')
- [[ ! -f "$freedesktop_path/$appname.desktop" ]] && freedesktop_dirs
+ [[ ! -f "$freedesktop_path/$app_name.desktop" ]] && freedesktop_dirs
if [[ $version == $upstream ]]; then
logger INFO "Local version is same as upstream"
check_unmerged
From 71757fe98243fd5ce6f70355a1176d8b2b111e3f Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 19:09:26 +0900
Subject: [PATCH 084/122] fix: print message when adding record
---
dzgui.sh | 6 +++---
helpers/funcs | 3 ++-
helpers/ui.py | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index e58f3c5..0437df4 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-47
+version=5.0.0.rc-48
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="aae6bd048bc4786a914c3ed45bef82da"
+ ["ui.py"]="198578bad93a68b6dbc36d3545d0c445"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="6f853f3f0fa838ce731f203dddb22702"
+ ["funcs"]="9384522c45e7e9d78e872c540e5121ab"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index 5193f8e..7703b06 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-47
+version=5.0.0.rc-48
#CONSTANTS
aid=221100
@@ -737,6 +737,7 @@ add_to_favs(){
ip_list+=("$record")
update_config
logger INFO "Added the record $record to saved servers"
+ printf "Added %s to saved servers" $record
return 90
}
remove_from_history(){
diff --git a/helpers/ui.py b/helpers/ui.py
index e4aa96e..cdaa9c0 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.47
+# 5.0.0-rc.48
app_name = "DZGUI"
cache = {}
From 73a990cafc34e09bad5d21e2d6ac87fea4dcee8b Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Wed, 31 Jan 2024 19:31:48 +0900
Subject: [PATCH 085/122] chore: update warning message
---
dzgui.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dzgui.sh b/dzgui.sh
index 0437df4..efbb673 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -130,7 +130,7 @@ test_gobject(){
python3 -c "import gi"
if [[ ! $? -eq 0 ]]; then
logger CRITICAL "Missing PyGObject"
- fdialog "Requires PyGObject"
+ fdialog "Requires PyGObject (python3-gobject)"
exit 1
fi
logger INFO "Found PyGObject in Python env"
From 131fa6c82476674049206431d5d59bbcfd3794ec Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Thu, 1 Feb 2024 05:38:22 +0900
Subject: [PATCH 086/122] chore: backports
---
dzgui.sh | 8 ++++----
helpers/funcs | 4 ++--
helpers/ui.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dzgui.sh b/dzgui.sh
index efbb673..44c2281 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-48
+version=5.1.0-rc.1
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="198578bad93a68b6dbc36d3545d0c445"
+ ["ui.py"]="79e577bd18ba3872bbea87c8a23bd71c"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="9384522c45e7e9d78e872c540e5121ab"
+ ["funcs"]="3cc74e21055f9714e469520b12fe665e"
)
local author="aclist"
local repo="dztui"
@@ -631,7 +631,7 @@ find_default_path(){
-o -path "/sys" -o -path "/etc" -o -path "/var" -o -path "/lost+found" \) -prune \
-o -regex ".*/Steam/ubuntu12_32$" -print -quit 2>/dev/null | sed 's@/ubuntu12_32@@')
}
- if [[ $is_steam_deck -eq 1 ]]; then
+ if [[ $is_steam_deck -gt 0 ]]; then
default_steam_path="$HOME/.local/share/Steam"
logger INFO "Set default Steam path to $default_steam_path"
return 0
diff --git a/helpers/funcs b/helpers/funcs
index 7703b06..f342957 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.0.0.rc-48
+version=5.1.0-rc.1
#CONSTANTS
aid=221100
@@ -1227,7 +1227,7 @@ concat_mods(){
done | tr -d '\n' | perl -ple 'chop'
}
is_dayz_running(){
- local proc=$(ps aux | grep "DayZ.*\.exe" | grep -v grep)
+ local proc=$(ps aux | grep "DayZ_x64.exe" | grep -v grep)
if [[ -n $proc ]]; then
echo 1
else
diff --git a/helpers/ui.py b/helpers/ui.py
index cdaa9c0..64a86e9 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.0.0-rc.48
+# 5.1.0.rc-1
app_name = "DZGUI"
cache = {}
From 2da5d0936bd2a8c2463b9e1a0c85cdff51dd72b8 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 10 Feb 2024 18:35:49 +0900
Subject: [PATCH 087/122] chore: backports
---
dzgui.sh | 6 +++---
helpers/funcs | 4 ++--
helpers/ui.py | 2 +-
news | 1 -
4 files changed, 6 insertions(+), 7 deletions(-)
delete mode 100644 news
diff --git a/dzgui.sh b/dzgui.sh
index 44c2281..3c712c0 100755
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.1.0-rc.1
+version=5.2.0-rc.1
#CONSTANTS
aid=221100
@@ -536,10 +536,10 @@ fetch_dzq(){
fetch_helpers_by_sum(){
declare -A sums
sums=(
- ["ui.py"]="79e577bd18ba3872bbea87c8a23bd71c"
+ ["ui.py"]="b3b5e5917a74317bb19578d961944c6b"
["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
- ["funcs"]="3cc74e21055f9714e469520b12fe665e"
+ ["funcs"]="c6b751e3d6c4bee40197f86425b45258"
)
local author="aclist"
local repo="dztui"
diff --git a/helpers/funcs b/helpers/funcs
index f342957..acfd8d0 100755
--- a/helpers/funcs
+++ b/helpers/funcs
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -o pipefail
-version=5.1.0-rc.1
+version=5.2.0-rc.1
#CONSTANTS
aid=221100
@@ -36,7 +36,7 @@ versions_file="$state_path/$prefix.versions"
lock_file="$state_path/$prefix.lock"
#CACHE
-cache_dir="$HOME/.cache/$appname"
+cache_dir="$HOME/.cache/$app_name"
_cache_servers="$cache_dir/$prefix.servers"
_cache_my_servers="$cache_dir/$prefix.my_servers"
_cache_history="$cache_dir/$prefix.history"
diff --git a/helpers/ui.py b/helpers/ui.py
index 64a86e9..adc06af 100644
--- a/helpers/ui.py
+++ b/helpers/ui.py
@@ -16,7 +16,7 @@ locale.setlocale(locale.LC_ALL, '')
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GLib, Gdk, GObject, Pango
-# 5.1.0.rc-1
+# 5.2.0.rc-1
app_name = "DZGUI"
cache = {}
diff --git a/news b/news
deleted file mode 100644
index 386f0c1..0000000
--- a/news
+++ /dev/null
@@ -1 +0,0 @@
-NEWS: Added support for LAN servers and restored Steam Deck Game Mode support. See changelog.
From a5b565bcb9c9b03efe62ac8002f638c263d075a4 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sat, 10 Feb 2024 18:36:31 +0900
Subject: [PATCH 088/122] chore: update image
---
images/example.png | Bin 295831 -> 460709 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/images/example.png b/images/example.png
index eb874d14154f212083555d392474f5012554acd1..307293dfcc249360fb0ea03d4692ddc8ac893d96 100644
GIT binary patch
literal 460709
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