X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2F__init__.py;h=08946adb2431b7f7221216ed89dbaeb0f2fc2daf;hb=9303565d7bea5e860578c44559f01a8229ebe2fb;hp=5ee0e4641684e92cbab1c16049903f34dbb7304e;hpb=bc0ac237b890a0c8bedf86e263a3cd44f09221e0;p=xonotic%2Fxonstat.git

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 5ee0e46..08946ad 100644
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -1,4 +1,5 @@
 import sqlahelper
+from pyramid_beaker import set_cache_regions_from_settings
 from pyramid.config import Configurator
 from pyramid.renderers import JSONP
 from sqlalchemy import engine_from_config
@@ -15,6 +16,9 @@ def main(global_config, **settings):
     # initialize database structures
     initialize_db(engine)
 
+    # set up beaker cache
+    set_cache_regions_from_settings(settings)
+
     config = Configurator(settings=settings)
 
     config.add_static_view('static', 'xonstat:static')
@@ -26,8 +30,10 @@ 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")
+    #config.add_route("stats_submit", "stats/submit")
+    #config.add_view(stats_submit, route_name="stats_submit")
+    config.add_route("submit_stats", "stats/submit")
+    config.add_view(submit_stats, route_name="submit_stats")
 
     # PLAYER ROUTES
     config.add_route("player_game_index",      "/player/{player_id:\d+}/games")
@@ -40,13 +46,19 @@ def main(global_config, **settings):
     config.add_view(player_info,      route_name="player_info",      renderer="player_info.mako")
     config.add_view(player_info_json, route_name="player_info_json", renderer="jsonp")
 
-    config.add_route("player_hashkey_info_json", "/hashkey/{hashkey}")
-    config.add_view(player_hashkey_info_json, route_name="player_hashkey_info_json", renderer="jsonp")
+    config.add_route("player_hashkey_info_text", "/hashkey/{hashkey}")
+    config.add_view(player_hashkey_info_text, route_name="player_hashkey_info_text", renderer="player_hashkey_info_text.mako")
+
+    #config.add_route("player_hashkey_info_json", "/hashkey/{hashkey}.json")
+    #config.add_view(player_hashkey_info_json, route_name="player_hashkey_info_json", renderer="jsonp")
+
+    config.add_route("player_elo_info_json", "/elo/{hashkey}")
+    config.add_view(player_elo_info_json, route_name="player_elo_info_json", renderer="jsonp")
 
     config.add_route("player_accuracy",      "/player/{id:\d+}/accuracy")
-    config.add_route("player_accuracy_json", "/player/{id:\d+}/accuracy.json")
+    #config.add_route("player_accuracy_json", "/player/{id:\d+}/accuracy.json")
     config.add_view(player_accuracy_json, route_name="player_accuracy",      renderer="jsonp")
-    config.add_view(player_accuracy_json, route_name="player_accuracy_json", renderer="jsonp")
+    #config.add_view(player_accuracy_json, route_name="player_accuracy_json", renderer="jsonp")
 
     config.add_route("player_index",      "/players")
     config.add_route("player_index_json", "/players.json")
@@ -54,8 +66,12 @@ def main(global_config, **settings):
     config.add_view(player_index_json, route_name="player_index_json", renderer="jsonp")
 
     config.add_route("player_damage", "/player/{id:\d+}/damage")
-    config.add_view(player_damage_json, route_name="player_damage",
-        renderer="json")
+    config.add_view(player_damage_json, route_name="player_damage", renderer="jsonp")
+
+    config.add_route("player_captimes",      "/player/{id:\d+}/captimes")
+    config.add_route("player_captimes_json", "/player/{id:\d+}/captimes.json")
+    config.add_view(player_captimes,      route_name="player_captimes",      renderer="player_captimes.mako")
+    config.add_view(player_captimes_json, route_name="player_captimes_json", renderer="jsonp")
 
     # GAME ROUTES
     config.add_route("game_index",      "/games")
@@ -73,6 +89,9 @@ def main(global_config, **settings):
     config.add_view(rank_index,      route_name="rank_index",      renderer="rank_index.mako")
     config.add_view(rank_index_json, route_name="rank_index_json", renderer="jsonp")
 
+    config.add_route("game_finder", "/gamefinder")
+    config.add_view(game_finder, route_name="game_finder", renderer="game_finder.mako")
+
     # SERVER ROUTES
     config.add_route("server_index",      "/servers")
     config.add_route("server_index_json", "/servers.json")
@@ -100,6 +119,11 @@ def main(global_config, **settings):
     config.add_view(map_info,      route_name="map_info",      renderer="map_info.mako")
     config.add_view(map_info_json, route_name="map_info_json", renderer="jsonp")
 
+    config.add_route("map_captimes",      "/map/{id:\d+}/captimes")
+    config.add_route("map_captimes_json", "/map/{id:\d+}/captimes.json")
+    config.add_view(map_captimes,      route_name="map_captimes",      renderer="map_captimes.mako")
+    config.add_view(map_captimes_json, route_name="map_captimes_json", renderer="jsonp")
+
     # SEARCH ROUTES
     config.add_route("search",      "search")
     config.add_route("search_json", "search.json")