
Moving the config reading and error reporting from app.py to init/__init__.py. Straight forward. This also fixes the duplicated exceptions.
68 lines
2.5 KiB
Python
68 lines
2.5 KiB
Python
# GNU MediaGoblin -- federated, autonomous media hosting
|
|
# Copyright (C) 2011 Free Software Foundation, Inc
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU Affero General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Affero General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import jinja2
|
|
from mediagoblin import staticdirect
|
|
from mediagoblin.init.config import (
|
|
read_mediagoblin_config, generate_validation_report)
|
|
|
|
|
|
class Error(Exception): pass
|
|
class ImproperlyConfigured(Error): pass
|
|
|
|
|
|
def setup_global_and_app_config(config_path):
|
|
global_config, validation_result = read_mediagoblin_config(config_path)
|
|
app_config = global_config['mediagoblin']
|
|
# report errors if necessary
|
|
validation_report = generate_validation_report(
|
|
global_config, validation_result)
|
|
if validation_report:
|
|
raise ImproperlyConfigured(validation_report)
|
|
|
|
return global_config, app_config
|
|
|
|
def get_jinja_loader(user_template_path=None):
|
|
"""
|
|
Set up the Jinja template loaders, possibly allowing for user
|
|
overridden templates.
|
|
|
|
(In the future we may have another system for providing theming;
|
|
for now this is good enough.)
|
|
"""
|
|
if user_template_path:
|
|
return jinja2.ChoiceLoader(
|
|
[jinja2.FileSystemLoader(user_template_path),
|
|
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")
|