jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2025-04-05 12:03:00 +02:00
Code Issues Wiki Activity Actions

Fix player count

Browse source
This commit is contained in:
aclist 2022-09-27 09:42:46 +09:00
parent 1ccb52fabd
commit fda6724776
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
changelog.md
View file

@ -5,6 +5,14 @@
- Custom query API - Custom query API
- Standardize dialogs - Standardize dialogs
## [2.7.0-rc.18] 2022-09-26
### Changed
- Move lockfile check earlier in pipeline
- Reword "All maps" filter option
### Fixed
- Store player and server count sooner
## [2.7.0-rc.16-17] 2022-09-26 ## [2.7.0-rc.16-17] 2022-09-26
### Changed ### Changed
- Clean up error logging and progress bars - Clean up error logging and progress bars

11
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -o pipefail set -o pipefail
version=2.7.0-rc.17 version=2.7.0-rc.18
aid=221100 aid=221100
game="dayz" game="dayz"
@ -912,7 +912,7 @@ choose_filters(){
if [[ $is_steam_deck -eq 0 ]]; then if [[ $is_steam_deck -eq 0 ]]; then
sd_res="--width=1920 --height=1080" sd_res="--width=1920 --height=1080"
fi fi
sels=$(zenity --title=DZGUI --text="Server search" --list --checklist --column "Check" --column "Option" --hide-header TRUE "All maps" TRUE "Daytime" TRUE "Nighttime" False "Empty" False "Full" False "Low population" FALSE "Non-ASCII titles" FALSE "Keyword search" $sd_res 2>/dev/null) sels=$(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" False "Empty" False "Full" False "Low population" FALSE "Non-ASCII titles" FALSE "Keyword search" $sd_res 2>/dev/null)
if [[ $sels =~ Keyword ]]; then if [[ $sels =~ Keyword ]]; then
search=$(zenity --entry --text="Search (case insensitive)" --width=500 --title=DZGUI 2>/dev/null | awk '{print tolower($0)}') search=$(zenity --entry --text="Search (case insensitive)" --width=500 --title=DZGUI 2>/dev/null | awk '{print tolower($0)}')
[[ -z $search ]] && { ret=97; return; } [[ -z $search ]] && { ret=97; return; }
@ -964,8 +964,6 @@ munge_servers(){
disabled+=("All maps") disabled+=("All maps")
fi fi
[[ $ret -eq 97 ]] && return [[ $ret -eq 97 ]] && return
total_servers=$(echo "$response" | jq 'length')
players_online=$(echo "$response" | jq '.[].players' | awk '{s+=$1}END{print s}')
prepare_filters > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null) prepare_filters > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null)
if [[ $(echo "$response" | jq 'length') -eq 0 ]]; then if [[ $(echo "$response" | jq 'length') -eq 0 ]]; then
zenity --error --text="No matching servers" 2>/dev/null zenity --error --text="No matching servers" 2>/dev/null
@ -1022,6 +1020,8 @@ server_browser(){
} }
fetch > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null) fetch > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null)
response=$(< $file jq -r '.response.servers') response=$(< $file jq -r '.response.servers')
total_servers=$(echo "$response" | jq 'length')
players_online=$(echo "$response" | jq '.[].players' | awk '{s+=$1}END{print s}')
#DEBUG #DEBUG
debug_log="$HOME/.local/share/dzgui/DEBUG.log" debug_log="$HOME/.local/share/dzgui/DEBUG.log"
rm $debug_log rm $debug_log
@ -1381,6 +1381,7 @@ lock(){
res=$? res=$?
if [[ $res -eq 0 ]]; then if [[ $res -eq 0 ]]; then
echo "[DZGUI] Already running ($pid)" echo "[DZGUI] Already running ($pid)"
zenity --info --text="DZGUI already running (pid $pid)" --title=DZGUI 2>/dev/null
exit exit
elif [[ $pid == $$ ]]; then elif [[ $pid == $$ ]]; then
: :
@ -1390,7 +1391,6 @@ lock(){
} }
initial_setup(){ initial_setup(){
echo "# Initial setup" echo "# Initial setup"
lock
run_depcheck run_depcheck
check_architecture check_architecture
check_version check_version
@ -1402,6 +1402,7 @@ initial_setup(){
echo "100" echo "100"
} }
main(){ main(){
lock
initial_setup > >(zenity --pulsate --progress --auto-close --title=DZGUI --width=500 2>/dev/null) initial_setup > >(zenity --pulsate --progress --auto-close --title=DZGUI --width=500 2>/dev/null)
main_menu main_menu
#cruddy handling for steam forking #cruddy handling for steam forking