Merge lp:~charlesk/indicator-power/lp-1416096-publish-primary-device-state-on-bus into lp:indicator-power/rtm-14.09

[Charles Kerr]

Publish the primary device's state for on the bus.

Publish the primary device's state on the bus for the benefit of u-s-s.

Published as a string, eg "charging", "discharging", "empty", "full", "unknown". In the simple case of a device with a single battery, that battery's state is used. In more complex cases, the state of a virtual aggregated battery will be used as described in <https://wiki.ubuntu.com/Power#Handling_multiple_batteries>.

[Ken VanDine (ken-vandine)]

Looks great!

review: Approve

[lp:~charlesk/indicator-power/lp-1416096-publish-primary-device-state-on-bus]

273. By Charles Kerr on 2015-02-03

when a device can't be found, return 'unknown' rather than an empty string.

[Ted Gould (ted)]

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2014-10-14 19:07:50 +0000
+++ src/service.c	2015-02-03 16:26:09 +0000
@@ -115,6 +115,7 @@
   GSimpleActionGroup * actions;
   GSimpleAction * header_action;
   GSimpleAction * battery_level_action;
+  GSimpleAction * device_state_action;
   GSimpleAction * brightness_action;
 
   IndicatorPowerDevice * primary_device;
@@ -246,6 +247,74 @@
   return ret;
 }
 
+static const char*
+device_state_to_string(UpDeviceState device_state)
+{
+  const char * str;
+
+  switch (device_state)
+    {
+      case UP_DEVICE_STATE_CHARGING:
+        str = "charging";
+        break;
+
+      case UP_DEVICE_STATE_DISCHARGING:
+        str = "discharging";
+        break;
+
+      case UP_DEVICE_STATE_EMPTY:
+        str = "empty";
+        break;
+
+      case UP_DEVICE_STATE_FULLY_CHARGED:
+        str = "fully-charged";
+        break;
+
+      case UP_DEVICE_STATE_PENDING_CHARGE:
+        str = "pending-charge";
+        break;
+
+      case UP_DEVICE_STATE_PENDING_DISCHARGE:
+        str = "pending-discharge";
+        break;
+
+      default:
+        str = "unknown";
+        break;
+    }
+
+  return str;
+}
+
+static GVariant *
+calculate_device_state_action_state (IndicatorPowerService * self)
+{
+  const priv_t * const p = self->priv;
+  UpDeviceState device_state;
+
+  if (p->primary_device != NULL)
+    device_state = indicator_power_device_get_state(p->primary_device);
+  else
+    device_state = UP_DEVICE_STATE_UNKNOWN;
+
+  return g_variant_new_string(device_state_to_string(device_state));
+}
+
+static GVariant*
+calculate_battery_level_action_state (IndicatorPowerService * self)
+{
+  const priv_t * const p = self->priv;
+  guint32 battery_level;
+  
+  if (p->primary_device == NULL)
+    battery_level = 0;
+  else
+    battery_level = (guint32)(indicator_power_device_get_percentage (p->primary_device) + 0.5);
+
+  return g_variant_new_uint32 (battery_level);
+}
+
+
 /***
 ****
 ****  HEADER SECTION
@@ -786,11 +855,17 @@
   p->header_action = a;
 
   /* add the power-level action */
-  a = g_simple_action_new_stateful ("battery-level", NULL, g_variant_new_uint32(0));
+  a = g_simple_action_new_stateful ("battery-level", NULL, calculate_battery_level_action_state(self));
   g_simple_action_set_enabled (a, FALSE);
   g_action_map_add_action (G_ACTION_MAP(p->actions), G_ACTION(a));
   p->battery_level_action = a;
 
+  /* add the charge state action */
+  a = g_simple_action_new_stateful ("device-state", NULL, calculate_device_state_action_state(self));
+  g_simple_action_set_enabled (a, FALSE);
+  g_action_map_add_action (G_ACTION_MAP(p->actions), G_ACTION(a));
+  p->device_state_action = a;
+
   /* add the auto-brightness action */
   a = g_simple_action_new_stateful("auto-brightness", NULL, g_variant_new_boolean(FALSE));
   g_object_bind_property_full(p->brightness, "auto-brightness",
@@ -931,7 +1006,6 @@
 on_devices_changed (IndicatorPowerService * self)
 {
   priv_t * p = self->priv;
-  guint32 battery_level;
 
   /* update the device list */
   g_list_free_full (p->devices, (GDestroyNotify)g_object_unref);
@@ -948,11 +1022,10 @@
     indicator_power_notifier_set_battery (p->notifier, NULL);
 
   /* update the battery-level action's state */
-  if (p->primary_device == NULL)
-    battery_level = 0;
-  else
-    battery_level = (guint32)(indicator_power_device_get_percentage (p->primary_device) + 0.5);
-  g_simple_action_set_state (p->battery_level_action, g_variant_new_uint32 (battery_level));
+  g_simple_action_set_state (p->battery_level_action, calculate_battery_level_action_state(self));
+
+  /* update the device-state action's state */
+  g_simple_action_set_state (p->device_state_action, calculate_device_state_action_state(self));
 
   rebuild_now (self, SECTION_HEADER | SECTION_DEVICES);
 }