Skip to content

Commit

Permalink
Deletes temp files after postprocess merge unless -k option is specified
Browse files Browse the repository at this point in the history
  • Loading branch information
rupertbaxter2 authored and phihag committed Jul 23, 2014
1 parent 6db274e commit b7f8116
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion youtube_dl/YoutubeDL.py
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ def dl(name, info):
if info_dict.get('requested_formats') is not None:
downloaded = []
success = True
merger = FFmpegMergerPP(self)
merger = FFmpegMergerPP(self, not self.params.get('keepvideo'))
if not merger._get_executable():
postprocessors = []
self.report_warning('You have requested multiple '
Expand Down
6 changes: 5 additions & 1 deletion youtube_dl/postprocessor/ffmpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ class FFmpegPostProcessorError(PostProcessingError):
pass

class FFmpegPostProcessor(PostProcessor):
def __init__(self,downloader=None):
def __init__(self,downloader=None,deletetempfiles=False):
PostProcessor.__init__(self, downloader)
self._exes = self.detect_executables()
self._deletetempfiles = deletetempfiles

@staticmethod
def detect_executables():
Expand Down Expand Up @@ -60,6 +61,9 @@ def run_ffmpeg_multiple_files(self, input_paths, out_path, opts):
stderr = stderr.decode('utf-8', 'replace')
msg = stderr.strip().split('\n')[-1]
raise FFmpegPostProcessorError(msg)
if self._deletetempfiles:
for rempath in input_paths:
os.remove(rempath)

def run_ffmpeg(self, path, out_path, opts):
self.run_ffmpeg_multiple_files([path], out_path, opts)
Expand Down

0 comments on commit b7f8116

Please sign in to comment.