andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config: Add read helper

Browse Source
This commit is contained in:
Thomas Adamcik 2013-04-13 21:06:09 +02:00
parent 917c1e4c9d
commit b655e846b1
8 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/backends/local/__init__.py
View File

@ -14,7 +14,7 @@ class Extension(ext.Extension):
def get_default_config(self): def get_default_config(self):
conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
return open(conf_file).read() return config.read(conf_file)
def get_config_schema(self): def get_config_schema(self):
schema = config.ExtensionConfigSchema() schema = config.ExtensionConfigSchema()

2
mopidy/backends/spotify/__init__.py
View File

@ -14,7 +14,7 @@ class Extension(ext.Extension):
def get_default_config(self): def get_default_config(self):
conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
return open(conf_file).read() return config.read(conf_file)
def get_config_schema(self): def get_config_schema(self):
schema = config.ExtensionConfigSchema() schema = config.ExtensionConfigSchema()

2
mopidy/backends/stream/__init__.py
View File

@ -14,7 +14,7 @@ class Extension(ext.Extension):
def get_default_config(self): def get_default_config(self):
conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
return open(conf_file).read() return config.read(conf_file)
def get_config_schema(self): def get_config_schema(self):
schema = config.ExtensionConfigSchema() schema = config.ExtensionConfigSchema()

11
mopidy/config/__init__.py
View File

@ -35,10 +35,15 @@ config_schemas['proxy']['password'] = String(optional=True, secret=True)
#config_schemas['audio.outputs'] = config.AudioOutputConfigSchema() #config_schemas['audio.outputs'] = config.AudioOutputConfigSchema()
def read(config_file):
"""Helper to load defaults in same way across core and extensions."""
with io.open(config_file, 'rb') as filehandle:
return filehandle.read()
def load(files, overrides, extensions=None): def load(files, overrides, extensions=None):
default_config_file = os.path.join( config_dir = os.path.dirname(__file__)
os.path.dirname(__file__), 'default.conf') defaults = [read(os.path.join(config_dir, 'default.conf'))]
defaults = [open(default_config_file).read()]
if extensions: if extensions:
defaults.extend(e.get_default_config() for e in extensions) defaults.extend(e.get_default_config() for e in extensions)
return _load(files, defaults, overrides) return _load(files, defaults, overrides)

2
mopidy/frontends/http/__init__.py
View File

@ -14,7 +14,7 @@ class Extension(ext.Extension):
def get_default_config(self): def get_default_config(self):
conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
return open(conf_file).read() return config.read(conf_file)
def get_config_schema(self): def get_config_schema(self):
schema = config.ExtensionConfigSchema() schema = config.ExtensionConfigSchema()

2
mopidy/frontends/mpd/__init__.py
View File

@ -14,7 +14,7 @@ class Extension(ext.Extension):
def get_default_config(self): def get_default_config(self):
conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
return open(conf_file).read() return config.read(conf_file)
def get_config_schema(self): def get_config_schema(self):
schema = config.ExtensionConfigSchema() schema = config.ExtensionConfigSchema()

2
mopidy/frontends/mpris/__init__.py
View File

@ -14,7 +14,7 @@ class Extension(ext.Extension):
def get_default_config(self): def get_default_config(self):
conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
return open(conf_file).read() return config.read(conf_file)
def get_config_schema(self): def get_config_schema(self):
schema = config.ExtensionConfigSchema() schema = config.ExtensionConfigSchema()

2
mopidy/frontends/scrobbler/__init__.py
View File

@ -14,7 +14,7 @@ class Extension(ext.Extension):
def get_default_config(self): def get_default_config(self):
conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf') conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
return open(conf_file).read() return config.read(conf_file)
def get_config_schema(self): def get_config_schema(self):
schema = config.ExtensionConfigSchema() schema = config.ExtensionConfigSchema()