From cfadfb627ec46945dbc61e4187311a21e4111c4a Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Mon, 23 May 2022 04:20:34 +0900
Subject: [PATCH] bump to version 1.0.0

---
 dzgui.sh | 370 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 199 insertions(+), 171 deletions(-)

diff --git a/dzgui.sh b/dzgui.sh
index c57404b..963fc72 100644
--- a/dzgui.sh
+++ b/dzgui.sh
@@ -1,35 +1,20 @@
 #!/bin/bash
 
 set -eo pipefail
-version=0.1.0
+version=1.0.0
 aid=221100
 game="dayz"
 workshop="https://steamcommunity.com/sharedfiles/filedetails/?id="
 api="https://api.battlemetrics.com/servers"
-
-#BEGIN CONFIG================
-steam_path=""
-workshop_dir="$steam_path/steamapps/workshop/content/$aid"
-game_dir="$steam_path/steamapps/common/DayZ"
-key=""
-whitelist=""
-fav=""
-name="player"
+sd_res="--width=1280 --height=800"
+config_path="$HOME/.config/dztui/"
+config_file="${config_path}dztuirc"
+tmp=/tmp/dztui.tmp
 separator="│"
-#TODO: ping flag is unimplemented. Table creation requires rigid number of arguments. Add binary switch when constructing table
-#ping=1
-debug=0
-#END CONFIG==================
 
-export dzpipe=/tmp/dzfifo
-export tmp=tmp/dz.tmp
-[[ -p $dzpipe ]] && rm $dzpipe
-mkfifo $dzpipe
-exec 3<> $dzpipe
-trap cleanup EXIT INT
 
 declare -A deps
