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 f65cd13aefb925ea7b613697a7d726c7cedadfb8..6aae2c3f69d5c4cf50481ccb35b7135b27a7b7f2 100644 (file)
--- a/xonstat/views/server.py
+++ b/xonstat/views/server.py
@@ -35,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
@@ -116,6 +117,7 @@ class ServerTopMaps(ServerInfoBase):
         return {
             "server_id": self.server_id,
             "top_maps": self.top_maps,
+            "lifetime": self.lifetime,
             "query": query,
         }
 
@@ -128,7 +130,10 @@ 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):
@@ -186,6 +191,7 @@ class ServerTopScorers(ServerInfoBase):
         return {
             "server_id": self.server_id,
             "top_scorers": top_scorers,
+            "lifetime": self.lifetime,
             "query": query,
         }
 
@@ -198,7 +204,10 @@ 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):
@@ -255,6 +264,7 @@ class ServerTopPlayers(ServerInfoBase):
         return {
             "server_id": self.server_id,
             "top_players": top_players,
+            "lifetime": self.lifetime,
             "query": query,
         }
 
@@ -267,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):