jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2024-12-29 13:52:03 +01:00
Code Issues Wiki Activity Actions

chore: stable backports

Browse source
This commit is contained in:
aclist 2023-01-19 20:20:30 +09:00
parent 442b0e543d
commit a35499e706
1 changed files with 53 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
dzgui.sh
View file

@ -69,7 +69,7 @@ print_news(){
} }
declare -A deps declare -A deps
deps=([awk]="5.1.1" [curl]="7.80.0" [jq]="1.6" [tr]="9.0" [$steamsafe_zenity]="3.42.1" [steam]="1.0.0") deps=([awk]="5.1.1" [curl]="7.80.0" [jq]="1.6" [tr]="9.0" [$steamsafe_zenity]="3.42.1")
changelog(){ changelog(){
if [[ $branch == "stable" ]]; then if [[ $branch == "stable" ]]; then
md="https://raw.githubusercontent.com/aclist/dztui/dzgui/changelog.md" md="https://raw.githubusercontent.com/aclist/dztui/dzgui/changelog.md"
@ -84,7 +84,7 @@ changelog(){
depcheck(){ depcheck(){
for dep in "${!deps[@]}"; do for dep in "${!deps[@]}"; do
command -v $dep 2>&1>/dev/null || (printf "Requires %s >=%s\n" $dep ${deps[$dep]}; exit 1) command -v "$dep" 2>&1>/dev/null || (printf "Requires %s >=%s\n" "$dep" ${deps[$dep]}; exit 1)
done done
} }
watcher_deps(){ watcher_deps(){
@ -340,7 +340,7 @@ steam_deck_mods(){
rc=$? rc=$?
if [[ $rc -eq 0 ]]; then if [[ $rc -eq 0 ]]; then
echo "[DZGUI] Opening ${workshop}$next" echo "[DZGUI] Opening ${workshop}$next"
steam steam://url/CommunityFilePage/$next 2>/dev/null & "$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 $steamsafe_zenity --info --title="DZGUI" --ok-label="Next" --text="Click [Next] to continue mod check." --width=500 2>/dev/null
else else
return 1 return 1
@ -380,7 +380,7 @@ manual_mod_install(){
[[ -f $ex ]] && return 1 [[ -f $ex ]] && return 1
local downloads_dir="$steam_path/steamapps/workshop/downloads/$aid" local downloads_dir="$steam_path/steamapps/workshop/downloads/$aid"
local workshop_dir="$steam_path/steamapps/workshop/content/$aid" local workshop_dir="$steam_path/steamapps/workshop/content/$aid"
steam "steam://url/CommunityFilePage/${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." 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 sleep 1s
foreground foreground
@ -467,12 +467,12 @@ auto_mod_install(){
[[ -f "/tmp/dz.status" ]] && rm "/tmp/dz.status" [[ -f "/tmp/dz.status" ]] && rm "/tmp/dz.status"
touch "/tmp/dz.status" touch "/tmp/dz.status"
console_dl "$diff" && console_dl "$diff" &&
steam steam://open/downloads && 2>/dev/null 1>&2 "$steam_cmd" steam://open/downloads && 2>/dev/null 1>&2
until [[ -z $(comm -23 <(printf "%s\n" "${modids[@]}" | sort) <(ls -1 $workshop_dir | sort)) ]]; do
win=$(xdotool search --name "DZG Watcher") win=$(xdotool search --name "DZG Watcher")
[[ ! $(xdotool getwindowfocus) -eq $win ]] && xdotool windowactivate $win xdotool windowactivate $win
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) local missing=$(comm -23 <(printf "%s\n" "${modids[@]}" | sort) <(ls -1 $workshop_dir | sort) | wc -l)
echo "# Downloaded $((${#modids[@]}-missing)) of ${#modids[@]} mods" 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 done | $steamsafe_zenity --pulsate --progress --title="DZG Watcher" --auto-close --no-cancel --width=500 2>/dev/null
compare compare
[[ $force_update -eq 1 ]] && { unset force_update; return; } [[ $force_update -eq 1 ]] && { unset force_update; return; }
@ -512,6 +512,7 @@ update_stamps(){
check_timestamps(){ check_timestamps(){
readarray -t local_modlist < <(ls -1 $workshop_dir) readarray -t local_modlist < <(ls -1 $workshop_dir)
max=${#local_modlist[@]} max=${#local_modlist[@]}
[[ $max -eq 0 ]] && return
readarray -t stamps < <(get_local_stamps | jq -r '.response.publishedfiledetails[].time_updated') readarray -t stamps < <(get_local_stamps | jq -r '.response.publishedfiledetails[].time_updated')
if [[ ! -f $version_file ]]; then if [[ ! -f $version_file ]]; then
update_stamps update_stamps
@ -543,7 +544,7 @@ merge_modlists(){
elif [[ -n "$diff" ]] && [[ ${#needs_update[@]} -eq 0 ]]; then elif [[ -n "$diff" ]] && [[ ${#needs_update[@]} -eq 0 ]]; then
: :
else else
diff="$(echo -e "$diff\n${needs_update[@]}")" diff="$(printf "%s\n%s\n" "$diff" "${needs_update[@]}")"
fi fi
[[ $force_update -eq 1 ]] && echo "100" [[ $force_update -eq 1 ]] && echo "100"
} }
@ -1017,12 +1018,13 @@ console_dl(){
#https://github.com/jordansissel/xdotool/issues/67 #https://github.com/jordansissel/xdotool/issues/67
#https://dwm.suckless.org/patches/current_desktop/ #https://dwm.suckless.org/patches/current_desktop/
local wid=$(xdotool search --onlyvisible --name Steam) local wid=$(xdotool search --onlyvisible --name Steam)
xdotool windowactivate $wid #xdotool windowactivate $wid
sleep 1.5s
for i in "${modids[@]}"; do for i in "${modids[@]}"; do
xdotool type --delay 15 --window $wid "workshop_download_item $aid $i" xdotool type --delay 0 "workshop_download_item $aid $i"
sleep 0.2s sleep 0.5s
xdotool key --window $wid Return xdotool key --window $wid Return
sleep 0.2s sleep 0.5s
done done
} }
find_default_path(){ find_default_path(){
@ -1064,6 +1066,8 @@ popup(){
400) pop "Automod install enabled. Auto-downloaded mods will not appear\nin your Steam Workshop subscriptions, but DZGUI will\ntrack the version number of downloaded mods internally\nand trigger an update if necessary." ;; 400) pop "Automod install enabled. Auto-downloaded mods will not appear\nin your Steam Workshop subscriptions, but DZGUI will\ntrack the version number of downloaded mods internally\nand trigger an update if necessary." ;;
500) pop "Automod install disabled.\nSwitched to manual mode." ;; 500) pop "Automod install disabled.\nSwitched to manual mode." ;;
600) pop "No preferred servers set." ;; 600) pop "No preferred servers set." ;;
700) pop "Toggled to Flatpak Steam." ;;
800) pop "Toggled to native Steam." ;;
esac esac
} }
toggle_console_dl(){ toggle_console_dl(){
@ -1090,6 +1094,17 @@ force_update_mods(){
mv /tmp/versions $version_file mv /tmp/versions $version_file
fi fi
} }
toggle_steam_binary(){
case $steam_cmd in
steam)
steam_cmd=xdg-open
popup 700
;;
xdg-open)
steam_cmd=steam
popup 800;;
esac
}
options_menu(){ options_menu(){
case "$auto_install" in case "$auto_install" in
0|1|"") auto_hr="OFF"; ;; 0|1|"") auto_hr="OFF"; ;;
@ -1103,6 +1118,11 @@ options_menu(){
) )
#TODO: tech debt: drop old flags #TODO: tech debt: drop old flags
[[ $auto_install -eq 2 ]] || [[ $auto_install -eq 1 ]] && debug_list+=("Force update local mods") [[ $auto_install -eq 2 ]] || [[ $auto_install -eq 1 ]] && debug_list+=("Force update local mods")
case $steam_cmd in
steam) steam_hr=Steam ;;
xdg-open) steam_hr=Flatpak ;;
esac
[[ $toggle_steam -eq 1 ]] && debug_list+=("Toggle native Steam or Flatpak [$steam_hr]")
debug_sel=$($steamsafe_zenity --list --width=1280 --height=800 --column="Options" --title="DZGUI" --hide-header "${debug_list[@]}" 2>/dev/null) debug_sel=$($steamsafe_zenity --list --width=1280 --height=800 --column="Options" --title="DZGUI" --hide-header "${debug_list[@]}" 2>/dev/null)
[[ -z $debug_sel ]] && return [[ -z $debug_sel ]] && return
if [[ $debug_sel == "${debug_list[0]}" ]]; then if [[ $debug_sel == "${debug_list[0]}" ]]; then
@ -1124,6 +1144,8 @@ options_menu(){
force_update_mods force_update_mods
merge_modlists > >($steamsafe_zenity --pulsate --progress --no-cancel --auto-close --title=DZGUI --width=500 2>/dev/null) merge_modlists > >($steamsafe_zenity --pulsate --progress --no-cancel --auto-close --title=DZGUI --width=500 2>/dev/null)
auto_mod_install auto_mod_install
elif [[ $debug_sel == "${debug_list[5]}" ]]; then
toggle_steam_binary
fi fi
} }
query_and_connect(){ query_and_connect(){
@ -1746,10 +1768,27 @@ fetch_helpers(){
mkdir -p "$helpers_path" mkdir -p "$helpers_path"
[[ ! -f "$helpers_path/vdf2json.py" ]] && curl -Ls "$vdf2json_url" > "$helpers_path/vdf2json.py" [[ ! -f "$helpers_path/vdf2json.py" ]] && curl -Ls "$vdf2json_url" > "$helpers_path/vdf2json.py"
} }
steam_deps(){
local flatpak steam
flatpak=$(flatpak run com.valvesoftware.Steam --version 2>/dev/null)
steam=$(command -v steam)
if [[ -z "$steam" ]] && [[ -z "$flatpak" ]]; then
warn "Requires Steam or Flatpak Steam"
exit
elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then
toggle_steam=1
steam_cmd="steam"
elif [[ -n "$steam" ]]; then
steam_cmd="steam"
else
steam_cmd="xdg-open"
fi
}
initial_setup(){ initial_setup(){
echo "# Initial setup" echo "# Initial setup"
run_depcheck run_depcheck
watcher_deps watcher_deps
steam_deps
check_architecture check_architecture
check_version check_version
check_map_count check_map_count