From 37729aad464fd0fa0573cbdc67ca56a79d3a2276 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sun, 16 Jun 2024 04:05:26 +0900 Subject: [PATCH 1/7] chore: backports --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02c2e02..70ae0ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,13 @@ # Changelog -## [5.3.0] 2024-06-10 +## [5.3.1] 2024-06-15 +### Added +- Uninstall routine: invoke via dzgui.sh -u or dzgui.sh --uninstall and choose from full or partial uninstall + +## [5.3.0] 2024-06-15 ### Added - Server browser tables now display the number of players in queue (for full servers) - Warning dialog if the user's API key returned no servers, and a global API cooldown dialog (60 seconds) -- Uninstall routine: invoke via dzgui.sh -u or dzgui.sh --uninstall and choose from full or partial uninstall ### Fixed - Removing servers from My Servers via the right-click context menu was not actually removing the server and drawing an empty dialog - Resolved an issue where, when Steam was not installed in a standard location and the user was prompted to let DZGUI auto-discover the correct path, this information was not retained correctly From 5d006d421d51db20a81b6984de84c5cb66da8f03 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Wed, 19 Jun 2024 02:37:02 +0900 Subject: [PATCH 2/7] docs: fix typo --- docs/dzgui.adoc | 2 +- docs/dzgui_dark.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/dzgui.adoc b/docs/dzgui.adoc index ee3f6e3..bd8c984 100644 --- a/docs/dzgui.adoc +++ b/docs/dzgui.adoc @@ -550,7 +550,7 @@ This depends on server operators checking their mods for integrity. A mod is corrupted or the issue lies with the server. Replace the mods in question and reconnect. .The game is slow or prone to crashing -DayZ does not manipulate the game itself and does not contribute to/degrade its performance. +DZGUI does not manipulate the game itself and does not contribute to/degrade its performance. If you are experiencing performance degradation, it can be caused by too many mods installed or by a server-side problem (underpowered server, misconfiguration, etc.) Contact the server administrator for assistance. diff --git a/docs/dzgui_dark.adoc b/docs/dzgui_dark.adoc index 5f19064..98bb247 100644 --- a/docs/dzgui_dark.adoc +++ b/docs/dzgui_dark.adoc @@ -550,7 +550,7 @@ This depends on server operators checking their mods for integrity. A mod is corrupted or the issue lies with the server. Replace the mods in question and reconnect. .The game is slow or prone to crashing -DayZ does not manipulate the game itself and does not contribute to/degrade its performance. +DZGUI does not manipulate the game itself and does not contribute to/degrade its performance. If you are experiencing performance degradation, it can be caused by too many mods installed or by a server-side problem (underpowered server, misconfiguration, etc.) Contact the server administrator for assistance. From e5042cb523d757b895b598c76d484de8fd1221f4 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sun, 23 Jun 2024 11:31:06 +0900 Subject: [PATCH 3/7] docs: add uninstall info --- docs/dzgui.adoc | 8 ++++++++ docs/dzgui_dark.adoc | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/docs/dzgui.adoc b/docs/dzgui.adoc index bd8c984..4b4b41c 100644 --- a/docs/dzgui.adoc +++ b/docs/dzgui.adoc @@ -297,6 +297,14 @@ LC_ALL=de_DE.UTF-8 ./dzgui.sh If you intend to use this frequently, you could wrap the above in a script or alias. +== Uninstallation + +To uninstall DZGUI and its associated files, invoke `./dzgui.sh` with the `-u` or `--uninstall` flag. + +Follow the prompts to choose from full uninstall (removes the application and all user-defined configuration files) or partial install (removes the application, but keeps user-defined configuration files). + +If you intend to reinstall DZGUI again, keeping your configuration files is recommended. + == Basic usage Select from among the <> below. diff --git a/docs/dzgui_dark.adoc b/docs/dzgui_dark.adoc index 98bb247..41316ee 100644 --- a/docs/dzgui_dark.adoc +++ b/docs/dzgui_dark.adoc @@ -297,6 +297,14 @@ LC_ALL=de_DE.UTF-8 ./dzgui.sh If you intend to use this frequently, you could wrap the above in a script or alias. +== Uninstallation + +To uninstall DZGUI and its associated files, invoke `./dzgui.sh` with the `-u` or `--uninstall` flag. + +Follow the prompts to choose from full uninstall (removes the application and all user-defined configuration files) or partial install (removes the application, but keeps user-defined configuration files). + +If you intend to reinstall DZGUI again, keeping your configuration files is recommended. + == Basic usage Select from among the <> below. From 02165de680da31b82f47d9de8f83f7bf70db5471 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Sun, 23 Jun 2024 12:49:17 +0900 Subject: [PATCH 4/7] docs: backports --- docs/dzgui.adoc | 8 ++++---- docs/dzgui_dark.adoc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/dzgui.adoc b/docs/dzgui.adoc index 4b4b41c..809c523 100644 --- a/docs/dzgui.adoc +++ b/docs/dzgui.adoc @@ -311,7 +311,7 @@ Select from among the <> below. Connecting to a server consists of fetching metadata for the server you are searching for. DZGUI will check the server's modset against your local mods. If you are missing any, -it will prompt you to download them through the Steam Workshop and open a window in the background in the system browser. +it will prompt you to download them through the Steam Workshop. [NOTE] You must be logged into Steam for mod changes to take effect. @@ -469,7 +469,7 @@ Due to size constraints, this button is not currently available on Steam Deck. === Table metadata [%autowidth] -All server browser contexts (<
My saved servers, My saved servers>>, <
Server browser, Server browser>>, <
Recent servers, Recent servers>>) expose the following filters on the right-hand side. These options can be combined. +All server browser contexts (<
My saved servers, My saved servers>>, <
Server browser, Server browser>>, <
Recent servers, Recent servers>>) share the same table layout. The table lists servers in columnar fashion according to: @@ -490,12 +490,12 @@ Columns are width-adjustable, and the positions they are set to will be saved an When in a server browsing context, right click on any server in the list to expose a series of contextual options. These are: * **Add to (Remove from) saved servers**: add or remove the server to/from your saved servers list -* **Copy IP to clipboard**: copy the game server IP to the clipboard +* **Copy IP to clipboard**: copy the game server IP to the system clipboard * **Show server-side mods**: opens a dialog with details about the name, Workshop ID, and local installation status of mods on the server. Select a mod to open its Workshop page in Steam * **Refresh player count**: refresh the player count for this server in-place in the table. Useful if some time has passed since you loaded the list and you want to see if the queue is open === Filters -The filter panel on the right-hand side of the table allows you to search by keyword, map type, and toggle different filters. +The filter panel on the right-hand side of the table allows you to search by keyword, map type, and toggle different filters. These filters can be combined. ==== Keyword search diff --git a/docs/dzgui_dark.adoc b/docs/dzgui_dark.adoc index 41316ee..0115a71 100644 --- a/docs/dzgui_dark.adoc +++ b/docs/dzgui_dark.adoc @@ -311,7 +311,7 @@ Select from among the <> below. Connecting to a server consists of fetching metadata for the server you are searching for. DZGUI will check the server's modset against your local mods. If you are missing any, -it will prompt you to download them through the Steam Workshop and open a window in the background in the system browser. +it will prompt you to download them through the Steam Workshop. [NOTE] You must be logged into Steam for mod changes to take effect. @@ -469,7 +469,7 @@ Due to size constraints, this button is not currently available on Steam Deck. === Table metadata [%autowidth] -All server browser contexts (<
My saved servers, My saved servers>>, <
Server browser, Server browser>>, <
Recent servers, Recent servers>>) expose the following filters on the right-hand side. These options can be combined. +All server browser contexts (<
My saved servers, My saved servers>>, <
Server browser, Server browser>>, <
Recent servers, Recent servers>>) share the same table layout. The table lists servers in columnar fashion according to: @@ -490,12 +490,12 @@ Columns are width-adjustable, and the positions they are set to will be saved an When in a server browsing context, right click on any server in the list to expose a series of contextual options. These are: * **Add to (Remove from) saved servers**: add or remove the server to/from your saved servers list -* **Copy IP to clipboard**: copy the game server IP to the clipboard +* **Copy IP to clipboard**: copy the game server IP to the system clipboard * **Show server-side mods**: opens a dialog with details about the name, Workshop ID, and local installation status of mods on the server. Select a mod to open its Workshop page in Steam * **Refresh player count**: refresh the player count for this server in-place in the table. Useful if some time has passed since you loaded the list and you want to see if the queue is open === Filters -The filter panel on the right-hand side of the table allows you to search by keyword, map type, and toggle different filters. +The filter panel on the right-hand side of the table allows you to search by keyword, map type, and toggle different filters. These filters can be combined. ==== Keyword search From c79cc5832ed7c34bd29be3f9692fb748daba402b Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:27:37 +0900 Subject: [PATCH 5/7] fix: incomplete gametypes truncating list --- dzgui.sh | 8 +++++--- helpers/funcs | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dzgui.sh b/dzgui.sh index ba9b059..6abde7b 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -o pipefail -version=5.3.1-beta.1 +version=5.3.1-beta.2 #CONSTANTS aid=221100 @@ -538,7 +538,7 @@ fetch_helpers_by_sum(){ ["ui.py"]="f14772424461ec438579dec567db0634" ["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" - ["funcs"]="37ae407ac397f6775f3a412e7adb7840" + ["funcs"]="718c3060b88041f5b99a1ce52b12642f" ) local author="aclist" local repo="dztui" @@ -655,7 +655,9 @@ find_default_path(){ debian_path="$HOME/.steam/debian-installation" flatpak_path="$HOME/.var/app/com.valvesoftware.Steam/data/Steam" - for i in "$def_path" "$ubuntu_path" "$debian_path" "$flatpak_path"; do + #ubuntu path must precede default path because + #both exist on ubuntu systems, but only ubuntu path contains library data + for i in "$ubuntu_path" "$def_path" "$debian_path" "$flatpak_path"; do if [[ -d "$i" ]]; then default_steam_path="$i" return 0 diff --git a/helpers/funcs b/helpers/funcs index 8146bd7..b36a30b 100755 --- a/helpers/funcs +++ b/helpers/funcs @@ -521,7 +521,7 @@ parse_server_json(){ "\(if .gametype == null then "null" else (.gametype as $time|$time|test("[0-9]{2}:[0-9]{2}$") as $match|(if $match == true then ($time|scan("[0-9]{2}:[0-9]{2}$")) else "XXXX" end)) end)␞" + "\(.players)␞" + "\(.max_players)␞" + - "\(if .gametype == null then "0" else .gametype|split("lqs")[1]|split(",")[0] end)␞" + + "\(if .gametype == null then "0" elif .gametype|split("lqs")[1] == null then "0" else .gametype|split("lqs")[1]|split(",")[0] end)␞" + "\(.addr|split(":")[0]):\(if .gameport == null then "XXXX" else .gameport end)␞" + "\(.addr|split(":")[1])" ' | sort -k1 From b687a8916a30f3d013f3ca0bd5c8d563e79ce778 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:30:32 +0900 Subject: [PATCH 6/7] chore: bump version --- dzgui.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dzgui.sh b/dzgui.sh index 6abde7b..5e59ad9 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -o pipefail -version=5.3.1-beta.2 +version=5.3.2 #CONSTANTS aid=221100 From f8dd5a572cadac9a4d9cc69fef9597e401e8f145 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:34:15 +0900 Subject: [PATCH 7/7] docs: update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70ae0ef..ddb55ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [5.3.2] 2024-07-02 +### Fixed +- Server list would sometimes be missing some expected servers due to truncation being caused when a server erroneously set an incomplete gametype + ## [5.3.1] 2024-06-15 ### Added - Uninstall routine: invoke via dzgui.sh -u or dzgui.sh --uninstall and choose from full or partial uninstall