Fix #822: scrub/convert plugin conflict

We now correctly scrub the destination of a conversion, not the source.
This commit is contained in:
Adrian Sampson 2014-06-14 16:08:49 +01:00
parent bd55fadafb
commit 4940958148
2 changed files with 6 additions and 3 deletions

View file

@ -138,7 +138,7 @@ def _scrub(path):
# Automatically embed art into imported albums.
@ScrubPlugin.listen('write')
def write_item(item):
def write_item(path):
if not scrubbing and config['scrub']['auto']:
log.debug(u'auto-scrubbing %s' % util.displayable_path(item.path))
_scrub(item.path)
log.debug(u'auto-scrubbing %s' % util.displayable_path(path))
_scrub(path)

View file

@ -41,6 +41,9 @@ Little improvements and fixes:
This fixes :ref:`write` showing changes for fields that are not written
to the file.
* :ref:`write`: Don't display the item name if there are no changes for it.
* When using both :doc:`/plugins/convert` and :doc:`/plugins/scrub`, avoid
scrubbing the source file of conversions. (Fix a regression introduced in
the previous release.)
1.3.6 (May 10, 2014)