heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

defaults now pulled from a mashup of mediagoblin.ini and config_spec.ini

Browse Source 
This commit sponsored by Thomas Løcke.  Thank you!
This commit is contained in:
Christopher Allan Webber 2014-08-10 16:19:50 -05:00 committed by Jessica Tallon
parent 7dc46f0dd4
commit 2b1e0af03b
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mediagoblin/init/config.py
View File

@ -14,6 +14,7 @@
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import copy
import logging import logging
import os import os
import pkg_resources import pkg_resources
@ -29,14 +30,19 @@ CONFIG_SPEC_PATH = pkg_resources.resource_filename(
'mediagoblin', 'config_spec.ini') 'mediagoblin', 'config_spec.ini')
def _setup_defaults(config, config_path): def _setup_defaults(config, config_path, extra_defaults=None):
""" """
Setup DEFAULTS in a config object from an (absolute) config_path. Setup DEFAULTS in a config object from an (absolute) config_path.
""" """
extra_defaults = extra_defaults or {}
config.setdefault('DEFAULT', {}) config.setdefault('DEFAULT', {})
config['DEFAULT']['here'] = os.path.dirname(config_path) config['DEFAULT']['here'] = os.path.dirname(config_path)
config['DEFAULT']['__file__'] = config_path config['DEFAULT']['__file__'] = config_path
for key, value in extra_defaults.items():
config['DEFAULT'].setdefault(key, value)
def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH): def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
""" """
@ -73,6 +79,19 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
plugins = config.get("plugins", {}).keys() plugins = config.get("plugins", {}).keys()
plugin_configs = {} plugin_configs = {}
# Now load the main config spec
config_spec = ConfigObj(
config_spec,
encoding='UTF8', list_values=False, _inspec=True)
# temporary bootstrap, just setup here and __file__... we'll do this again
_setup_defaults(config, config_path)
# Set up extra defaults that will be pushed into the rest of the
# configs. This is a combined extrapolation of defaults based on
mainconfig_defaults = copy.copy(config_spec.get('DEFAULT', {}))
mainconfig_defaults.update(config.get('DEFAULT', {}))
for plugin in plugins: for plugin in plugins:
try: try:
plugin_config_spec_path = pkg_resources.resource_filename( plugin_config_spec_path = pkg_resources.resource_filename(
@ -83,7 +102,8 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
plugin_config_spec = ConfigObj( plugin_config_spec = ConfigObj(
plugin_config_spec_path, plugin_config_spec_path,
encoding='UTF8', list_values=False, _inspec=True) encoding='UTF8', list_values=False, _inspec=True)
_setup_defaults(plugin_config_spec, config_path) _setup_defaults(
plugin_config_spec, config_path, mainconfig_defaults)
if not "plugin_spec" in plugin_config_spec: if not "plugin_spec" in plugin_config_spec:
continue continue
@ -95,22 +115,17 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH):
"When setting up config section, could not import '%s'" % "When setting up config section, could not import '%s'" %
plugin) plugin)
# Now load the main config spec
config_spec = ConfigObj(
config_spec,
encoding='UTF8', list_values=False, _inspec=True)
# append the plugin specific sections of the config spec # append the plugin specific sections of the config spec
config_spec['plugins'] = plugin_configs config_spec['plugins'] = plugin_configs
_setup_defaults(config_spec, config_path) _setup_defaults(config_spec, config_path, mainconfig_defaults)
config = ConfigObj( config = ConfigObj(
config_path, config_path,
configspec=config_spec, configspec=config_spec,
interpolation='ConfigParser') interpolation='ConfigParser')
_setup_defaults(config, config_path) _setup_defaults(config, config_path, mainconfig_defaults)
# For now the validator just works with the default functions, # For now the validator just works with the default functions,
# but in the future if we want to add additional validation/configuration # but in the future if we want to add additional validation/configuration