midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FFmpegExtractAudioPP: Simplify handling of already existing files

Browse source
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-04-17 22:29:30 +02:00
parent 7691a7a3bd
commit ce81b1411d
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
youtube_dl/postprocessor/ffmpeg.py
View file

@ -264,15 +264,14 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
new_path = prefix + sep + extension new_path = prefix + sep + extension
# If we download foo.mp3 and convert it to... foo.mp3, then don't delete foo.mp3, silly. # If we download foo.mp3 and convert it to... foo.mp3, then don't delete foo.mp3, silly.
if new_path == path: if (new_path == path or
self._nopostoverwrites = True (self._nopostoverwrites and os.path.exists(encodeFilename(new_path)))):
self._downloader.to_screen('[youtube] Post-process file %s exists, skipping' % new_path)
return True, information
try: try:
if self._nopostoverwrites and os.path.exists(encodeFilename(new_path)): self._downloader.to_screen('[' + self.basename + '] Destination: ' + new_path)
self._downloader.to_screen('[youtube] Post-process file %s exists, skipping' % new_path) self.run_ffmpeg(path, new_path, acodec, more_opts)
else:
self._downloader.to_screen('[' + self.basename + '] Destination: ' + new_path)
self.run_ffmpeg(path, new_path, acodec, more_opts)
except AudioConversionError as e: except AudioConversionError as e:
raise PostProcessingError( raise PostProcessingError(
'audio conversion failed: ' + e.msg) 'audio conversion failed: ' + e.msg)
@ -286,7 +285,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
errnote='Cannot update utime of audio file') errnote='Cannot update utime of audio file')
information['filepath'] = new_path information['filepath'] = new_path
return self._nopostoverwrites, information return False, information
class FFmpegVideoConvertorPP(FFmpegPostProcessor): class FFmpegVideoConvertorPP(FFmpegPostProcessor):