From b8d2f2ba37c967c3305eeea171f80eca4fdb462b Mon Sep 17 00:00:00 2001
From: Erik <erik.eriksson@yahoo.com>
Date: Fri, 25 Dec 2015 21:44:32 +0100
Subject: [PATCH] moved into sensor types

---
 .../components/sensor/systemmonitor.py        | 61 +++++++------------
 1 file changed, 21 insertions(+), 40 deletions(-)

diff --git a/homeassistant/components/sensor/systemmonitor.py b/homeassistant/components/sensor/systemmonitor.py
index 8e18979781e..32682b416e6 100644
--- a/homeassistant/components/sensor/systemmonitor.py
+++ b/homeassistant/components/sensor/systemmonitor.py
@@ -14,25 +14,25 @@ from homeassistant.const import STATE_ON, STATE_OFF
 
 REQUIREMENTS = ['psutil==3.2.2']
 SENSOR_TYPES = {
-    'disk_use_percent': ['Disk Use', '%'],
-    'disk_use': ['Disk Use', 'GiB'],
-    'disk_free': ['Disk Free', 'GiB'],
-    'memory_use_percent': ['RAM Use', '%'],
-    'memory_use': ['RAM Use', 'MiB'],
-    'memory_free': ['RAM Free', 'MiB'],
-    'processor_use': ['CPU Use', '%'],
-    'process': ['Process', ''],
-    'swap_use_percent': ['Swap Use', '%'],
-    'swap_use': ['Swap Use', 'GiB'],
-    'swap_free': ['Swap Free', 'GiB'],
-    'network_out': ['Sent', 'MiB'],
-    'network_in': ['Recieved', 'MiB'],
-    'packets_out': ['Packets sent', ''],
-    'packets_in': ['Packets recieved', ''],
-    'ipv4_address': ['IPv4 address', ''],
-    'ipv6_address': ['IPv6 address', ''],
-    'last_boot': ['Last Boot', ''],
-    'since_last_boot': ['Since Last Boot', '']
+    'disk_use_percent': ['Disk Use', '%', 'mdi:harddisk'],
+    'disk_use': ['Disk Use', 'GiB', 'mdi:harddisk'],
+    'disk_free': ['Disk Free', 'GiB', 'mdi:harddisk'],
+    'memory_use_percent': ['RAM Use', '%', 'mdi:memory'],
+    'memory_use': ['RAM Use', 'MiB', 'mdi:memory'],
+    'memory_free': ['RAM Free', 'MiB', 'mdi:memory'],
+    'processor_use': ['CPU Use', '%', 'mdi:memory'],
+    'process': ['Process', '', 'mdi:memory'],
+    'swap_use_percent': ['Swap Use', '%', 'mdi:harddisk'],
+    'swap_use': ['Swap Use', 'GiB', 'mdi:harddisk'],
+    'swap_free': ['Swap Free', 'GiB', 'mdi:harddisk'],
+    'network_out': ['Sent', 'MiB', 'mdi:server-network'],
+    'network_in': ['Recieved', 'MiB', 'mdi:server-network'],
+    'packets_out': ['Packets sent', '', 'mdi:server-network'],
+    'packets_in': ['Packets recieved', '', 'mdi:server-network'],
+    'ipv4_address': ['IPv4 address', '', 'mdi:server-network'],
+    'ipv6_address': ['IPv6 address', '', 'mdi:server-network'],
+    'last_boot': ['Last Boot', '', 'mdi:clock'],
+    'since_last_boot': ['Since Last Boot', '', 'mdi:clock']
 }
 
 _LOGGER = logging.getLogger(__name__)
@@ -71,27 +71,8 @@ class SystemMonitorSensor(Entity):
 
     @property
     def icon(self):
-        return {
-            'disk_use_percent': 'mdi:harddisk',
-            'disk_use': 'mdi:harddisk',
-            'disk_free': 'mdi:harddisk',
-            'memory_use_percent': 'mdi:memory',
-            'memory_use': 'mdi:memory',
-            'memory_free': 'mdi:memory',
-            'swap_use_percent': 'mdi:harddisk',
-            'swap_use': 'mdi:harddisk',
-            'swap_free': 'mdi:harddisk',
-            'processor_use': 'mdi:memory',
-            'process': 'mdi:memory',
-            'network_out': 'server:network',
-            'network_in': 'server:network',
-            'packets_out': 'server:network',
-            'packets_in': 'server:network',
-            'ipv4_address': 'server:network',
-            'ipv6_address': 'server:network',
-            'last_boot': 'mdi:clock',
-            'since_last_boot': 'mdi:clock' }.get(self.type)
-        
+        return SENSOR_TYPES[self.type]
+
     @property
     def state(self):
         """ Returns the state of the device. """