Correct a bug on the Sensor plugin

glances/plugins/glances_alert.py

@@ -20,6 +20,7 @@
 """Alert plugin."""
 
 # Import system lib
+import types
 from datetime import datetime
 
 # Import Glances libs
@@ -104,7 +105,7 @@ class Plugin(GlancesPlugin):
                     msg = str(alert[3])
                     ret.append(self.curse_add_line(msg, decoration=alert[2]))
                 # Min / Mean / Max
-                if alert[6] == alert[4]:
+                if self.approx_equal(alert[6], alert[4], tolerance=0.1):
                     msg = ' ({0:.1f})'.format(alert[5])
                 else:
                     msg = _(" (Min:{0:.1f} Mean:{1:.1f} Max:{2:.1f})").format(alert[6], alert[5], alert[4])
@@ -119,3 +120,13 @@ class Plugin(GlancesPlugin):
                 # ret.append(self.curse_add_line(msg))
 
         return ret
+
+    def approx_equal(self, a, b, tolerance=0.0):
+        """
+        Compare a with b using the tolerance (if numerical)
+        """
+        numericalType = [types.IntType, types.FloatType, types.LongType]
+        if type(a) in numericalType and type(b) in numericalType:
+            return abs(a-b) <= max(abs(a), abs(b)) * tolerance
+        else:
+            return a == b

glances/plugins/glances_batpercent.py

@@ -90,12 +90,7 @@ class GlancesGrabBat(object):
     def update(self):
         """Update the stats."""
         if self.initok:
-            reply = self.bat.update()
-            if reply is not None:
-                self.bat_list = []
-                new_item = {'label': _("Battery (%)"),
-                            'value': self.getcapacitypercent()}
-                self.bat_list.append(new_item)
+            self.bat_list = [{'label': _("Battery (%)"), 'value': self.getcapacitypercent()}]
         else:
             self.bat_list = []
 
@@ -108,15 +103,14 @@ class GlancesGrabBat(object):
         if not self.initok or self.bat.stat == []:
             return []
 
-        # Init the bsum (sum of percent) and bcpt (number of batteries)
+        # Init the bsum (sum of percent)
         # and Loop over batteries (yes a computer could have more than 1 battery)
         bsum = 0
-        for bcpt in range(len(self.bat.stat)):
+        for b in self.bat.stat:
             try:
-                bsum = bsum + int(self.bat.stat[bcpt].capacity)
+                bsum = bsum + int(b.capacity)
             except ValueError:
                 return []
-            bcpt = bcpt + 1
 
         # Return the global percent
-        return int(bsum / bcpt)
+        return int(bsum / len(self.bat.stat))