-deps=([awk]="5.1.1" [curl]="7.80.0" [jq]="1.6" [tr]="9.0" [yad]="12.0")
+deps=([awk]="5.1.1" [curl]="7.80.0" [jq]="1.6" [tr]="9.0" [zenity]="3.42.1")
 
 depcheck(){
 	for dep in "${!deps[@]}"; do
@@ -37,25 +22,136 @@ depcheck(){
 	done
 }
 
-logger(){
-	printf "[DZGUI] %s\n" "$1"
-}
+items=(
+	"Launch server list"
+	"Connect to favorite server (not implemented)"
+	"Add server from ID (not implemented)"
+	"List mods (not implemented)"
+	"Open mod page (TEST)"
+	"List system browser (TEST)"
+	)
 
+warn(){
+	zenity --info --title="DZGUI" --text="$1" --icon-name="dialog-warning" 2>/dev/null
+}
+info(){
+	zenity --info --title="DZGUI" --text="$1" --icon-name="network-wireless" 2>/dev/null
+}
+launch_in_bg(){
+	info "$msg" &
+	#TODO: use less brittle method
+	msg_pid=$(pgrep zenity)
+	${1} &
+	pid=$!  
+	while kill -0 $pid; do
+		:
+	done
+	#TODO: suppress output
+	#TODO: pid could be released to other process
+	if [[ -n $msd_pid ]]; then
+		kill -9 $msg_pid 1 >/dev/null 2>&1
+	else
+		:
+	fi
+
+}
 query_api(){
-	logger "Querying BattleMetrics"
-	response=$(curl -s "$api" -H "Authorization: Bearer "$key"" -G -d "sort=-players" \
+	response=$(curl -s "$api" -H "Authorization: Bearer "$api_key"" -G -d "sort=-players" \
 		-d "filter[game]=$game" -d "filter[ids][whitelist]=$whitelist")
 	if [[ "$(jq -r 'keys[]' <<< "$response")" == "errors" ]]; then
 		code=$(jq -r '.errors[] .status' <<< $response)
-		refresh_yad
 		#TODO: fix granular api codes
-		err "Error $code: malformed API key"
+		#TODO: put into copiable text info box
+		warn "Error $code: malformed API key"
 	fi
-#	elif [[ -z "$(jq -r '.data[]' <<< "$response")" ]]; then
-#		refresh_yad
-#		echo "Malformed server IDs" > $dzpipe
-#		return 1
-#	fi
+}
+
+#TODO: find default SD path
+write_config(){
+cat	<<-'END'
+
+#Path to DayZ installation (change if using multiple SD cards)
+steam_path=""
+workshop_dir="$steam_path/steamapps/workshop/content/$aid"
+game_dir="$steam_path/steamapps/common/DayZ"
+
+#Your unique API key
+api_key=""
+
+#Comma-separated list of server IDs
+whitelist=""
+
+#Favorite server to fast-connect to (limit one)
+fav=""
+
+#Custom player name (optional, required by some servers)
+name="player"
+
+#Set to 1 to perform dry-run and print launch options
+debug=0
+
+#(Not implemented) Set to 0 to suppress ping attempt
+ping=1
+
+	END
+}
+create_config(){
+	mkdir -p $config_path; write_config > $config_file
+	info "Config file created at $config_file.\nFill in values and relaunch."
+	exit
+
+}
+err(){
+	printf "[ERROR] %s\n" "$1"
+}
+varcheck(){
+	[[ -z $api_key ]] && (err "Error in key: 'api_key'")
+	[[ -z $whitelist ]] && (err "Error in key: 'whitelist'")
+	[[ ! -d $workshop_dir ]] && (err "Malformed workshop path")
+	[[ ! -d $game_dir ]] && (err "Malformed game path")
+	[[ $whitelist =~ [[:space:]] ]] && (err "Separate whitelist values with commas")
+	IFS=,
+	[[ ! "${whitelist[*]}" =~ ${fav} ]] && (err "Fav key value not in whitelist")
+	unset IFS
+}
+checks() {
+	if [[ -z $(depcheck) ]]; then 
+		:
+	else	
+		zenity $sd_res --text-info --cancel-label="Exit" <<< $(depcheck)
+	fi
+	if [[ -z $(varcheck) ]]; then 
+		:
+	else	
+		zenity $sd_res --text-info --cancel-label="Exit" <<< $(varcheck)
+	fi
+}
+config(){
+	if [[ ! -f $config_file ]]; then
+		zenity --question --cancel-label="Exit" --text="Config file not found. Should DZGUI create one for you?"
+		code=$?
+		if [[ $code -eq 1 ]]; then
+			exit
+		else
+			create_config
+		fi
+	else
+		source $config_file
+	fi
+
+}
+connect(){
+		#TODO: sanitize/validate input, return if failing
+		ip=$(echo "$1" | awk -F"$separator" '{print $1}')
+		bid=$(echo "$1" | awk -F"$separator" '{print $2}')
+		fetch_mods "$bid"
+		launch
+
+		#TODO: symlink validation, mod validation
+}
+fetch_mods(){
+	remote_mods=$(curl -s "$api" -H "Authorization: Bearer "$api_key"" -G -d filter[ids][whitelist]="$1" -d "sort=-players" \
+	| jq -r '.data[] .attributes .details .modIds[]')
 }
 concat_mods(){
 	readarray -t serv <<< "$remote_mods"
@@ -69,40 +165,85 @@ concat_mods(){
 launch(){
 	mods=$(concat_mods)
 	if [[ $debug -eq 1 ]]; then
-		printf "[DZGUI] [DEBUG] steam -applaunch $aid -connect=$ip -nolauncher -nosplash -skipintro \"-mod=$mods\"\n"
+		printf "[DEBUG] steam -applaunch $aid -connect=$ip -nolauncher -nosplash -skipintro \"-mod=$mods\"\n" | zenity --text-info $sd_res --title="DZGUI debug output"
 	else
 		steam -applaunch $aid -connect=$ip -nolauncher -nosplash -skipintro -name=$name \"-mod=$mods\"
 		exit
 	fi
 }
-
-fetch_mods(){
-	remote_mods=$(curl -s "$api" -H "Authorization: Bearer "$key"" -G -d filter[ids][whitelist]="$1" -d "sort=-players" \
-	| jq -r '.data[] .attributes .details .modIds[]')
+test_mod_page(){
+	steam steam://url/CommunityFilePage/498101407
+}
+test_browser(){
+	echo $BROWSER | zenity --text-info $sd_res
+}
+set_mode(){
+	if [[ $debug -eq 1 ]]; then
+		mode=DEBUG
+	else
+		mode=normal
+	fi
+}
+main_menu(){
+	while true; do
+	set_mode
+	sel=$(zenity --width=1280 --height=800 --list --title="DZGUI" --text="DZGUI $version $separator Mode: $mode $separator Fav: (not implemented)" --cancel-label="Exit" --ok-label="Select" --column="Select launch option" "${items[@]}" 2>/dev/null)
+	if [[ $? -eq 1 ]]; then
+		exit
+	elif [[ -z $sel ]]; then
+		warn "No item was selected."
+	elif [[ $sel == "Launch server list" ]]; then
+		query_api
+		parse_json <<< "$response"
+		msg="Retrieving server list. This may take some time.\nThis window will close automatically if left open."
+		launch_in_bg "create_array"
+		populate
+		return
+	elif [[ $sel == "Open mod page (TEST)" ]]; then
+		test_mod_page
+	elif [[ $sel == "List system browser (TEST)" ]]; then
+		test_browser
+	else
+		warn "This feature is not yet implemented."
+	fi
+	done
+}
+parse_json(){
+	list=$(jq -r '.data[] .attributes | "\(.name)\t\(.ip):\(.port)\t\(.players)/\(.maxPlayers)\t\(.status)\t\(.id)"')
+	echo -e "$list" > $tmp
 }
-#TODO: unimplemented
-#symlinks(){
-#	for d in "$workshop_dir"/*; do
-#		id=$(awk -F"= " '/publishedid/ {print $2}' "$d"/meta.cpp | awk -F\; '{print $1}')
-#		mod=$(awk -F\" '/name/ {print $2}' "$d"/meta.cpp | sed -E 's/[^[:alpha:]0-9]+/_/g; s/^_|_$//g')
-#		link="@$id-$mod"
-#		[[ -h "$game_dir/$link" ]] && : || 
-#			printf "[INFO] Creating symlink for $mod\n"
-#			ln -fs "$d" "$game_dir/$link"
-#	done
-#}
-
 check_ping(){
 		ping_ip=$(echo "$1" | awk -F'\t' '{print $2}' | awk -F: '{print $1}')
 		ms=$(ping -c 1 "$ping_ip" | awk -Ftime= '/time=/ {print $2}')
-		[[ -z $ms ]] && echo "Timeout" || echo "$ms"
+		if [[ -z $ms ]]; then
+			echo "Timeout"
+		else	
+			echo "$ms"
+		fi
+}
+populate(){
+	while true; do
+		#TODO: add boolean statement for ping flag; affects all column ordinal output
+		cols="--column="Server" --column="IP" --column="Players" --column="Status" --column="ID" --column="Ping""
+		sel=$(cat $tmp | zenity $sd_res --list $cols --separator=$separator --print-column=2,5 2>/dev/null)
+		if [[ $? -eq 1 ]]; then 
+			echo "should return to main menu"
+			#TODO: drop back to main menu
+			:
+		elif [[ -z $sel ]]; then
+			warn "No item was selected."
+		else
+			connect $sel
+			return
+		fi
+	done
 }
 create_array(){
 	list=$(cat $tmp) 
 	#TODO: improve error handling for null values
-	logger "Formatting output"
 	while read line; do
 		name=$(echo "$line" | awk -F'\t' '{print $1}')
+		#truncate names
 		if [[ $(echo "$name" | wc -m) -gt 30 ]]; then
 			name="$(echo $name | awk '{print substr($0,1,30) "..."}')"
 		else
@@ -111,133 +252,20 @@ create_array(){
 		ip=$(echo "$line" | awk -F'\t' '{print $2}')
 		players=$(echo "$line" | awk -F'\t' '{print $3}')
 		stat=$(echo "$line" | awk -F'\t' '{print $4}')
-		[[ $stat == "online" ]] && stat="<span color='#77ff33'>online</span>" || :
+		#yad only
+		#[[ $stat == "online" ]] && stat="<span color='#77ff33'>online</span>" || :
 		#TODO: probe offline return codes
 		id=$(echo "$line" | awk -F'\t' '{print $5}')
 		ping=$(check_ping "$line")
 		declare -g -a rows=("${rows[@]}" "$name" "$ip" "$players" "$stat" "$id" "$ping")
 	done <<< "$list"
-}
-
-parse_json(){
-	logger "Checking ping"
-	list=$(jq -r '.data[] .attributes | "\(.name)\t\(.ip):\(.port)\t\(.players)/\(.maxPlayers)\t\(.status)\t\(.id)"')
-	echo -e "$list" > $tmp
-}
-
-refresh(){
-	refresh_yad
-	placeholder
-
-	##
-	query_api
-	parse_json <<< "$response"
-	create_array
-	populate
-	##
-
-}
-refresh_yad(){
-	echo -e '\f' > $dzpipe
-}
-populate(){
-	logger "Writing data to pipe"
-	refresh_yad
-	echo "${rows[@]}" > $k.tmp
-	for f in "${rows[@]}"; do echo -e "$f"; done > $dzpipe
-}
-
-placeholder(){
-	echo "Fetching data..." > $dzpipe
-}
-cleanup(){
-	#while kill -0 $pid 2>/dev/null; do
-	#	:
-	#done
-	rm -f $dzpipe 
-	rm -f $tmp
-	unset -f check_ping
-	unset -f create_array
-	unset -f placeholder
-	unset -f populate
-	unset -f query_api
-	unset -f refresh
-	unset -f refresh_yad
-	#logger "Removing temp files"
-}
-
-export -f check_ping
-export -f create_array
-export -f placeholder
-export -f populate
-export -f query_api
-export -f refresh
-export -f refresh_yad
-
-
-printsel(){
-	#TODO: abstract configs
-yad --listen --cycle-read --align=center --separator="" --list --multiple --column="Server":TEXT \
-	--column="IP":TEXT --column="Players":TEXT --column="Status":TEXT --column="ID":TEXT --column="Ping":TEXT \
-	--buttons-layout=start --button=Cancel:1 --button=Connect:0 --buttons-layout=end --button="Refresh":"bash -c refresh" \
-	--text="DZGUI\t$version" --width=1200 --height=500 --separator="$separator" --center --no-escape 2>/dev/null < $dzpipe
-}
-connect(){
-	#TODO: validate inputs with standalone function
-	if [[ $? -eq 1 ]]; then 
-		kill $spid
-	else
-		if [[ -z $1 ]]; then
-			logger "Exiting with no selection"
-			kill $spid
-		else
-		ip=$(echo "$1" | awk -F"$separator" '{print $2}')
-		bid=$(echo "$1" | awk -F"$separator" '{print $5}')
-		logger "Connecting to $bid @ $ip"
-		fetch_mods "$bid"
-		launch
-
-		#TODO: symlink validation, mod validation
-		fi
-	fi
-}
-err(){
-	printf "[ERROR] %s\n" "$1"
-	cleanup
-	exit
-}
-varcheck(){
-	[[ -z $key ]] && (err "Missing API key")
-	[[ -z $whitelist ]] && (err "Missing server IDs")
-	[[ ! -d $workshop_dir ]] && (err "Malformed workshop path")
-	[[ ! -d $game_dir ]] && (err "Malformed game path")
-	[[ $whitelist =~ [[:space:]] ]] && (err "Separate whitelist values with commas")
-	IFS=,
-	[[ ! "${whitelist[*]}" =~ ${fav} ]] && (err "Fav key value not in whitelist")
-	unset IFS
-}
-checks() {
-	depcheck
-	varcheck
+	for i in "${rows[@]}"; do echo -e "$i"; done > $tmp
 }
 main(){
-	spid=$$
+	#TODO: check for upstream version and prompt to download
+	config
 	checks
-	refresh_yad
-	placeholder
-	connect "$(printsel)" &
-	pid=$!
-
-	###bundle these
-	query_api
-	parse_json <<< "$response"
-	create_array 
-	populate
-	###end bundle
-	wait $pid
-
+	main_menu
 }
 
 main
-
-