From 67c3ad39908c58547580ac39e0b430368ad1c057 Mon Sep 17 00:00:00 2001 From: aclist Date: Fri, 30 Sep 2022 02:54:39 +0900 Subject: [PATCH] List total mod size --- changelog.md | 22 ++++++---------------- dzgui.sh | 16 +++++++++++----- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/changelog.md b/changelog.md index 1582555..a480181 100644 --- a/changelog.md +++ b/changelog.md @@ -5,16 +5,18 @@ - Custom query API - Standardize dialogs +## [2.7.0-rc.20] 2022-09-29 +### Added +- List total disk size used on mods list + ## [2.7.0-rc.19] 2022-09-26 ### Fixed - Strip text from "all maps" option in header - ## [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 @@ -53,30 +55,26 @@ - Add alternative IP query method ## [2.7.0-rc.8] 2022-09-15 -### Fixed +### Dropped - Drop Python dependency ## [2.7.0-rc.7] 2022-09-14 ### Added - Verify IP table checksums when starting - ### Changed - Switch to C for helper logic - ### Fixed - Error handling for obscure servers returning no modlist ## [2.7.0-rc.6] 2022-09-13 ### Added - Add number of maps found to map select menu - ### Fixed - Strip Unicode spaces in server titles ## [2.7.0-rc.5] 2022-09-13 ### Changed - Improve server distance algorithm - ### Fixed - Strip Unicode spaces in server titles @@ -158,16 +156,14 @@ - Prevent user from entering invalid entries on first-time setup - Prompt to re-run first-time setup if config is malformed - Better handling of field output from table - ### Added - Prototype .desktop file for Steam Deck - Generate bug report logs summarizing local settings - ### Dropped - Deprecated functions ## [2.4.0-rc.5] 2022-07-31 -### Changed +### Dropped - Drop download prompt for branch toggle ## [2.4.0-rc.4] 2022-07-31 @@ -192,11 +188,9 @@ - Backported DZTUI mod listing method (includes symlinks) - Backported DZTUI method of encoding symlinks when handling large number of mods - Write dry-run launch options to file when in debug mode - ### Fixed - Prevent garbage in dependency check messages - Send browser to background when opening links - ### Changed - Couple connect to fav and normal connect to same query function for maintainability - Revert to old issues page index @@ -255,7 +249,6 @@ - Update favorite server changes in real time - Add link to help pages from main menu - Add link to changelog from main menu - ### Changed - Don't require duplication of fav server in whitelist - More permissive truncation of long server names (50 char limit) @@ -263,7 +256,6 @@ - Reword errors for greater verbosity - Initial support of granular error handling for API response codes - Move extended path variables out of user config - ### Fixed - Check if mod dir is sane before listing mods - Prevent favorite server launch if none set @@ -303,9 +295,7 @@ - Connect: mod auto symlinks - New version download prompt - Additional visualization of progress/menus - ### Fixed - Menu recursion when navigating backwards - ### Changed - Reduced ping timeout interval diff --git a/dzgui.sh b/dzgui.sh index 089f88c..15826b1 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1,7 +1,7 @@ #!/bin/bash set -o pipefail -version=2.7.0-rc.19 +version=2.7.0-rc.20 aid=221100 game="dayz" @@ -710,7 +710,7 @@ populate(){ done } list_mods(){ - if [[ -z $(installed_mods) || -z $(find $workshop_dir -maxdepth 2 -name "*.cpp" | grep .cpp) ]]; then + if [[ -z $(installed_mods) ]] || [[ -z $(find $workshop_dir -maxdepth 2 -name "*.cpp" | grep .cpp) ]]; then zenity --info --text="94: No mods currently installed or incorrect path given" $sd_res 2>/dev/null else for d in $(find $game_dir/* -maxdepth 1 -type l); do @@ -776,7 +776,7 @@ debug_menu(){ debug_list=( "Toggle branch" "Generate debug log" - "Test option" + "Placeholder" ) 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 @@ -790,7 +790,7 @@ debug_menu(){ 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 elif [[ $debug_sel == "${debug_list[2]}" ]]; then - konsole -hold -e echo "test" + : fi } query_and_connect(){ @@ -1064,6 +1064,10 @@ server_browser(){ fi } +mods_disk_size(){ + printf "Total size on disk: %s" $(du -sh "$game_dir" | awk '{print $1}') +} + main_menu(){ print_news set_mode @@ -1095,7 +1099,9 @@ main_menu(){ elif [[ $sel == "${items[6]}" ]]; then server_browser elif [[ $sel == "${items[7]}" ]]; then - list_mods | sed 's/\t/\n/g' | zenity --list --column="Mod" --column="Symlink" --title="DZGUI" $sd_res --print-column="" 2>/dev/null + list_mods | sed 's/\t/\n/g' | zenity --list --column="Mod" --column="Symlink" \ + --title="DZGUI" $sd_res --text="$(mods_disk_size)" \ + --print-column="" 2>/dev/null elif [[ $sel == "${items[8]}" ]]; then toggle_debug main_menu