import mongokit
from webob import Request, exc
-from mediagoblin import routing, util, models, storage
+from mediagoblin import routing, util, models, storage, staticdirect
+from mediagoblin.globals import setup_globals
+from mediagoblin.celery_setup import setup_celery_from_config
class Error(Exception): pass
"""
def __init__(self, connection, database_path,
public_store, queue_store,
+ staticdirector,
user_template_path=None):
# Get the template environment
self.template_env = util.get_jinja_env(user_template_path)
# set up routing
self.routing = routing.get_mapper()
+ # set up staticdirector tool
+ self.staticdirector = staticdirector
+
+ # certain properties need to be accessed globally eg from
+ # validators, etc, which might not access to the request
+ # object.
+ setup_globals(
+ db_connection=connection,
+ database=self.db,
+ public_store=self.public_store,
+ queue_store=self.queue_store)
def __call__(self, environ, start_response):
request = Request(environ)
path_info = request.path_info
+
+ ## Routing / controller loading stuff
route_match = self.routing.match(path_info)
# No matching page?
if request.GET:
new_path_info = '%s?%s' % (
new_path_info, urllib.urlencode(request.GET))
- redirect = exc.HTTPTemporaryRedirect(location=new_path_info)
+ redirect = exc.HTTPFound(location=new_path_info)
return request.get_response(redirect)(environ, start_response)
# Okay, no matches. 404 time!
controller = util.import_component(route_match['controller'])
request.start_response = start_response
+ ## Attach utilities to the request object
request.matchdict = route_match
- request.app = self
- request.template_env = self.template_env
request.urlgen = routes.URLGenerator(self.routing, environ)
- request.db = self.db
# 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.template_env = self.template_env
+ request.db = self.db
+ request.staticdirect = self.staticdirector
+
util.setup_user_in_request(request)
return controller(request)(environ, start_response)
-def paste_app_factory(global_config, **kw):
+def paste_app_factory(global_config, **app_config):
# Get the database connection
connection = mongokit.Connection(
- kw.get('db_host'), kw.get('db_port'))
+ app_config.get('db_host'), app_config.get('db_port'))
# Set up the storage systems.
public_store = storage.storage_system_from_paste_config(
- kw, 'publicstore')
+ app_config, 'publicstore')
queue_store = storage.storage_system_from_paste_config(
- kw, 'queuestore')
+ app_config, 'queuestore')
+
+ # Set up the staticdirect system
+ if app_config.has_key('direct_remote_path'):
+ staticdirector = staticdirect.RemoteStaticDirect(
+ app_config['direct_remote_path'].strip())
+ elif app_config.has_key('direct_remote_paths'):
+ direct_remote_path_lines = app_config[
+ 'direct_remote_paths'].strip().splitlines()
+ staticdirector = staticdirect.MultiRemoteStaticDirect(
+ dict([line.strip().split(' ', 1)
+ for line in direct_remote_path_lines]))
+ else:
+ raise ImproperlyConfigured(
+ "One of direct_remote_path or direct_remote_paths must be provided")
+
+ setup_celery_from_config(app_config, global_config)
mgoblin_app = MediaGoblinApp(
- connection, kw.get('db_name', 'mediagoblin'),
+ connection, app_config.get('db_name', 'mediagoblin'),
public_store=public_store, queue_store=queue_store,
- user_template_path=kw.get('local_templates'))
+ staticdirector=staticdirector,
+ user_template_path=app_config.get('local_templates'))
return mgoblin_app