diff options
| -rw-r--r-- | mediagoblin/init/__init__.py | 14 | ||||
| -rw-r--r-- | mediagoblin/tools/staticdirect.py | 17 |
2 files changed, 4 insertions, 27 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index ae54cacf..b8681016 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -102,20 +102,14 @@ def get_jinja_loader(user_template_path=None, current_theme=None): def get_staticdirector(app_config): - if 'direct_remote_path' in app_config: - return staticdirect.RemoteStaticDirect( - app_config['direct_remote_path'].strip()) - elif 'direct_remote_paths' in app_config: - direct_remote_path_lines = app_config[ - 'direct_remote_paths'].strip().splitlines() - return staticdirect.MultiRemoteStaticDirect( - dict([line.strip().split(' ', 1) - for line in direct_remote_path_lines])) - else: + if not 'direct_remote_path' in app_config: raise ImproperlyConfigured( "One of direct_remote_path or " "direct_remote_paths must be provided") + return staticdirect.RemoteStaticDirect( + app_config['direct_remote_path'].strip()) + def setup_storage(): global_config = mg_globals.global_config diff --git a/mediagoblin/tools/staticdirect.py b/mediagoblin/tools/staticdirect.py index 7477de68..4143b453 100644 --- a/mediagoblin/tools/staticdirect.py +++ b/mediagoblin/tools/staticdirect.py @@ -56,20 +56,3 @@ class RemoteStaticDirect(StaticDirect): def get(self, filepath): return '%s/%s' % ( self.remotepath, filepath.lstrip('/')) - - -class MultiRemoteStaticDirect(StaticDirect): - """ - For whene separate sections of the static data is served under - separate urls. - """ - def __init__(self, remotepaths): - StaticDirect.__init__(self) - self.remotepaths = remotepaths - - def get(self, filepath): - section, rest = filepath.strip('/').split('/', 1) - - return '%s/%s' % ( - self.remotepaths[section].rstrip('/'), - rest.lstrip('/')) |