Made RedisLiveSettings and dependencies more pythonic

Author: splee

src/api/controller/ServerListController.py

@@ -1,23 +1,22 @@
-import tornado.ioloop
-import tornado.web
-import random
-
 from BaseController import BaseController
-from api.util.settings import RedisLiveSettings
+from api.util import settings
 
 class ServerListController(BaseController):
 
-	def get(self):       
-		serverList = self.ReadServerConfig()
-		servers = { "servers" : serverList }
-		self.write(servers)   
-		
+    def get(self):
+        servers = {"servers": self.read_server_config()}
+        self.write(servers)
 
-	def ReadServerConfig(self):
-		serverList = []
-		redisServers = RedisLiveSettings.GetRedisServers()	
+    def read_server_config(self):
+        """Returns a list of servers with the 'id' field added.
+        """
+        # TODO: Move this into the settings module so everything benefits.
+        server_list = []
+        redis_servers = settings.get_redis_servers()
 
-		for server in redisServers:			
-			serverList.append({ "server" : server["server"], "port" : server["port"] , "id" : server["server"] + ":" + `server["port"]` })
+        for server in redis_servers:
+            server_id = "%(server)s:%(port)s" % server
+            s = dict(server=server['server'], port=server['port'], id=server_id)
+            server_list.append(s)
 
-		return serverList
+        return server_list

src/api/util/settings.py

@@ -1,23 +1,19 @@
 import json
 
-class RedisLiveSettings(object):
+def get_settings():
+    """Parses the settings from redis-live.conf.
+    """
+    # TODO: Consider YAML. Human writable, machine readable.
+    return json.load(open("redis-live.conf"))
 
-	@staticmethod
-	def GetRedisServers():		
-		config = RedisLiveSettings.GetSettings()
-		return config["RedisServers"]				
+def get_redis_servers():
+    config = get_settings()
+    return config["RedisServers"]
 
-	@staticmethod
-	def GetRedisStatsServer():
-		config = RedisLiveSettings.GetSettings()
-		return config["RedisStatsServer"]
+def get_redis_stats_server():
+    config = get_settings()
+    return config["RedisStatsServer"]
 
-	@staticmethod
-	def GetSettings():
-		config = open("redis-live.conf")
-		return json.loads(config.read())
-
-	@staticmethod
-	def GetDataStoreType():
-		config = RedisLiveSettings.GetSettings()
-		return config["DataStoreType"]
+def get_data_store_type():
+    config = get_settings()
+    return config["DataStoreType"]

src/dataprovider/dataprovider.py

@@ -1,19 +1,22 @@
-#from sqliteprovider import RedisStatsProvider
-#from redisprovider import RedisStatsProvider
-
-from api.util.settings import RedisLiveSettings
+from api.util import settings
 import sqliteprovider
 import redisprovider
 
 
+# TODO: Confirm there's not some implementation detail I've missed, then
+# ditch the classes here.
 class RedisLiveDataProvider(object):
 
-	@staticmethod
-	def GetProvider():
-		dataStoreType = RedisLiveSettings.GetDataStoreType()
+    @staticmethod
+    def get_provider():
+        """Returns a data provider based on the settings file.
+
+        Valid providers are currently Redis and SQLite.
+        """
+        data_store_type = settings.get_data_store_type()
 
-		if dataStoreType=="redis":
-			return redisprovider.RedisStatsProvider()
-		else:
-			return sqliteprovider.RedisStatsProvider()			
-			
+        # FIXME: Should use a global variable for "redis" here.
+        if data_store_type == "redis":
+            return redisprovider.RedisStatsProvider()
+        else:
+            return sqliteprovider.RedisStatsProvider()