Use jsonp renderer for remote requests (or this API would be pretty moot)

[xonotic/xonstat.git] / xonstat / __init__.py

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 5e0995f094eb2d1e26a159d6c7a46a2130bea174..9b66b81111bc72d3ac4a59fbf589282ff8b906a9 100644 (file)
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -1,7 +1,9 @@
-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 *
 
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
@@ -10,27 +12,69 @@ def main(global_config, **settings):
     engine = engine_from_config(settings, 'sqlalchemy.')
     sqlahelper.add_engine(engine)
 
-    # create the database structures
-    # note: have to import here else we'll get` 
-    # "no engine 'default' was configured
-    from xonstat.models import initialize_sql
-    initialize_sql(engine)
-
-    # import the views
-    # note: have to import here else we'll get` 
-    # "no engine 'default' was configured
-    from xonstat.views import * 
+    # initialize database structures
+    initialize_db(engine)
 
     config = Configurator(settings=settings)
 
-    config.add_renderer('.jinja2', pyramid_jinja2.renderer_factory)
-
     config.add_static_view('static', 'xonstat:static')
 
-    config.add_route(name="main_index", pattern="/", view=main_index, 
-            renderer='index.jinja2') 
-    config.add_route(name="stats_submit", pattern="stats/submit", view=stats_submit, 
-            renderer='index.jinja2') 
-    return config.make_wsgi_app()
+    config.add_renderer('jsonp', JSONP(param_name='callback'))
+
+    # 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")
+
+    # PLAYER ROUTES
+    config.add_route("player_game_index", "/player/{player_id:\d+}/games")
+    config.add_view(player_game_index, route_name="player_game_index", renderer="player_game_index.mako")
+
+    config.add_route("player_index", "/players")
+    config.add_view(player_index, route_name="player_index", renderer="player_index.mako")
+
+    config.add_route("player_info", "/player/{id:\d+}")
+    config.add_view(player_info, route_name="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")
 
+    # 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_info", "/game/{id:\d+}")
+    config.add_view(game_info, route_name="game_info", renderer="game_info.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")
+
+    config.add_route("server_game_index", "/server/{server_id:\d+}/games/page/{page:\d+}")
+    config.add_view(server_game_index, route_name="server_game_index", renderer="server_game_index.mako")
+
+    config.add_route("server_info", "/server/{id:\d+}")
+    config.add_view(server_info, route_name="server_info", renderer="server_info.mako")
+
+    # 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_view(map_info, route_name="map_info", renderer="map_info.mako")
+
+    # SEARCH ROUTES
+    config.add_route("search", "search")
+    config.add_view(search, route_name="search", renderer="search.mako")
+
+    return config.make_wsgi_app()