Compact output and improve readability

Author: dominikzalewski

lib.sh

@@ -175,23 +175,26 @@ savings_color() {
 
 report() {
   local db=$1 grouping=${2:-} filter rule='------------------------------------------------------------------'
-  local b='' r='' red='' amber='' green='' prefix bar pct c
+  local b='' r='' red='' amber='' green='' prefix bar pct c spct spi
   if [ -t 1 ]; then
     b=$'\e[1m'; r=$'\e[0m'
     red=$'\e[1;31m'; amber=$'\e[1;33m'; green=$'\e[1;32m'
   fi
   filter=$(grouping_filter "$grouping")
 
   printf 'period            : %s%s%s\n'                       "$b" "$(stat_period      "$db" "$filter")" "$r"
-  printf 'currency          : %s%s%s  (detected from invoices)\n' "$b" "$(stat_currency "$db" "$filter")" "$r"
+  printf 'currency          : %s%s%s\n' "$b" "$(stat_currency "$db" "$filter")" "$r"
   printf 'servers analysed  : %s%s%s\n'                       "$b" "$(stat_servers     "$db" "$filter")" "$r"
   printf 'price group       : %s%s%s\n'                       "$b" "$(account_price_group "$db")" "$r"
   printf 'total paid        : %s€%s%s\n'                      "$b" "$(stat_total_paid  "$db" "$filter")" "$r"
-  printf 'current run-rate  : %s€%s%s/mo (last invoice)\n'    "$b" "$(stat_run_rate    "$db" "$filter")" "$r"
+  printf 'current run-rate  : %s€%s%s/mo\n'    "$b" "$(stat_run_rate    "$db" "$filter")" "$r"
   printf '%s\n' "$rule"
-  printf 'picking the cheapest same-spec type each month would save : %s%s%%%s  (%s€%s%s)\n' \
-         "$b" "$(stat_savings_pct "$db" "$filter")" "$r" "$b" "$(stat_savings_amount "$db" "$filter")" "$r"
-  printf '  recoverable now : %s%s%%%s  (%s€%s%s)   ·   already lost : %s%s%%%s  (%s€%s%s)\n' \
+  spct=$(stat_savings_pct "$db" "$filter")
+  printf -v spi '%.0f' "$spct"
+  printf 'cheapest same-spec each month would save : %s%s%%%s  (%s€%s%s)\n' \
+         "$(savings_color "$spi" "$red" "$amber" "$green")" "$spct" "$r" \
+         "$b" "$(stat_savings_amount "$db" "$filter")" "$r"
+  printf 'avoidable : %s%s%%%s  (%s€%s%s)   ·   needed earlier action : %s%s%%%s  (%s€%s%s)\n' \
          "$b" "$(stat_recoverable_pct "$db" "$filter")" "$r" "$b" "$(stat_recoverable_amount "$db" "$filter")" "$r" \
          "$b" "$(stat_lost_pct "$db" "$filter")" "$r" "$b" "$(stat_lost_amount "$db" "$filter")" "$r"
   printf '%s\n' "$rule"

tests/integration.bats

@@ -83,15 +83,15 @@ need_data() {  # audit needs only local CSVs — no network, no credentials
   [ "$status" -eq 0 ]
   [[ "$output" =~ price\ group\ +:\ [a-z]+ ]]
   [[ "$output" =~ would\ save\ :\ [0-9]+\.[0-9]+% ]]
-  [[ "$output" =~ recoverable\ now\ :\ [0-9]+\.[0-9]+%.*already\ lost\ :\ [0-9]+\.[0-9]+% ]]
+  [[ "$output" =~ avoidable\ :\ [0-9]+\.[0-9]+%.*needed\ earlier\ action\ :\ [0-9]+\.[0-9]+% ]]
 }
 
 @test "audit runs the committed synthetic examples with no credentials or network" {
   DB="$BATS_TEST_TMPDIR/example.db" run "$ROOT/gelkao" -q audit "$ROOT/examples"
   [ "$status" -eq 0 ]
   [[ "$output" =~ price\ group\ +:\ eu ]]
   [[ "$output" =~ would\ save\ :\ 3[0-9]\.[0-9]+% ]]
-  [[ "$output" =~ recoverable\ now\ :\ [0-9]+\.[0-9]+%.*already\ lost\ :\ [0-9]+\.[0-9]+% ]]
+  [[ "$output" =~ avoidable\ :\ [0-9]+\.[0-9]+%.*needed\ earlier\ action\ :\ [0-9]+\.[0-9]+% ]]
 }
 
 @test "gelkao <cn> end-to-end downloads then reports a positive line count" {

tests/report.bats

@@ -141,12 +141,12 @@ locked_pair_db() {
   run audit "$a" "$d" "$BATS_TEST_TMPDIR/r3.db"
   [ "$status" -eq 0 ]
   [ "${lines[0]}" = "period            : 2025-11 .. 2025-11  (1 months)" ]
-  [ "${lines[1]}" = "currency          : EUR  (detected from invoices)" ]
+  [ "${lines[1]}" = "currency          : EUR" ]
   [ "${lines[2]}" = "servers analysed  : 1" ]
   [ "${lines[3]}" = "price group       : eu" ]
   [ "${lines[4]}" = "total paid        : €4.99" ]
-  [ "${lines[5]}" = "current run-rate  : €4.99/mo (last invoice)" ]
-  [ "${lines[7]}" = "picking the cheapest same-spec type each month would save : 24.0%  (€1)" ]
+  [ "${lines[5]}" = "current run-rate  : €4.99/mo" ]
+  [ "${lines[7]}" = "cheapest same-spec each month would save : 24.0%  (€1)" ]
   [[ "${lines[10]}" =~ ^2025-11[[:space:]]+paid[[:space:]]+5[[:space:]]+optimal[[:space:]]+4[[:space:]]+#+[[:space:]]+24%$ ]]
 }
 
@@ -168,11 +168,11 @@ locked_pair_db() {
   [[ "${lines[10]}" =~ [[:space:]]39%$ ]]
 }
 
-@test "the saving splits into still-recoverable and already-lost lines" {
+@test "the saving splits into avoidable and needed-earlier-action lines" {
   a="$BATS_TEST_TMPDIR/lps"; jun2026_assets "$a" 2026-06-15
   d="$BATS_TEST_TMPDIR/lpsd"; mkdir -p "$d"; jun2026_locked_pair_invoice "$d/i.csv"
   run audit "$a" "$d" "$BATS_TEST_TMPDIR/lps.db"
   [ "$status" -eq 0 ]
-  [[ "$output" =~ recoverable.*0\.0%.*\(€0\) ]]
-  [[ "$output" =~ lost.*13\.4%.*\(€2\) ]]
+  [[ "$output" =~ avoidable.*0\.0%.*\(€0\) ]]
+  [[ "$output" =~ earlier\ action.*13\.4%.*\(€2\) ]]
 }