From 65744c434d1cdc84b1511018852da08b393455bb Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 30 Jun 2011 19:15:57 +0200
Subject: [PATCH] get a list of dicts with labels for server status

---
 telecaster/views.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/telecaster/views.py b/telecaster/views.py
index 76a52a9..52e5821 100644
--- a/telecaster/views.py
+++ b/telecaster/views.py
@@ -133,20 +133,21 @@ class Status(object):
         self.get_hosts()
     
     def to_dict(self):
-        status = {'acpi_state': {'class': 'default', 'value': self.acpi_states[self.acpi.charging_state()]}, 
-                  'acpi_percent': {'class': 'default', 'value': str(self.acpi.percent())}, 
-                  'temperature': {'class': 'default', 'value': self.temperature}, 
-                  'jack_state': {'class': 'default', 'value': self.jacking}, 
-                  'url': {'class': 'default', 'value': self.url}, 
-                  'ip': {'class': 'default', 'value': self.ip}, 
-                  'url': {'class': 'default', 'value': self.url}, 
-                  'casting': {'class': 'default', 'value': self.casting}, 
-                  'writing': {'class': 'default', 'value': self.writing},    
-                  }
+        status = [
+          {'id': 'acpi_state','class': 'default', 'value': self.acpi_states[self.acpi.charging_state()], 'label': 'Power'},  
+          {'id': 'acpi_percent', 'class': 'default', 'value': str(self.acpi.percent()), 'label': 'Battery Charge'}, 
+          {'id': 'temperature', 'class': 'default', 'value': self.temperature, 'label': 'Temperature'}, 
+          {'id': 'jack_state', 'class': 'default', 'value': self.jacking, 'label': 'Jack server'}, 
+          {'id': 'url', 'class': 'default', 'value': self.url, 'label': 'Name'}, 
+          {'id': 'ip', 'class': 'default', 'value': self.ip, 'label': 'IP address'},  
+          {'id': 'encoder_state','class': 'default', 'value': self.url, 'label': 'Encoder'}, 
+          {'id': 'casting', 'class': 'default', 'value': self.casting, 'label': 'Broadcasting'},  
+          {'id': 'writing', 'class': 'default', 'value': self.writing, 'label': 'Recording'},  
+          ]
                   
-        for key in status.keys():
-            if status[key]['value'] == False:
-                status[key]['class'] = 'warning'
+        for stat in status:
+            if stat['value'] == False:
+                stat['class'] = 'warning'
 
         return status
         
-- 
2.39.5