From 5d85cb8eb2db61236be4e51485506deff9674f3f Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Thu, 29 Jan 2015 05:34:19 -0800 Subject: [PATCH] project-disk-use.sh: include disk efficiency % for individual repos --- toolbox/reports/project-disk-use.sh | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/toolbox/reports/project-disk-use.sh b/toolbox/reports/project-disk-use.sh index b700c48..131e7ec 100755 --- a/toolbox/reports/project-disk-use.sh +++ b/toolbox/reports/project-disk-use.sh @@ -78,13 +78,26 @@ while IFS='' read -r proj; do is_listed_proj "$proj" || { x='!'; orphans="$(( $orphans + 1 ))"; } mirror=M [ -e "$proj.git/.nofetch" ] || mirror=m + usek="$(get_use_k "$proj.git")" repok="$(git --git-dir="$cfg_reporoot/$proj.git" config --get girocco.reposizek 2>/dev/null || :)" - case "$repok" in [0-9]*) repok="${repok%%[!0-9]*}";; *) repok=0;; esac + repokpct= + case "$repok" in + [0-9]*) + repok="${repok%%[!0-9]*}" + repokpct=$(( ( $repok * 100 + $usek / 2 ) / $usek )) + if [ $repokpct -le 100 ]; then + repokpct="$repokpct%" + else + repokpct="100+" + fi;; + *) + repok=0 + repokpct=-;; + esac ktotal=$(( $ktotal + $repok )) - usek="$(get_use_k "$proj.git")" total="$(( $total + $usek ))" howmany="$(( $howmany + 1 ))" - line="$usek $mirror $proj$x$nl" + line="$usek $repokpct $mirror $proj$x$nl" results="$results$line" done </dev/null) @@ -130,10 +143,10 @@ EOT echo "$message" echo "$message" | tr -c '\n' - echo "" - printf '%s' "$results" | sort -k1,1nr -k3,3 | \ - while read -r a b c; do - printf "%10s %s %s\n" "$(fmtcomma "$a")" "$b" "$c" + printf '%s' "$results" | sort -k1,1nr -k4,4 | \ + while read -r a b c d; do + printf "%10s %4s %s %s\n" "$(fmtcomma "$a")" "$b" "$c" "$d" done | \ - sed -e 's/ M / /' | $topn + sed -e 's/ [M-] / /g' | $topn fi } | eval "$domail" -- 2.11.4.GIT