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

feat: sort My Servers

Browse source
This commit is contained in:
aclist 2023-05-15 17:15:31 +09:00
parent ac49866749
commit 4058bfe383
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dzgui.sh
View file

@ -51,13 +51,13 @@ update_last_seen(){
source $config_file source $config_file
} }
check_news(){ check_news(){
echo "# Checking news"
[[ $branch == "stable" ]] && news_url="$stable_url/news" [[ $branch == "stable" ]] && news_url="$stable_url/news"
[[ $branch == "testing" ]] && news_url="$testing_url/news" [[ $branch == "testing" ]] && news_url="$testing_url/news"
result=$(curl -Ls "$news_url") result=$(curl -Ls "$news_url")
sum=$(echo -n "$result" | md5sum | awk '{print $1}') sum=$(echo -n "$result" | md5sum | awk '{print $1}')
} }
print_news(){ print_news(){
check_news
if [[ $sum == $seen_news || -z $result ]]; then if [[ $sum == $seen_news || -z $result ]]; then
hchar="" hchar=""
news="" news=""
@ -1316,7 +1316,6 @@ choose_filters(){
fi fi
[[ -z $sels ]] && return [[ -z $sels ]] && return
filters=$(echo "$sels" | sed 's/|/, /g;s/ (untick to select from map list)//') filters=$(echo "$sels" | sed 's/|/, /g;s/ (untick to select from map list)//')
echo "[DZGUI] Filters: $filters"
} }
get_dist(){ get_dist(){
local given_ip="$1" local given_ip="$1"
@ -1454,6 +1453,7 @@ server_browser(){
unset filters unset filters
unset search unset search
ret=98 ret=98
sd_res="--width=1280 --height=800"
return return
fi fi
local sel_ip=$(echo "$sel" | awk -F%% '{print $1}') local sel_ip=$(echo "$sel" | awk -F%% '{print $1}')
@ -1461,7 +1461,9 @@ server_browser(){
qport_list="$sel_ip%%$sel_port" qport_list="$sel_ip%%$sel_port"
if [[ -n "$sel_ip" ]]; then if [[ -n "$sel_ip" ]]; then
connect "$sel_ip" "ip" connect "$sel_ip" "ip"
sd_res="--width=1280 --height=800"
else else
sd_res="--width=1280 --height=800"
return return
fi fi
} }
@ -1588,7 +1590,7 @@ create_array(){
declare -g -a rows=("${rows[@]}" "$name" "$ip" "$players" "$time" "$stat" "$id" "$ping") declare -g -a rows=("${rows[@]}" "$name" "$ip" "$players" "$time" "$stat" "$id" "$ping")
fi fi
let lc++ let lc++
done < "$tmp" done < <(cat "$tmp" | sort -k1)
for i in "${rows[@]}"; do echo -e "$i"; done > $tmp for i in "${rows[@]}"; do echo -e "$i"; done > $tmp
} }
@ -1599,8 +1601,9 @@ set_fav(){
| jq -r '.data[] .attributes .name') | jq -r '.data[] .attributes .name')
if [[ -z $fav_label ]]; then if [[ -z $fav_label ]]; then
fav_label=null fav_label=null
else
fav_label="'$fav_label'"
fi fi
echo "[DZGUI] Setting favorite server to '$fav_label'"
} }
check_unmerged(){ check_unmerged(){
if [[ -f ${config_path}.unmerged ]]; then if [[ -f ${config_path}.unmerged ]]; then
@ -1714,7 +1717,6 @@ add_by_id(){
mv $config_file ${config_path}dztuirc.old mv $config_file ${config_path}dztuirc.old
nr=$(awk '/whitelist=/ {print NR}' ${config_path}dztuirc.old) nr=$(awk '/whitelist=/ {print NR}' ${config_path}dztuirc.old)
awk -v "var=$new_whitelist" -v "nr=$nr" 'NR==nr {$0=var}{print}' ${config_path}dztuirc.old > ${config_path}dztuirc awk -v "var=$new_whitelist" -v "nr=$nr" 'NR==nr {$0=var}{print}' ${config_path}dztuirc.old > ${config_path}dztuirc
echo "[DZGUI] Added $id to key 'whitelist'"
$steamsafe_zenity --info --title="DZGUI" --text="Added "$id" to:\n${config_path}dztuirc\nIf errors occur, you can restore the file:\n${config_path}dztuirc.old" --width=500 2>/dev/null $steamsafe_zenity --info --title="DZGUI" --text="Added "$id" to:\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 source $config_file
return return
@ -1847,6 +1849,7 @@ initial_setup(){
stale_symlinks stale_symlinks
init_items init_items
setup setup
check_news
echo "100" echo "100"
} }
main(){ main(){