Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-03 06:22:48 +01:00
Code Issues Projects Releases Wiki Activity

For #1617, fix laziness with a new subclass

Browse source
This commit is contained in:
Adrian Sampson 2015-10-07 15:32:07 -07:00
parent 41c5f57339
commit fe1fab9aee
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
beets/__init__.py
View file

@ -24,14 +24,23 @@ __author__ = 'Adrian Sampson <adrian@radbox.org>'
Library = beets.library.Library
config = confit.LazyConfig('beets', __name__)
try:
included_filenames = config['include'].get(list)
except confit.NotFoundError:
included_filenames = []
class IncludeLazyConfig(confit.LazyConfig):
"""A version of Confit's LazyConfig that also merges in data from
YAML files specified in an `include` setting.
"""
def read(self, user=True, defaults=True):
super(IncludeLazyConfig, self).read(user, defaults)
for filename in included_filenames:
filename = os.path.join(config.config_dir(), filename)
if os.path.isfile(filename):
config.set_file(filename)
try:
included_filenames = self['include'].get(list)
except confit.NotFoundError:
included_filenames = []
for filename in included_filenames:
filename = os.path.join(self.config_dir(), filename)
if os.path.isfile(filename):
self.set_file(filename)
config = IncludeLazyConfig('beets', __name__)