Merge lp:~mdeslaur/indicator-power/fix-priorities into lp:indicator-power/15.10

[Marc Deslauriers]

Don't prioritize discharging items with no time estimate that have more
than 10% power remaining.

Devices with no time estimates are most likely low-power devices that
have long-lasting batteries, such as a mouse with AA batteries. For those
type of devices that contain batteries that last weeks, there is no value
in displaying their status in preference to devices that have a rapid
charge/discharge cycle.

However, there is value in knowing if the device has a battery that needs
replacing imminently, so only display it if it falls to a 10% charge or
under.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-power-ci/151/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM, this is a nice improvement.

You might want to ping mpt as a courtesy, this is the kind of detail that in the past he's documented at https://wiki.ubuntu.com/Power

review: Approve

[Matthew Paul Thomas (mpt)]

Does "prioritize" mean "show in the menu title"?

For a desktop PC connected to AC power with a wireless mouse, the mouse would be the only interesting thing in the menu. What would be the title of the menu when the mouse had >10% charge?

[Marc Deslauriers (mdeslaur)]

The priority determines what shows in the menu title, yes.

This doesn't remove it, it simply sets it with a lower priority than other devices. On a desktop PC with AC power and a wireless mouse, the mouse would be displayed at all times.

[Marc Deslauriers (mdeslaur)]

Oh, actually, let me check that.

[Marc Deslauriers (mdeslaur)]

@mpt: ah, yes, that scenario isn't properly handled. Thanks for spotting that, I'll prepare a new merge request.

Would this be a reasonable order?

   1. discharging items from least time remaining until most time remaining
   2. charging items from most time left to charge to least time left to charge
   3. charging items with an unknown time remaining
   4. discharging items with an unknown time remaining, but 10% or below
   5. batteries
   6. non-line power
   7. discharging items with an unknown time remaining, but above 10%
   8. line-power

[Marc Deslauriers (mdeslaur)]

The mouse should be shown in preference to a fully-charged UPS, so this would be better:

Would this be a reasonable order?

   1. discharging items from least time remaining until most time remaining
   2. charging items from most time left to charge to least time left to charge
   3. charging items with an unknown time remaining
   4. discharging items with an unknown time remaining, but 10% or below
   5. batteries
   6. discharging items with an unknown time remaining, but above 10%
   7. non-line power
   8. line-power

[Matthew Paul Thomas (mpt)]

Clarifying that language from our discussion on IRC:

   1. discharging things - from least time remaining, to most time remaining
   2. charging things - from most time left to charge, to least time left to charge
   3. charging things with unknown time remaining
   4. discharging things with unknown time remaining, 10% or less charge
   5. notebook batteries fully charged
   6. discharging things with unknown time remaining, more than 10% charge
   7. anything else fully charged

I still doubt that it's a good idea to judge things with unknown time remaining based on percentage. A quick Web search shows me people reporting their mouse battery lasting anywhere from "5 months or so" down to just "2-3 weeks". Someone who got used to the mouse icon showing up when they had 15 days left (10% * 5 months) would be unpleasantly surprised when a different mouse showed up with only 1.5 days warning (10% * 2 weeks).

Wherever it falls on that scale, though, upower has at least a week in which it can measure the decline and make an estimate of time remaining. If it is failing to make an estimate in that time, why is this not a bug in upower?

Unmerged revisions

289. By Marc Deslauriers on 2015-06-02

Don't prioritize discharging items with no time estimate that have more
than 10% power remaining.

Devices with no time estimates are most likely low-power devices that
have long-lasting batteries, such as a mouse with AA batteries. For those
type of devices that contain batteries that last weeks, there is no value
in displaying their status in preference to devices that have a rapid
charge/discharge cycle.

