[gnome-battery-bench] gbb test: Add a --verbose option

[Owen Taylor <otaylor src gnome org>]

commit 9915faf8f12d241bcb32470f9d00dc5a6f66c31a
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Fri Jan 2 18:00:04 2015 -0500

    gbb test: Add a --verbose option
    
    Add a --verbose option for running tests that prints out the same output
    as 'gbb monitor' and enhance that output. Make 'gbb monitor' only start
    predicting battery life when AC is unplugged.

 docs/gbb.txt      |   10 +++++++---
 src/commandline.c |   45 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 10 deletions(-)
---
diff --git a/docs/gbb.txt b/docs/gbb.txt
index 1c95eb7..196601f 100644
--- a/docs/gbb.txt
+++ b/docs/gbb.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 'gbb play <filename>'
 'gbb play-local <filename>'
 'gbb record' [-o | --output <output file]
-'gbb test' [-o | --output <output file] [--duration <hours>h<minutes>m<seconds>s] [--min-battery <percent>] 
[--screen-brightness <percent>] <test-id>
+'gbb test' [-o | --output <output file] [--duration <hours>h<minutes>m<seconds>s] [--min-battery <percent>] 
[--screen-brightness <percent>] [-v | --verbose] <test-id>
 
 DESCRIPTION
 ------------
@@ -34,8 +34,9 @@ monitor
 
 'gbb monitor'
 
-Monitors the current battery usage, and prints statistics to standard out. This is a tool
-for developing gbb and isn't very useful.
+Monitors the current battery usage and and prints statistics to standard out. This is
+the same as 'gbb test --verbose' without actually running a test, and is mostly a tool
+for debugging the GNOME Battery Bench application code.
 
 play
 ~~~~
@@ -86,6 +87,9 @@ and in '~/.config/gnome-battery-bench/.tests'.
 --screen-brightness;;
         Sets the brightness of the backlight during the test
 
+--verbose;;
+        Print verbose statistics in the style of 'gbb monitor'
+
 Author
 ------
 Written by Owen Taylor <otaylor fishsoup net>.
diff --git a/src/commandline.c b/src/commandline.c
index 54133c1..c5fddd6 100644
--- a/src/commandline.c
+++ b/src/commandline.c
@@ -27,20 +27,42 @@
 static GbbPowerState *start_state;
 
 static void
-on_power_monitor_changed(GbbPowerMonitor *monitor)
+on_power_monitor_changed(GbbPowerMonitor *monitor,
+                         GbbTestRunner   *runner)
 {
-    if (start_state == NULL) {
-        start_state = gbb_power_state_copy(gbb_power_monitor_get_state(monitor));
-        return;
+    const GbbPowerState *state = gbb_power_monitor_get_state(monitor);
+
+    g_print("AC: %s\n", state->online ? "online" : "offline");
+    if (state->energy_now >= 0)
+        g_print("Energy: %.2f WH (%.2f%%)\n", state->energy_now, gbb_power_state_get_percent(state));
+    else if (state->charge_now >= 0)
+        g_print("Charge: %.2f AH (%.2f%%)\n", state->energy_now, gbb_power_state_get_percent(state));
+    else if (state->capacity_now >= 0)
+        g_print("Capacity: %.2f%%\n", gbb_power_state_get_percent(state));
+
+    if (runner != NULL) {
+        GbbTestRun *run = gbb_test_runner_get_run(runner);
+        const GbbPowerState *tmp = gbb_test_run_get_start_state(run);
+        if (tmp)
+            start_state = gbb_power_state_copy(tmp);
+    } else {
+        if (start_state == NULL) {
+            if (!state->online)
+                start_state = gbb_power_state_copy(state);
+
+            return;
+        }
     }
 
-    const GbbPowerState *state = gbb_power_monitor_get_state(monitor);
+    if (!start_state)
+        return;
+
     GbbPowerStatistics *statistics = gbb_power_statistics_compute(start_state, state);
 
     if (statistics->power >= 0)
-        g_print("Power: %.2f W\n", statistics->power);
+        g_print("Average power: %.2f W\n", statistics->power);
     if (statistics->current >= 0)
-        g_print("Current: %.2f A\n", statistics->current);
+        g_print("Average current: %.2f A\n", statistics->current);
     if (statistics->battery_life >= 0) {
         int h, m, s;
         break_time(statistics->battery_life, &h, &m, &s);
@@ -170,6 +192,7 @@ static char *test_duration;
 static int test_min_battery = -42;
 static int test_screen_brightness = 50;
 static char *test_output;
+static gboolean test_verbose;
 
 static GOptionEntry test_options[] =
 {
@@ -177,6 +200,7 @@ static GOptionEntry test_options[] =
     { "min-battery", 'm', 0, G_OPTION_ARG_INT, &test_duration, "", "PERCENT" },
     { "screen-brightness", 0, 0, G_OPTION_ARG_INT, &test_screen_brightness, "screen backlight brightness 
(0-100)", "PERCENT" },
     { "output", 'o', 0, G_OPTION_ARG_FILENAME, &test_output, "Output filename", "FILENAME" },
+    { "verbose", 'v', 0, G_OPTION_ARG_NONE, &test_verbose, "Show verbose statistics" },
     { NULL }
 };
 
@@ -351,6 +375,13 @@ test(int argc, char **argv)
                          G_CALLBACK(test_on_player_ready), runner);
     }
 
+    if (test_verbose) {
+        GbbPowerMonitor *monitor = gbb_test_runner_get_power_monitor(runner);
+        g_signal_connect(monitor, "changed",
+                         G_CALLBACK(on_power_monitor_changed), runner);
+        on_power_monitor_changed(monitor, runner);
+    }
+
     g_unix_signal_add(SIGINT, on_sigint, runner);
 
     GMainLoop *loop = g_main_loop_new (NULL, FALSE);