Move setting up of staticdirector to init submodule
This duplicates some exceptions, which will be fixed very soon.
This commit is contained in:
@@ -15,6 +15,11 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import jinja2
|
||||
from mediagoblin import staticdirect
|
||||
|
||||
|
||||
class Error(Exception): pass
|
||||
class ImproperlyConfigured(Error): pass
|
||||
|
||||
|
||||
def get_jinja_loader(user_template_path=None):
|
||||
@@ -31,3 +36,19 @@ def get_jinja_loader(user_template_path=None):
|
||||
jinja2.PackageLoader('mediagoblin', 'templates')])
|
||||
else:
|
||||
return jinja2.PackageLoader('mediagoblin', 'templates')
|
||||
|
||||
|
||||
def get_staticdirector(app_config):
|
||||
if app_config.has_key('direct_remote_path'):
|
||||
return 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()
|
||||
return 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")
|
||||
|
||||
Reference in New Issue
Block a user