However, there is value in knowing if the device has a battery that needs
replacing imminently, so only display it if it falls to a 10% charge or
under.

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-22 17:54:53 +0000
+++ debian/changelog	2015-06-02 23:29:33 +0000
@@ -1,3 +1,10 @@
+indicator-power (12.10.6+15.10.20150522-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Don't prioritize discharging items with no time estimate that have more
+    than 10% power remaining.
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 02 Jun 2015 19:17:14 -0400
+
 indicator-power (12.10.6+15.10.20150522-0ubuntu1) wily; urgency=medium
 
   [ Charles Kerr ]

=== modified file 'src/service.c'
--- src/service.c	2015-05-14 21:53:02 +0000
+++ src/service.c	2015-06-02 23:29:33 +0000
@@ -164,8 +164,9 @@
    1. discharging items from least time remaining until most time remaining
    2. charging items from most time left to charge to least time left to charge
    3. charging items with an unknown time remaining
-   4. discharging items with an unknown time remaining
-   5. batteries, then non-line power, then line-power */
+   4. discharging items with an unknown time remaining, but 10% or below
+   5. batteries, then non-line power, then line-power
+   6. discharging items with an unknown time remaining, but above 10% */
 static gint
 device_compare_func (gconstpointer ga, gconstpointer gb)
 {
@@ -183,6 +184,14 @@
   ret = 0;
 
   state = UP_DEVICE_STATE_DISCHARGING;
+
+  /* discharging items with more than 10% remaining always lose */
+  if (!ret && (((a_state == state) && !a_time && (a_percentage > 10))))
+      ret = 1;
+
+  if (!ret && (((b_state == state) && !b_time && (b_percentage > 10))))
+      ret = -1;
+
   if (!ret && (((a_state == state) && a_time) ||
                ((b_state == state) && b_time)))
     {

=== modified file 'tests/test-device.cc'
--- tests/test-device.cc	2015-01-12 21:47:27 +0000
+++ tests/test-device.cc	2015-06-02 23:29:33 +0000
@@ -723,7 +723,9 @@
     { "/some/path/f0", UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_FULLY_CHARGED,  0, 100.0 }, // 6
     { "/some/path/m0", UP_DEVICE_KIND_MOUSE,      UP_DEVICE_STATE_DISCHARGING,   20,  80.0 }, // 7
     { "/some/path/m1", UP_DEVICE_KIND_MOUSE,      UP_DEVICE_STATE_FULLY_CHARGED,  0, 100.0 }, // 8
-    { "/some/path/pw", UP_DEVICE_KIND_LINE_POWER, UP_DEVICE_STATE_UNKNOWN,        0,   0.0 }  // 9
+    { "/some/path/pw", UP_DEVICE_KIND_LINE_POWER, UP_DEVICE_STATE_UNKNOWN,        0,   0.0 }, // 9
+    { "/some/path/m2", UP_DEVICE_KIND_MOUSE,      UP_DEVICE_STATE_DISCHARGING,    0,  80.0 }, // 10
+    { "/some/path/m3", UP_DEVICE_KIND_MOUSE,      UP_DEVICE_STATE_DISCHARGING,    0,   5.0 }, // 11
   };
 
   std::vector<IndicatorPowerDevice*> devices;
@@ -752,6 +754,10 @@
 
     { { 0, 7 }, descriptions[0] }, // 1 discharging battery, 1 discharging mouse. pick the one with the least time left.
     { { 2, 7 }, descriptions[7] }, // 1 discharging battery, 1 discharging mouse. pick the one with the least time left.
+    { { 2, 10 }, descriptions[2] }, // 1 discharging battery, 1 discharging mouse over 10% with no time estimate. pick the battery.
+    { { 6, 10 }, descriptions[6] }, // 1 fully charged battery, 1 discharging mouse over 10% with no time estimate. pick the battery.
+    { { 2, 11 }, descriptions[2] }, // 1 discharging battery with time estimate, 1 discharging mouse below 10% with no time estimate. prefer the device with the time estimate.
+    { { 6, 11 }, descriptions[11] }, // 1 fully charged battery, 1 discharging mouse below 10% with no time estimate. pick the mouse below 10%.
 
     { { 0, 8 }, descriptions[0] }, // 1 discharging battery, 1 fully-charged mouse. pick the one that's discharging.
     { { 6, 7 }, descriptions[7] }, // 1 discharging mouse, 1 fully-charged battery. pick the one that's discharging.