Add lifetime value to all server top* HTML views.

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

diff --git a/xonstat/views/server.py b/xonstat/views/server.py
index 953d6b7f92584046c9c672e03e73220a64e00821..6aae2c3f69d5c4cf50481ccb35b7135b27a7b7f2 100644 (file)
--- a/xonstat/views/server.py
+++ b/xonstat/views/server.py
@@ -16,6 +16,7 @@ log = logging.getLogger(__name__)
 # Defaults
 LEADERBOARD_LIFETIME = 30
 LEADERBOARD_COUNT = 10
+INDEX_COUNT = 20
 RECENT_GAMES_COUNT = 20
 
 
@@ -34,7 +35,8 @@ class ServerIndex(object):
             server_q = DBSession.query(Server).order_by(Server.server_id.desc())
             servers = Page(server_q, self.page, items_per_page=25, url=page_url)
 
-        except:
+        except Exception as e:
+            log.debug(e)
             raise HTTPNotFound
 
         return servers
@@ -72,7 +74,7 @@ class ServerInfoBase(object):
 class ServerTopMaps(ServerInfoBase):
     """Returns the top maps played on a given server."""
 
-    def __init__(self, request, limit=LEADERBOARD_COUNT, last=None):
+    def __init__(self, request, limit=INDEX_COUNT, last=None):
         """Common parameter parsing."""
         super(ServerTopMaps, self).__init__(request, limit, last)
 
@@ -106,7 +108,18 @@ class ServerTopMaps(ServerInfoBase):
 
     def html(self):
         """Returns the HTML-ready representation."""
-        return self.top_maps
+
+        # build the query string
+        query = {}
+        if len(self.top_maps) > 1:
+            query['last'] = self.top_maps[-1].rank
+
+        return {
+            "server_id": self.server_id,
+            "top_maps": self.top_maps,
+            "lifetime": self.lifetime,
+            "query": query,
+        }
 
     def json(self):
         """For rendering this data using JSON."""
@@ -117,13 +130,16 @@ class ServerTopMaps(ServerInfoBase):
             "times_played": tm.times_played,
         } for tm in self.top_maps]
 
-        return top_maps
+        return {
+            "server_id": self.server_id,
+            "top_maps": top_maps,
+        }
 
 
 class ServerTopScorers(ServerInfoBase):
     """Returns the top scorers on a given server."""
 
-    def __init__(self, request, limit=LEADERBOARD_COUNT, last=None):
+    def __init__(self, request, limit=INDEX_COUNT, last=None):
         """Common parameter parsing."""
         super(ServerTopScorers, self).__init__(request, limit, last)
         self.top_scorers = self.raw()
@@ -166,7 +182,18 @@ class ServerTopScorers(ServerInfoBase):
 
         top_scorers = [TopScorer(ts.rank, ts.player_id, html_colors(ts.nick), ts.total_score)
                        for ts in self.top_scorers]
-        return top_scorers
+
+        # build the query string
+        query = {}
+        if len(top_scorers) > 1:
+            query['last'] = top_scorers[-1].rank
+
+        return {
+            "server_id": self.server_id,
+            "top_scorers": top_scorers,
+            "lifetime": self.lifetime,
+            "query": query,
+        }
 
     def json(self):
         """For rendering this data using JSON."""
@@ -177,13 +204,16 @@ class ServerTopScorers(ServerInfoBase):
             "score": ts.total_score,
         } for ts in self.top_scorers]
 
-        return top_scorers
+        return {
+            "server_id": self.server_id,
+            "top_scorers": top_scorers,
+        }
 
 
 class ServerTopPlayers(ServerInfoBase):
     """Returns the top players by playing time on a given server."""
 
-    def __init__(self, request, limit=LEADERBOARD_COUNT, last=None):
+    def __init__(self, request, limit=INDEX_COUNT, last=None):
         """Common parameter parsing."""
         super(ServerTopPlayers, self).__init__(request, limit, last)
         self.top_players = self.raw()
@@ -226,7 +256,17 @@ class ServerTopPlayers(ServerInfoBase):
         top_players = [TopPlayer(tp.rank, tp.player_id, html_colors(tp.nick), tp.alivetime)
                        for tp in self.top_players]
 
-        return top_players
+        # build the query string
+        query = {}
+        if len(top_players) > 1:
+            query['last'] = top_players[-1].rank
+
+        return {
+            "server_id": self.server_id,
+            "top_players": top_players,
+            "lifetime": self.lifetime,
+            "query": query,
+        }
 
     def json(self):
         """For rendering this data using JSON."""
@@ -237,7 +277,10 @@ class ServerTopPlayers(ServerInfoBase):
             "time": ts.alivetime.total_seconds(),
         } for ts in self.top_players]
 
-        return top_players
+        return {
+            "server_id": self.server_id,
+            "top_players": top_players,
+        }
 
 
 class ServerInfo(ServerInfoBase):
@@ -273,10 +316,11 @@ class ServerInfo(ServerInfoBase):
         """For rendering this data using something HTML-based."""
         return {
             'server': self.server,
-            'top_players': self.top_players_v.html(),
-            'top_scorers': self.top_scorers_v.html(),
-            'top_maps': self.top_maps_v.html(),
+            'top_players': self.top_players_v.html()["top_players"],
+            'top_scorers': self.top_scorers_v.html()["top_scorers"],
+            'top_maps': self.top_maps_v.html()["top_maps"],
             'recent_games': self.recent_games,
+            'lifetime': self.lifetime,
         }
 
     def json(self):