From dc3c4883dc3af2c9102c123de0121183447ec90c Mon Sep 17 00:00:00 2001 From: Thomas Scholtes Date: Thu, 18 Sep 2014 17:17:02 +0200 Subject: [PATCH] convert: Check the correct path when determening whether to skip Fixes regression from 3197795faaaed07dbd59dc8df41bec791622d759 and makes tests from 56aba87fdc1939bd013fd3e0ba256fafaabfa431 pass. Fixes #970 --- beetsplug/convert.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beetsplug/convert.py b/beetsplug/convert.py index 3476bdee0..2ea62cd22 100644 --- a/beetsplug/convert.py +++ b/beetsplug/convert.py @@ -151,8 +151,12 @@ def convert_item(dest_dir, keep_new, path_formats, format, pretend=False): if keep_new: original = dest converted = item.path + if should_transcode(item, format): + converted = replace_ext(converted, ext) else: original = item.path + if should_transcode(item, format): + dest = replace_ext(dest, ext) converted = dest # Ensure that only one thread tries to create directories at a @@ -181,7 +185,6 @@ def convert_item(dest_dir, keep_new, path_formats, format, pretend=False): util.move(item.path, original) if should_transcode(item, format): - converted = replace_ext(converted, ext) try: encode(command, original, converted, pretend) except subprocess.CalledProcessError: