Merge lp:~injaon/indicator-sysmonitor/new_sensors into lp:indicator-sysmonitor/trunk

[Gabriel Lopez]

[Alex Eftimie (alexeftimie)]

review: Approve

=== modified file 'indicator-sysmonitor'
--- indicator-sysmonitor	2012-09-26 17:53:59 +0000
+++ indicator-sysmonitor	2012-10-16 20:22:18 +0000
@@ -21,7 +21,6 @@
 import subprocess
 import psutil as ps
 import re
-import gobject
 import gtk
 gtk.gdk.threads_init()
 import appindicator
@@ -29,7 +28,7 @@
 logging.basicConfig(file=sys.stderr, level=logging.INFO)
 
 B_UNITS = ['', 'KB', 'MB', 'GB', 'TB']
-VERSION = '0.5.0~unreleased'
+VERSION = '0.5.1~unreleased'
 HELP_MSG = """<span underline="single" size="x-large">{title}</span>
 
 {introduction}
@@ -47,16 +46,36 @@
 CPU {{cpu}} | MEM {{mem}} | root {{fs///}}
 """.format(
     title=_("Help Page"),
-    introduction=_("The sensors are the names of the devices you want to retrieve information from. They must be placed between brackets."),
+    introduction=_("The sensors are the names of the devices you want to \
+    retrieve information from. They must be placed between brackets."),
     basic=_("The basics are:"),
     cpu_desc=_("It shows the average of CPU usage."),
     mem_desc=_("It shows the physical memory in use."),
     bat_desc=_("It shows the available battery which id is %d."),
-    net_desc=_("It shows the amount of data you are downloading and uploading through your network."),
-    compose=_("Also there are the following sensors that are composed with two parts divided by two slashes."),
+    net_desc=_("It shows the amount of data you are downloading and uploading \
+    through your network."),
+    compose=_("Also there are the following sensors that are composed with \
+    two parts divided by two slashes."),
     fs_desc=_("Show available space in the file system."),
     example=_("Example:"))
 
+supported_sensors = re.compile("\A(mem|swap|cpu\d*|net|bat\d*|fs//.+)\Z")
+settings = {
+    'custom_text': 'cpu: {cpu} mem: {mem}',
+    'interval': 2,
+    'on_startup': False,
+    'sensors': {
+        # 'name' => (desc, cmd)
+        'cpu\d*': (_('Average CPU usage'), True),
+        'mem': (_('Physical memory in use.'), True),
+        'net': (_('Network activity.'), True),
+        'bat\d*': (_('Network activity.'), True),
+        'fs//.+': (_('Available space in file system.'), True),
+        "swap": (_("Average swap usage"), True)
+
+        }
+    }
+
 
 class ISMError(Exception):
     """General exception."""
@@ -72,25 +91,12 @@
     dialog.run()
     dialog.destroy()
 
-supported_sensors = re.compile("mem|cpu|net|bat\d+|fs//.+?")
-settings = {
-    'custom_text': 'cpu: {cpu} mem: {mem}',
-    'interval': 2,
-    'on_startup': False,
-    'sensors': {
-        # 'name' => (desc, cmd)
-        'cpu': (_('Average CPU usage'), True),
-        'mem': (_('Physical memory in use.'), True),
-        'net': (_('Network activity.'), True),
-        'bat\d+': (_('Network activity.'), True),
-        'fs//.+': (_('Available space in file system.'), True)
-        }
-    }
-
 
 class Sensor(object):
     """Singleton"""
     _instance = None
