Add separate views for the top servers on a map.

[xonotic/xonstat.git] / xonstat / views / server.py

diff --git a/xonstat/views/server.py b/xonstat/views/server.py
index 89d512be6d5212b9d8b4b42a49c05e3a3028cdbd..929517fd9496626077cdf9d419b26d06db446776 100644 (file)
--- a/xonstat/views/server.py
+++ b/xonstat/views/server.py
@@ -27,12 +27,14 @@ class ServerIndex(object):
         """Common parameter parsing."""
         self.request = request
         self.page = request.params.get("page", 1)
-        self.servers = self.raw()
+        self.servers = self.server_index()
 
-    def raw(self):
+    def server_index(self):
         """Returns the raw data shared by all renderers."""
         try:
-            server_q = DBSession.query(Server).order_by(Server.server_id.desc())
+            server_q = DBSession.query(Server)\
+                .filter(Server.active_ind)\
+                .order_by(Server.server_id.desc())
             servers = Page(server_q, self.page, items_per_page=25, url=page_url)
 
         except Exception as e:
@@ -78,9 +80,9 @@ class ServerTopMaps(ServerInfoBase):
         """Common parameter parsing."""
         super(ServerTopMaps, self).__init__(request, limit, last)
 
-        self.top_maps = self.raw()
+        self.top_maps = self.top_maps()
 
-    def raw(self):
+    def top_maps(self):
         """Returns the raw data shared by all renderers."""
         try:
             top_maps_q = DBSession.query(
@@ -142,9 +144,9 @@ class ServerTopScorers(ServerInfoBase):
     def __init__(self, request, limit=INDEX_COUNT, last=None):
         """Common parameter parsing."""
         super(ServerTopScorers, self).__init__(request, limit, last)
-        self.top_scorers = self.raw()
+        self.top_scorers = self.top_scorers()
 
-    def raw(self):
+    def top_scorers(self):
         """Top scorers on this server by total score."""
         try:
             top_scorers_q = DBSession.query(
@@ -216,9 +218,9 @@ class ServerTopPlayers(ServerInfoBase):
     def __init__(self, request, limit=INDEX_COUNT, last=None):
         """Common parameter parsing."""
         super(ServerTopPlayers, self).__init__(request, limit, last)
-        self.top_players = self.raw()
+        self.top_players = self.top_players()
 
-    def raw(self):
+    def top_players(self):
         """Top players on this server by total playing time."""
         try:
             top_players_q = DBSession.query(
@@ -292,7 +294,11 @@ class ServerInfo(ServerInfoBase):
 
         # this view uses data from other views, so we'll save the data at that level
         try:
-            self.server = DBSession.query(Server).filter_by(server_id=self.server_id).one()
+            self.server = DBSession.query(Server)\
+                .filter(Server.active_ind)\
+                .filter(Server.server_id == self.server_id)\
+                .one()
+
             self.top_maps_v = ServerTopMaps(self.request, limit=LEADERBOARD_COUNT)
             self.top_scorers_v = ServerTopScorers(self.request, limit=LEADERBOARD_COUNT)
             self.top_players_v = ServerTopPlayers(self.request, limit=LEADERBOARD_COUNT)