X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonstat.git;a=blobdiff_plain;f=xonstat%2F__init__.py;h=5ee0e4641684e92cbab1c16049903f34dbb7304e;hp=d317443a9e3be74efc5ccb0ccdfa6b5a2ec08604;hb=56bb9531b247d272e516b5d21493ebc8b8f0f812;hpb=dacaa2b54edba873ce30111cf0c07bd0ebf107bf diff --git a/xonstat/__init__.py b/xonstat/__init__.py old mode 100755 new mode 100644 index d317443..5ee0e46 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -1,15 +1,15 @@ -import pyramid_jinja2 import sqlahelper from pyramid.config import Configurator +from pyramid.renderers import JSONP from sqlalchemy import engine_from_config from xonstat.models import initialize_db -from xonstat.views import * +from xonstat.views import * def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ # setup the database engine - engine = engine_from_config(settings, 'sqlalchemy.') + engine = engine_from_config(settings, 'sqlalchemy.', pool_size=5) sqlahelper.add_engine(engine) # initialize database structures @@ -17,45 +17,93 @@ def main(global_config, **settings): config = Configurator(settings=settings) - config.add_renderer('.jinja2', pyramid_jinja2.renderer_factory) - config.add_static_view('static', 'xonstat:static') + config.add_renderer('jsonp', JSONP(param_name='callback')) + # ROOT ROUTE - config.add_route(name="main_index", pattern="/", view=game_index, - renderer='game_index.mako') + 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") # PLAYER ROUTES - config.add_route(name="player_game_index", - pattern="/player/{player_id:\d+}/games/page/{page:\d+}", - view=player_game_index, renderer='player_game_index.mako') + 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_view(player_game_index_json, route_name="player_game_index_json", renderer="jsonp") + + 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_json", "/hashkey/{hashkey}") + config.add_view(player_hashkey_info_json, route_name="player_hashkey_info_json", renderer="jsonp") - config.add_route(name="player_info", pattern="/player/{id:\d+}", view=player_info, - renderer='player_info.mako') + 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_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") # GAME ROUTES - config.add_route(name="game_index", pattern="/games", view=game_index, - renderer='game_index.mako') + 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(name="game_index_paged", pattern="/games/page/{page:\d+}", - view=game_index, renderer='game_index.mako') + 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_view(game_info_json, route_name="game_info_json", renderer="jsonp") - config.add_route(name="game_info", pattern="/game/{id:\d+}", view=game_info, - renderer='game_info.mako') + config.add_route("rank_index", "/ranks/{game_type_cd:ctf|dm|tdm|duel}") + config.add_route("rank_index_json", "/ranks/{game_type_cd:ctf|dm|tdm|duel}.json") + 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") # SERVER ROUTES - config.add_route(name="server_game_index", - pattern="/server/{server_id:\d+}/games/page/{page:\d+}", - view=server_game_index, renderer='server_game_index.mako') + 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_view(server_index_json, route_name="server_index_json", renderer="jsonp") - config.add_route(name="server_info", pattern="/server/{id:\d+}", view=server_info, - renderer='server_info.mako') + 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_view(server_game_index_json, route_name="server_game_index_json", renderer="jsonp") - # MAP ROUTES - config.add_route(name="map_info", pattern="/map/{id:\d+}", view=map_info, - renderer='map_info.mako') + 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_view(server_info_json, route_name="server_info_json", renderer="jsonp") - config.add_route(name="stats_submit", pattern="stats/submit", - view=stats_submit, renderer='index.jinja2') + # 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_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_view(map_info_json, route_name="map_info_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_view(search_json, route_name="search_json", renderer="jsonp") return config.make_wsgi_app()