X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2F__init__.py;h=449d3b93e23f614881e0b0da838ac68dada2a4e1;hb=25d2ac9134253dbbe8ba1cda21f980c4fbb22d20;hp=728426d36ee1aa88b75ec3af864717d5ec8786db;hpb=2b860e14677197a9513a6368de2e2262f8f2cc76;p=xonotic%2Fxonstat.git diff --git a/xonstat/__init__.py b/xonstat/__init__.py index 728426d..449d3b9 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -1,6 +1,7 @@ import sqlahelper from pyramid_beaker import set_cache_regions_from_settings from pyramid.config import Configurator +from pyramid.httpexceptions import HTTPNotFound from pyramid.renderers import JSONP from sqlalchemy import engine_from_config from xonstat.models import initialize_db @@ -21,72 +22,70 @@ def main(global_config, **settings): config = Configurator(settings=settings) + config.add_renderer('jsonp', JSONP(param_name='callback')) + + # for static assets config.add_static_view('static', 'xonstat:static') - config.add_renderer('jsonp', JSONP(param_name='callback')) + # for 404s + config.add_view(notfound, context=HTTPNotFound, renderer="404.mako") # ROOT ROUTE config.add_route("main_index", "/") 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("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") - config.add_route("player_game_index_json", "/player/{player_id:\d+}/games.json") config.add_view(player_game_index, route_name="player_game_index", renderer="player_game_index.mako") + + config.add_route("player_game_index_json", "/player/{player_id:\d+}/games.json") config.add_view(player_game_index_json, route_name="player_game_index_json", renderer="jsonp") + config.add_route("player_hashkey_info_text", "/player/me") + config.add_view(player_hashkey_info_text, route_name="player_hashkey_info_text", renderer="player_hashkey_info_text.mako") + config.add_route("player_info", "/player/{id:\d+}") - config.add_route("player_info_json", "/player/{id:\d+}.json") 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_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_info_json", "/player/{id:\d+}.json") + config.add_view(player_info_json, route_name="player_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_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_route("player_index", "/players") - config.add_route("player_index_json", "/players.json") config.add_view(player_index, route_name="player_index", renderer="player_index.mako") + + config.add_route("player_index_json", "/players.json") 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="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_route("player_captimes_json", "/player/{id:\d+}/captimes.json") config.add_view(player_captimes_json, route_name="player_captimes_json", renderer="jsonp") # GAME ROUTES - # config.add_route("game_index", "/games") - # config.add_route("game_index_json", "/games.json") - # config.add_view(game_index, route_name="game_index", renderer="game_index.mako") - # config.add_view(game_index_json, route_name="game_index_json", renderer="jsonp") - config.add_route("game_info", "/game/{id:\d+}") - config.add_route("game_info_json", "/game/{id:\d+}.json") config.add_view(game_info, route_name="game_info", renderer="game_info.mako") + + config.add_route("game_info_json", "/game/{id:\d+}.json") config.add_view(game_info_json, route_name="game_info_json", renderer="jsonp") config.add_route("rank_index", "/ranks/{game_type_cd:ctf|dm|tdm|duel|ca|ft}") - config.add_route("rank_index_json", "/ranks/{game_type_cd:ctf|dm|tdm|duel|ca|ft}.json") config.add_view(rank_index, route_name="rank_index", renderer="rank_index.mako") + + config.add_route("rank_index_json", "/ranks/{game_type_cd:ctf|dm|tdm|duel|ca|ft}.json") config.add_view(rank_index_json, route_name="rank_index_json", renderer="jsonp") config.add_route("game_index", "/games") @@ -94,40 +93,47 @@ def main(global_config, **settings): # SERVER ROUTES config.add_route("server_index", "/servers") - config.add_route("server_index_json", "/servers.json") config.add_view(server_index, route_name="server_index", renderer="server_index.mako") + + config.add_route("server_index_json", "/servers.json") config.add_view(server_index_json, route_name="server_index_json", renderer="jsonp") config.add_route("server_game_index", "/server/{server_id:\d+}/games/page/{page:\d+}") - config.add_route("server_game_index_json", "/server/{server_id:\d+}/games.json") config.add_view(server_game_index, route_name="server_game_index", renderer="server_game_index.mako") + + config.add_route("server_game_index_json", "/server/{server_id:\d+}/games.json") config.add_view(server_game_index_json, route_name="server_game_index_json", renderer="jsonp") config.add_route("server_info", "/server/{id:\d+}") - config.add_route("server_info_json", "/server/{id:\d+}.json") config.add_view(server_info, route_name="server_info", renderer="server_info.mako") + + config.add_route("server_info_json", "/server/{id:\d+}.json") config.add_view(server_info_json, route_name="server_info_json", renderer="jsonp") # MAP ROUTES config.add_route("map_index", "/maps") - config.add_route("map_index_json", "/maps.json") config.add_view(map_index, route_name="map_index", renderer="map_index.mako") + + config.add_route("map_index_json", "/maps.json") config.add_view(map_index_json, route_name="map_index_json", renderer="jsonp") config.add_route("map_info", "/map/{id:\d+}") - config.add_route("map_info_json", "/map/{id:\d+}.json") config.add_view(map_info, route_name="map_info", renderer="map_info.mako") + + config.add_route("map_info_json", "/map/{id:\d+}.json") 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_route("map_captimes_json", "/map/{id:\d+}/captimes.json") 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") config.add_view(search, route_name="search", renderer="search.mako") + + config.add_route("search_json", "search.json") config.add_view(search_json, route_name="search_json", renderer="jsonp") return config.make_wsgi_app()