convert: Check the correct path when determening whether to skip

Fixes regression from 3197795faa
and makes tests from 56aba87fdc pass.

Fixes #970
This commit is contained in:
Thomas Scholtes 2014-09-18 17:17:02 +02:00
parent 56aba87fdc
commit dc3c4883dc

View file

@ -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: