X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2F__init__.py;h=d3a6d98a5ca8e1e07d1fe185658c06bbe583acd2;hb=1039495b9bdc262055b315f60f49167bd300b13b;hp=7c4593c1e9910b95f5891a532572d5a1a95fd5e9;hpb=ca0cb9c524182097fa818c79a3884c88499b628e;p=xonotic%2Fxonstat.git

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 7c4593c..d3a6d98 100755
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -1,4 +1,3 @@
-import pyramid_jinja2
 import sqlahelper
 from pyramid.config import Configurator
 from sqlalchemy import engine_from_config
@@ -17,8 +16,6 @@ def main(global_config, **settings):
 
     config = Configurator(settings=settings)
 
-    config.add_renderer('.jinja2', pyramid_jinja2.renderer_factory)
-
     config.add_static_view('static', 'xonstat:static')
 
     # ROOT ROUTE
@@ -26,20 +23,16 @@ def main(global_config, **settings):
     config.add_view(main_index, route_name="main_index",
         renderer="main_index.mako")
 
+    # MAIN SUBMISSION ROUTE
+    config.add_route("stats_submit", "stats/submit")
+    config.add_view(stats_submit, route_name="stats_submit")
+
     # PLAYER ROUTES
-    config.add_route("player_game_index_default",
+    config.add_route("player_game_index",
             "/player/{player_id:\d+}/games")
-    config.add_view(player_game_index, route_name="player_game_index_default",
+    config.add_view(player_game_index, route_name="player_game_index",
         renderer="player_game_index.mako")
 
-    config.add_route("player_game_index",
-            "/player/{player_id:\d+}/games/page/{page:\d+}")
-    config.add_view(player_game_index, renderer="player_game_index.mako")
-
-    config.add_route("player_index_paged", "/players/page/{page:\d+}")
-    config.add_view(player_index, route_name="player_index_paged",
-        renderer="player_index.mako")
-
     config.add_route("player_index", "/players")
     config.add_view(player_index, route_name="player_index",
         renderer="player_index.mako")
@@ -48,24 +41,24 @@ def main(global_config, **settings):
     config.add_view(player_info, route_name="player_info",
         renderer="player_info.mako")
 
+    config.add_route("player_accuracy", "/player/{id:\d+}/accuracy")
+    config.add_view(player_accuracy, route_name="player_accuracy",
+        renderer="json")
+
     # GAME ROUTES
     config.add_route("game_index", "/games")
     config.add_view(game_index, route_name="game_index",
         renderer="game_index.mako")
 
-    config.add_route("game_index_paged", "/games/page/{page:\d+}")
-    config.add_view(game_index, route_name="game_index_paged",
-        renderer="game_index.mako")
-
     config.add_route("game_info", "/game/{id:\d+}")
     config.add_view(game_info, route_name="game_info",
         renderer="game_info.mako")
 
-    # SERVER ROUTES
-    config.add_route("server_index_paged", "/servers/page/{page:\d+}")
-    config.add_view(server_index, route_name="server_index_paged",
-        renderer="server_index.mako")
+    config.add_route("rank_index", "/ranks/{game_type_cd:ctf|dm|tdm|duel}")
+    config.add_view(rank_index, route_name="rank_index",
+        renderer="rank_index.mako")
 
+    # SERVER ROUTES
     config.add_route("server_index", "/servers")
     config.add_view(server_index, route_name="server_index",
         renderer="server_index.mako")
@@ -80,9 +73,9 @@ def main(global_config, **settings):
         renderer="server_info.mako")
 
     # MAP ROUTES
-    config.add_route("map_index_paged", "/maps/page/{page:\d+}")
-    config.add_view(map_index, route_name="map_index_paged",
-        renderer="map_index.mako")
+    config.add_route("map_index_json", "/maps.json")
+    config.add_view(map_index_json, route_name="map_index_json",
+        renderer="json")
 
     config.add_route("map_index", "/maps")
     config.add_view(map_index, route_name="map_index",
@@ -92,18 +85,9 @@ def main(global_config, **settings):
     config.add_view(map_info, route_name="map_info",
         renderer="map_info.mako")
 
-    config.add_route("stats_submit", "stats/submit")
-    config.add_view(stats_submit, route_name="stats_submit",
-        renderer="index.jinja2")
-
     # SEARCH ROUTES
     config.add_route("search", "search")
     config.add_view(search, route_name="search",
         renderer="search.mako")
 
-    config.add_route("search_paged", "search/page/{page:\d+}")
-    config.add_view(search, route_name="search_paged",
-        renderer="search.mako")
-
-
     return config.make_wsgi_app()