aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py85
1 files changed, 49 insertions, 36 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 08515df9..876ded4e 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -15,14 +15,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
-import urllib
import logging
-import routes
-from webob import exc
+from mediagoblin.routing import url_map, view_functions, add_route
+
from werkzeug.wrappers import Request
+from werkzeug.exceptions import HTTPException, NotFound
-from mediagoblin import routing, meddleware, __version__
+from mediagoblin import meddleware, __version__
from mediagoblin.tools import common, translate, template
from mediagoblin.tools.response import render_404
from mediagoblin.tools.theme import register_themes
@@ -31,7 +31,7 @@ from mediagoblin.mg_globals import setup_globals
from mediagoblin.init.celery import setup_celery_from_config
from mediagoblin.init.plugins import setup_plugins
from mediagoblin.init import (get_jinja_loader, get_staticdirector,
- setup_global_and_app_config, setup_workbench, setup_database,
+ setup_global_and_app_config, setup_locales, setup_workbench, setup_database,
setup_storage, setup_beaker_cache)
from mediagoblin.tools.pluginapi import PluginManager
@@ -68,6 +68,9 @@ class MediaGoblinApp(object):
# Setup other connections / useful objects
##########################################
+ # load all available locales
+ setup_locales()
+
# Set up plugins -- need to do this early so that plugins can
# affect startup.
_log.info("Setting up plugins.")
@@ -90,7 +93,11 @@ class MediaGoblinApp(object):
self.public_store, self.queue_store = setup_storage()
# set up routing
- self.routing = routing.get_mapper(PluginManager().get_routes())
+ self.url_map = url_map
+
+ for route in PluginManager().get_routes():
+ _log.debug('adding plugin route: {0}'.format(route))
+ add_route(*route)
# set up staticdirector tool
self.staticdirector = get_staticdirector(app_config)
@@ -130,12 +137,10 @@ class MediaGoblinApp(object):
## Compatibility webob -> werkzeug
request.GET = request.args
- request.accept_language = request.accept_languages
request.accept = request.accept_mimetypes
## Routing / controller loading stuff
- path_info = request.path
- route_match = self.routing.match(path_info)
+ map_adapter = self.url_map.bind_to_environ(request.environ)
# By using fcgi, mediagoblin can run under a base path
# like /mediagoblin/. request.path_info contains the
@@ -154,47 +159,55 @@ class MediaGoblinApp(object):
environ.pop('HTTPS')
## Attach utilities to the request object
- request.matchdict = route_match
- request.urlgen = routes.URLGenerator(self.routing, environ)
# Do we really want to load this via middleware? Maybe?
request.session = request.environ['beaker.session']
# Attach self as request.app
# Also attach a few utilities from request.app for convenience?
request.app = self
- request.locale = translate.get_locale_from_request(request)
- request.template_env = template.get_jinja_env(
- self.template_loader, request.locale)
request.db = self.db
request.staticdirect = self.staticdirector
+ request.locale = translate.get_locale_from_request(request)
+ request.template_env = template.get_jinja_env(
+ self.template_loader, request.locale)
+
+ def build_proxy(endpoint, **kw):
+ try:
+ qualified = kw.pop('qualified')
+ except KeyError:
+ qualified = False
+
+ return map_adapter.build(
+ endpoint,
+ values=dict(**kw),
+ force_external=qualified)
+
+ request.urlgen = build_proxy
+
mg_request.setup_user_in_request(request)
- # No matching page?
- if route_match is None:
- # Try to do see if we have a match with a trailing slash
- # added and if so, redirect
- if not path_info.endswith('/') \
- and request.method == 'GET' \
- and self.routing.match(path_info + '/'):
- new_path_info = path_info + '/'
- if request.GET:
- new_path_info = '%s?%s' % (
- new_path_info, urllib.urlencode(request.GET))
- redirect = exc.HTTPFound(location=new_path_info)
- return request.get_response(redirect)(environ, start_response)
-
- # Okay, no matches. 404 time!
- request.matchdict = {} # in case our template expects it
+ try:
+ endpoint, url_values = map_adapter.match()
+ request.matchdict = url_values
+ except NotFound as exc:
return render_404(request)(environ, start_response)
+ except HTTPException as exc:
+ # Support legacy webob.exc responses
+ return exc(environ, start_response)
+
+ view_func = view_functions[endpoint]
+
+ _log.debug('endpoint: {0} view_func: {1}'.format(
+ endpoint,
+ view_func))
- # import the controller, or if it's already a callable, call that
- route_controller = route_match['controller']
- if isinstance(route_controller, unicode) \
- or isinstance(route_controller, str):
- controller = common.import_component(route_match['controller'])
+ # import the endpoint, or if it's already a callable, call that
+ if isinstance(view_func, unicode) \
+ or isinstance(view_func, str):
+ controller = common.import_component(view_func)
else:
- controller = route_match['controller']
+ controller = view_func
# pass the request through our meddleware classes
for m in self.meddleware: