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

Pass modsize to helper

This commit is contained in:
aclist 2022-10-06 21:50:37 +09:00
parent 5037dab9e5
commit c2c907ac0a

View file

@ -173,6 +173,15 @@ steam_api="$steam_api"
#Terminal emulator #Terminal emulator
term="$term" term="$term"
<<<<<<< Updated upstream
=======
#Auto-install mods
auto_install="$auto_install"
#Automod staging directory
staging_dir="/tmp"
>>>>>>> Stashed changes
END END
} }
write_desktop_file(){ write_desktop_file(){
@ -360,11 +369,18 @@ set_term(){
source $config_file source $config_file
} }
sel_term(){ sel_term(){
<<<<<<< Updated upstream
#only terminals known to support -e flag #only terminals known to support -e flag
=======
>>>>>>> Stashed changes
if [[ $is_steam_deck -eq 1 ]]; then if [[ $is_steam_deck -eq 1 ]]; then
set_term konsole set_term konsole
return 0 return 0
fi fi
<<<<<<< Updated upstream
=======
#only terminals known to support -e flag
>>>>>>> Stashed changes
for i in "$TERMINAL" urxvt alacritty konsole gnome-terminal terminator xfce4-terminal xterm st tilix; do for i in "$TERMINAL" urxvt alacritty konsole gnome-terminal terminator xfce4-terminal xterm st tilix; do
[[ $(command -v $i) ]] && terms+=($i) [[ $(command -v $i) ]] && terms+=($i)
done done
@ -373,16 +389,24 @@ sel_term(){
term=$(echo "$terms" | zenity --list --column=Terminal --height=800 --width=1200 --text="Select your preferred terminal emulator to run steamcmd (setting will be saved)" --title=DZGUI) term=$(echo "$terms" | zenity --list --column=Terminal --height=800 --width=1200 --text="Select your preferred terminal emulator to run steamcmd (setting will be saved)" --title=DZGUI)
} }
auto_mod_install(){ auto_mod_install(){
<<<<<<< Updated upstream
# disksize=$(df $staging_dir --output=avail | tail -n1) # disksize=$(df $staging_dir --output=avail | tail -n1)
# bytewise=$((disksize * 1024)) # bytewise=$((disksize * 1024))
# hr=$(echo $(numfmt --to=iec --format "%8.1f" $bytewise $totalmodsize) | sed 's/ /\//') # hr=$(echo $(numfmt --to=iec --format "%8.1f" $bytewise $totalmodsize) | sed 's/ /\//')
# if [[ $totalmodsize -gt $bytewise ]]; then printf "[ERROR] Not enough space in /tmp to automatically stage mods: %s\n" $hr # if [[ $totalmodsize -gt $bytewise ]]; then printf "[ERROR] Not enough space in /tmp to automatically stage mods: %s\n" $hr
=======
[[ ! $auto_install -eq 1 ]] && return 1
>>>>>>> Stashed changes
cmd=$(printf "%q " "$@") cmd=$(printf "%q " "$@")
if [[ -z "$term" ]]; then if [[ -z "$term" ]]; then
sel_term && set_term "$term" sel_term && set_term "$term"
fi fi
echo "[DZGUI] Kicking off auto mod script" echo "[DZGUI] Kicking off auto mod script"
<<<<<<< Updated upstream
$term -e bash -c "/$helpers_path/scmd.sh $cmd" $term -e bash -c "/$helpers_path/scmd.sh $cmd"
=======
$term -e bash -c "/$helpers_path/scmd.sh $totalmodsize $cmd"
>>>>>>> Stashed changes
compare compare
if [[ -z $diff ]]; then if [[ -z $diff ]]; then
passed_mod_check > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null) passed_mod_check > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null)
@ -636,12 +660,19 @@ query_defunct(){
post(){ post(){
curl -s -X POST -H "Content-Type:application/x-www-form-urlencoded" -d "$(payload)" 'https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1/?format=json' curl -s -X POST -H "Content-Type:application/x-www-form-urlencoded" -d "$(payload)" 'https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1/?format=json'
} }
<<<<<<< Updated upstream
readarray -t newlist <<< $(post | jq -r '.[].publishedfiledetails[] | select(.result==1) .publishedfileid') readarray -t newlist <<< $(post | jq -r '.[].publishedfiledetails[] | select(.result==1) .publishedfileid')
#FIXME: #FIXME:
#result=$(post | jq -r '.[].publishedfiledetails[] | select(.result==1) | "\(.file_size) \(.publishedfileid)"') #result=$(post | jq -r '.[].publishedfiledetails[] | select(.result==1) | "\(.file_size) \(.publishedfileid)"')
#readarray -t newlist <<< $(echo -e "$result" | awk '{print $2}') #readarray -t newlist <<< $(echo -e "$result" | awk '{print $2}')
#totalmodsize=$(echo -e "$result" | awk '{s+=$1}END{print s}') #totalmodsize=$(echo -e "$result" | awk '{s+=$1}END{print s}')
#prompt to proceed anyway #prompt to proceed anyway
=======
result=$(post | jq -r '.[].publishedfiledetails[] | select(.result==1) | "\(.file_size) \(.publishedfileid)"')
totalmodsize=$(echo -e "$result" | awk '{s+=$1}END{print s}')
readarray -t newlist <<< $(echo -e "$result" | awk '{print $2}')
#readarray -t newlist <<< $(post | jq -r '.[].publishedfiledetails[] | select(.result==1) .publishedfileid')
>>>>>>> Stashed changes
} }
validate_mods(){ validate_mods(){
url="https://steamcommunity.com/sharedfiles/filedetails/?id=" url="https://steamcommunity.com/sharedfiles/filedetails/?id="
@ -840,10 +871,15 @@ generate_log(){
$(list_mods) $(list_mods)
DOC DOC
} }
toggle_automods(){
[[ $auto_install -eq 1 ]] && #print warning message about credentials etc.
:
}
debug_menu(){ debug_menu(){
debug_list=( debug_list=(
"Toggle branch" "Toggle branch"
"Generate debug log" "Generate debug log"
"Toggle auto-mod install"
) )
debug_sel=$(zenity --list --width=1280 --height=800 --column="Options" --title="DZGUI" --hide-header "${debug_list[@]}" 2>/dev/null) debug_sel=$(zenity --list --width=1280 --height=800 --column="Options" --title="DZGUI" --hide-header "${debug_list[@]}" 2>/dev/null)
if [[ $debug_sel == "${debug_list[0]}" ]]; then if [[ $debug_sel == "${debug_list[0]}" ]]; then
@ -856,6 +892,8 @@ debug_menu(){
generate_log > "$source_dir/log" generate_log > "$source_dir/log"
printf "[DZGUI] Wrote log file to %s/log\n" "$source_dir" printf "[DZGUI] Wrote log file to %s/log\n" "$source_dir"
zenity --info --width 500 --title="DZGUI" --text="Wrote log file to \n$source_dir/log" 2>/dev/null zenity --info --width 500 --title="DZGUI" --text="Wrote log file to \n$source_dir/log" 2>/dev/null
elif [[ $debug_sel == "${debug_list[2]}" ]]; then
toggle_automods
fi fi
} }
query_and_connect(){ query_and_connect(){