X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonstat.git;a=blobdiff_plain;f=xonstat%2F__init__.py;h=1d2e0750b5001e955e3351857af2ba198a52e93d;hp=760a6f3284aeabcf0b10d245145e7cf375fd2691;hb=2d53f7f9232b23ada761231482262392cf72192c;hpb=edc391976ee9853e804bca79754c1578c991649c diff --git a/xonstat/__init__.py b/xonstat/__init__.py index 760a6f3..1d2e075 100644 --- a/xonstat/__init__.py +++ b/xonstat/__init__.py @@ -9,6 +9,7 @@ from xonstat.models import initialize_db from xonstat.views import * from xonstat.security import * + def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ @@ -101,14 +102,17 @@ def main(global_config, **settings): config.add_route("player_weaponstats_data_json", "/player/{id:\d+}/weaponstats.json") config.add_view(player_weaponstats_data_json, route_name="player_weaponstats_data_json", renderer="jsonp") - config.add_route("top_players_by_time", "/topactive") - config.add_view(top_players_by_time, route_name="top_players_by_time", renderer="top_players_by_time.mako") + config.add_route("top_players_index", "/topactive") + config.add_view(top_players_index, route_name="top_players_index", renderer="top_players_index.mako") + + config.add_route("top_servers_index", "/topservers") + config.add_view(top_servers_index, route_name="top_servers_index", renderer="top_servers_index.mako") - config.add_route("top_servers_by_players", "/topservers") - config.add_view(top_servers_by_players, route_name="top_servers_by_players", renderer="top_servers_by_players.mako") + config.add_route("top_maps_index", "/topmaps") + config.add_view(top_maps_index, route_name="top_maps_index", renderer="top_maps_index.mako") - config.add_route("top_maps_by_times_played", "/topmaps") - config.add_view(top_maps_by_times_played, route_name="top_maps_by_times_played", renderer="top_maps_by_times_played.mako") + config.add_route("player_versus", "/versus") + config.add_view(player_versus, route_name="player_versus", renderer="player_versus.mako") # GAME ROUTES config.add_route("game_info", "/game/{id:\d+}") @@ -117,34 +121,55 @@ def main(global_config, **settings): 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", "/ranks/{game_type_cd}") 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_route("rank_index_json", "/ranks/{game_type_cd}.json") config.add_view(rank_index_json, route_name="rank_index_json", renderer="jsonp") config.add_route("game_index", "/games") config.add_view(game_finder, route_name="game_index", renderer="game_finder.mako") - # SERVER ROUTES - config.add_route("server_index", "/servers") - 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("game_index_json", "/games.json") + config.add_view(game_finder_json, route_name="game_index_json", renderer="jsonp") - config.add_route("server_info", "/server/{id:\d+}") - 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") + # SERVER ROUTES + config.add_route("server_index", "/servers") + config.add_view(view=ServerIndex, route_name="server_index", attr="html", + renderer="server_index.mako", accept="text/html") + config.add_view(view=ServerIndex, route_name="server_index", attr="json", renderer="json", + accept="application/json") + + config.add_route("server_top_maps", "/server/{id:\d+}/topmaps") + config.add_view(view=ServerTopMaps, route_name="server_top_maps", attr="html", + renderer="server_top_maps.mako", accept="text/html") + config.add_view(view=ServerTopMaps, route_name="server_top_maps", attr="json", renderer="json", + accept="application/json") + + config.add_route("server_top_active", "/server/{id:\d+}/topactive") + config.add_view(view=ServerTopPlayers, route_name="server_top_active", attr="html", + renderer="server_top_active.mako", accept="text/html") + config.add_view(view=ServerTopPlayers, route_name="server_top_active", attr="json", + renderer="json", accept="application/json") + + config.add_route("server_top_scorers", "/server/{id:\d+}/topscorers") + config.add_view(view=ServerTopScorers, route_name="server_top_scorers", attr="html", + renderer="server_top_scorers.mako", accept="text/html") + config.add_view(view=ServerTopScorers, route_name="server_top_scorers", attr="json", + renderer="json", accept="application/json") + + config.add_route("server_info", "/server/{id:\d+}") + config.add_view(view=ServerInfo, route_name="server_info", attr="html", + renderer="server_info.mako", accept="text/html") + config.add_view(view=ServerInfo, route_name="server_info", attr="json", renderer="json", + accept="application/json") # MAP ROUTES - config.add_route("map_index", "/maps") - 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_index", "/maps") + config.add_view(view=MapIndex, route_name="map_index", attr="html", + renderer="map_index.mako", accept="text/html") + config.add_view(view=MapIndex, route_name="map_index", attr="json", renderer="json", + accept="application/json") config.add_route("map_info", "/map/{id:\d+}") config.add_view(map_info, route_name="map_info", renderer="map_info.mako")