+    bat = re.compile("\Abat\d*\Z")
+    cpus = re.compile("\Acpu\d+\Z")
 
     def __init__(self):
         """It must not be called. Use Sensor.get_instace()
@@ -101,6 +107,16 @@
             Sensor._instance = self
         self.update_regex()
 
+    @staticmethod
+    def update_regex(names=None):
+        if names is None:
+            names = settings["sensors"].keys()
+
+        reg = '|'.join(names)
+        reg = "\A({})\Z".format(reg)
+        global supported_sensors
+        supported_sensors = re.compile("{}".format(reg))
+
     @classmethod
     def get_instance(cls):
         """Returns the unique instance of Sensor."""
@@ -114,6 +130,23 @@
         """Checks if the sensor name exists"""
         return bool(supported_sensors.match(name))
 
+    @staticmethod
+    def check(sensor):
+        if sensor.startswith("fs//"):
+            path = sensor.split("//")[1]
+            if not os.path.exists(path):
+                raise ISMError(_("Path: {} doesn't exists.").format(path))
+
+        elif Sensor.cpus.match(sensor):
+            nber = int(sensor[3:])
+            if nber >= ps.NUM_CPUS:
+                raise ISMError(_("Invalid number of CPU."))
+
+        elif Sensor.bat.match(sensor):
+            bat_id = int(sensor[3:]) if len(sensor) > 3 else 0
+            if bat_id >= len(os.listdir("/proc/acpi/battery/")):
+                raise ISMError(_("Invalid number of Batterry."))
+
     def add(self, name, desc, cmd):
         """Adds a custom sensors."""
         if Sensor.exists(name):
@@ -122,15 +155,6 @@
         settings["sensors"][name] = (desc, cmd)
         self.update_regex()
 
-    @staticmethod
-    def update_regex(names=None):
-        if names is None:
-            names = settings["sensors"].keys()
-
-        reg = '|'.join(names)
-        global supported_sensors
-        supported_sensors = re.compile("{}".format(reg))
-
     def delete(self, name):
         """Deletes a custom sensors."""
         sensors = settings['sensors']
@@ -176,7 +200,10 @@
         self._parent = parent
         self.last = ps.cpu_times()
 
-    def _fetch_cpu(self):
+    def _fetch_cpu(self, percpu=False):
+        if percpu:
+            return ps.cpu_percent(interval=0, percpu=True)
+
         last = self.last
         current = ps.cpu_times()
 
@@ -198,30 +225,61 @@
         else:
             return 0
 
+    def _fetch_swap(self):
+        """Return the swap usage in percent"""
+        usage = 0
+        total = 0
+        try:
+            with open("/proc/swaps") as swaps:
+                swaps.readline()
+                for line in swaps.readlines():
+                    dummy, dummy, total_, usage_, dummy = line.split()
+                    total += int(total_)
+                    usage += int(usage_)
+
+                return usage * 100 / total
+
+        except IOError:
+            return "N/A"
+
     def _fetch_mem(self):
-        """It gets the total memory info and return the used in percentaje."""
+        """It gets the total memory info and return the used in percent."""
         with open('/proc/meminfo') as meminfo:
             total = StatusFetcher.digit_regex.findall(meminfo.readline()).pop()
             free = StatusFetcher.digit_regex.findall(meminfo.readline()).pop()
             meminfo.readline()
-            cached = StatusFetcher.digit_regex.findall(meminfo.readline()).pop()
+            cached = StatusFetcher.digit_regex.findall(
+                meminfo.readline()).pop()
             free = int(free) + int(cached)
             return 100 - 100 * free / float(total)
 
-    def _fetch_bat(self, bat_id):
-        current_bat = subprocess.Popen(
-            "grep 'remaining capacity:' /proc/acpi/battery/BAT%s/state |awk '{print $3}' |grep [0-9] || echo 10" % bat_id,
-            stdout=subprocess.PIPE, shell=True).communicate()[0].strip()
-        #total_bat = subprocess.Popen("cat /proc/acpi/battery/BAT0/info |grep -i 'design capacity:' |awk '{print $3}'",
-        total_bat = subprocess.Popen(
-            "grep 'last full capacity:' /proc/acpi/battery/BAT%s/info | awk '{print $4}' |grep [0-9] || echo 65130" % bat_id,
-            stdout=subprocess.PIPE, shell=True).communicate()[0].strip()
-        return 100 * float(current_bat) / float(total_bat)
+    def _fetch_bat(self, batid):
+        """Fetch the the amount of remaining battery"""
+        try:
+            with open("/proc/acpi/battery/BAT{}/state".format(batid)) as state:
+                while True:
+                    line = state.readline()
+                    if "remaining capacity:" in line:
+                        remaining = int(line.split()[2])
+                        break
+
+            with open("/proc/acpi/battery/BAT{}/info".format(batid)) as info:
+                while True:
+                    line = info.readline()
+                    if "last full capacity" in line:
+                        capacity = int(line.split()[3])
+                        break
+
+        except IOError:
+            return "N/A"
+
+        return remaining * 100.0 / capacity
 
     def _fetch_net(self):
         """It use the command "ifstat" to know the total net usage"""
         total_net = subprocess.Popen(
-            "ifstat -a -n -q -S -T 0.5 1 | tail -1 | awk '{ printf(\"↓%dkB/s ↑%dkB/s\", $6, $7) }'",
+            "ifstat -a -n -q -S -T 0.5 1 | tail -1 | awk \
+            '{ printf(\"↓%dkB/s ↑%dkB/s\", $6, $7) }'",
             stdout=subprocess.PIPE, shell=True).communicate()[0].strip()
         return total_net
 
@@ -229,29 +287,33 @@
         """Return a dict whose element are the sensors
         and their values"""
         res = {}
-        for sensor in Preferences.sensors_regex.findall(settings["custom_text"]):
+        cpus = None
+        for sensor in Preferences.sensors_regex.findall(
+                settings["custom_text"]):
             sensor = sensor[1:-1]
-            if not Sensor.exists(sensor):
-                continue
             if sensor == 'cpu':
                 res['cpu'] = "{:02.0f}%".format(self._fetch_cpu())
+            elif Sensor.cpus.match(sensor):
+                if cpus is None:
+                    cpus = self._fetch_cpu(percpu=True)
+                res[sensor] = "{:02.0f}%".format(cpus[int(sensor[3:])])
+
             elif sensor == 'mem':
                 res['mem'] = '{:02.0f}%'.format(self._fetch_mem())
             elif sensor == 'net':
                 res['net'] = self._fetch_net()
 
-            elif sensor.startswith('bat'):
-                bat_id = sensor[4:]
-                try:
-                    bat_id = int(bat_id)
-                except:
-                    bat_id = 0
+            elif Sensor.bat.match(sensor):
+                bat_id = int(sensor[3:]) if len(sensor) > 3 else 0
                 res[sensor] = '{:02.0f}%'.format(self._fetch_bat(bat_id))
 
             elif sensor.startswith('fs//'):
                 parts = sensor.split('//')
                 res[sensor] = self._fetch_fs(parts[1])
 
+            elif sensor == "swap":
+                res[sensor] = '{:02.0f}%'.format(self._fetch_swap())
+
             else:  # custom sensor
                 res[sensor] = self._exec(settings["sensors"][sensor][1])
 
@@ -468,8 +530,8 @@
 
 class Preferences(gtk.Dialog):
     """It define the the Preferences Dialog and its operations."""
-    AUTOSTART_PATH = '{}/.config/autostart/indicator-sysmonitor.desktop'.format(
-        os.getenv("HOME"))
+    AUTOSTART_PATH = '{}/.config/autostart/indicator-sysmonitor.desktop'\
+      .format(os.getenv("HOME"))
     DESKTOP_PATH = '/usr/share/applications/indicator-sysmonitor.desktop'
     sensors_regex = re.compile("{.+?}")
 
@@ -477,16 +539,18 @@
         """It creates the widget of the dialogs"""
         gtk.Dialog.__init__(self)
         self.ind_parent = parent
-        self.connect('delete-event', self.on_cancel)
-        self.set_title(_('Preferences'))
-        self.resize(400, 350)
-        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
+        self.custom_entry = None
+        self.interval_entry = None
         self._create_content()
         self.set_data()
         self.show_all()
 
     def _create_content(self):
         """It creates the content for this dialog."""
+        self.connect('delete-event', self.on_cancel)
+        self.set_title(_('Preferences'))
+        self.resize(400, 350)
+        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
         notebook = gtk.Notebook()
         notebook.set_border_width(4)
 
@@ -504,10 +568,10 @@
         vbox.pack_start(hbox, expand=False, fill=False)
 
         hbox = gtk.HBox()
-        l = gtk.Label(
+        label = gtk.Label(
             _('This is indicator-sysmonitor version: {}').format(VERSION))
-        l.set_alignment(0.5, 0.5)
-        hbox.pack_start(l)
+        label.set_alignment(0.5, 0.5)
+        hbox.pack_start(label)
         vbox.pack_end(hbox)
         notebook.append_page(vbox, gtk.Label(_('General')))
         # }}}
@@ -587,14 +651,17 @@
         for sensor in sensors:
             sensor = sensor[1:-1]
             if not Sensor.exists(sensor):
-                raise ISMError(_("{} sensor not supported.").format(sensor))
+                raise ISMError(_("{{{}}} sensor not supported.").
+                               format(sensor))
+            # Check if the sensor is well-formed
+            Sensor.check(sensor)
 
         try:
             interval = float(self.interval_entry.get_text())
             if interval <= 0:
                 raise ISMError(_("Interval value is not valid."))
 
-        except ValueError, ex:
+        except ValueError:
             raise ISMError(_("Interval value is not valid."))
 
         settings["custom_text"] = custom_text
@@ -618,8 +685,8 @@
             try:
                 shutil.copy(Preferences.DESKTOP_PATH,
                             Preferences.AUTOSTART_PATH)
-            except Exception as e:
-                logging.exception(e)
+            except Exception, ex:
+                logging.exception(ex)
 
     def get_autostart(self):
         return os.path.exists(Preferences.AUTOSTART_PATH)
@@ -725,8 +792,8 @@
             Sensor.update_regex()
             self.update_indicator_guide()
 
-        except Exception as e:
-            logging.exception(e)
+        except Exception as ex:
+            logging.exception(ex)
             logging.error('Reading settings failed')
 
     @staticmethod
@@ -737,8 +804,8 @@
             with open(IndicatorSysmonitor.SETTINGS_FILE, 'w') as f:
                 f.write(json.dumps(settings))
 
-        except Exception as e:
-            logging.exception(e)
+        except Exception as ex:
+            logging.exception(ex)
             logging.error('Writting settings failed')
 
     # actions raised from menu
@@ -789,7 +856,7 @@
         self._help_dialog = None
 
 
-from optparse import OptionParser
+from optparse import OptionParser         # TODO: optparse is deprecated
 
 if __name__ == "__main__":
     parser = OptionParser("usage: %prog [options]", version="%prog " + VERSION)