Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-04 23:12:51 +01:00
Code Issues Projects Releases Wiki Activity

zero: Check for conflicts only once (#1641)

Browse source 
The old version would trigger the warning twice.
This commit is contained in:
Adrian Sampson 2015-10-17 14:39:53 -07:00
parent 71acf93ef3
commit 8c35a24073
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
beetsplug/zero.py
View file

@ -48,11 +48,17 @@ class ZeroPlugin(BeetsPlugin):
self.patterns = {}
self.warned = False
# We'll only handle `fields` or `keep_fields`, but not both.
if self.config['fields'] and self.config['keep_fields']:
self._log.warn(u'cannot blacklist and whitelist at the same time')
# Blacklist mode.
if self.config['fields']:
self.validate_config('fields')
for field in self.config['fields'].as_str_seq():
self.set_pattern(field)
# Whitelist mode.
elif self.config['keep_fields']:
self.validate_config('keep_fields')
@ -61,15 +67,17 @@ class ZeroPlugin(BeetsPlugin):
continue
self.set_pattern(field)
# These fields should be preserved
# These fields should always be preserved.
for key in ('id', 'path', 'album_id'):
if key in self.patterns:
del self.patterns[key]
def validate_config(self, mode):
"""Check if fields written in config are correct."""
if self.config['fields'] and self.config['keep_fields']:
self._log.warn(u'cannot blacklist and whitelist at the same time')
"""Check whether fields in the configuration are valid.
`mode` should either be "fields" or "keep_fields", indicating
the section of the configuration to validate.
"""
for field in self.config[mode].as_str_seq():
if field not in MediaFile.fields():
self._log.error(u'invalid field: {0}', field)