From 0c0074328b2b896317bf4e33378fc587f0d3dfe1 Mon Sep 17 00:00:00 2001 From: Barbu Paul - Gheorghe Date: Sun, 23 Dec 2012 19:51:41 +0200 Subject: [PATCH] modified FFmpegExtractAudioPP to accept whether it should overwrite post-processed files or not --- youtube_dl/PostProcessor.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index cc7789e3b..e0b071a9c 100644 --- a/youtube_dl/PostProcessor.py +++ b/youtube_dl/PostProcessor.py @@ -62,13 +62,14 @@ class AudioConversionError(BaseException): self.message = message class FFmpegExtractAudioPP(PostProcessor): - def __init__(self, downloader=None, preferredcodec=None, preferredquality=None, keepvideo=False): + def __init__(self, downloader=None, preferredcodec=None, preferredquality=None, keepvideo=False, nopostoverwrites=False): PostProcessor.__init__(self, downloader) if preferredcodec is None: preferredcodec = 'best' self._preferredcodec = preferredcodec self._preferredquality = preferredquality self._keepvideo = keepvideo + self._nopostoverwrites = nopostoverwrites self._exes = self.detect_executables() @staticmethod @@ -102,12 +103,16 @@ class FFmpegExtractAudioPP(PostProcessor): def run_ffmpeg(self, path, out_path, codec, more_opts): if not self._exes['ffmpeg'] and not self._exes['avconv']: - raise AudioConversionError('ffmpeg or avconv not found. Please install one.') + raise AudioConversionError('ffmpeg or avconv not found. Please install one.') if codec is None: acodec_opts = [] else: acodec_opts = ['-acodec', codec] - cmd = ([self._exes['avconv'] or self._exes['ffmpeg'], '-y', '-i', encodeFilename(path), '-vn'] + if self._nopostoverwrites: + overwrite_opts = '-n' + else: + overwrite_opts = '-y' + cmd = ([self._exes['avconv'] or self._exes['ffmpeg'], overwrite_opts, '-i', encodeFilename(path), '-vn'] + acodec_opts + more_opts + ['--', encodeFilename(out_path)]) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)