diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-05-04 03:35:19 -0700 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-05-04 03:35:19 -0700 | 
| commit | 086d7b4500dad720e548233e425b4c08bfe99e3e (patch) | |
| tree | 68439451ffc3662d1a73d531ced461f3089b1bf2 | |
| parent | 891629c84aae0ec81cf748dddbb77c54969667a1 (diff) | |
| parent | e74c504f91a982b36fc27229b13d3aac8d624278 (diff) | |
Merge pull request #802 from joeframbach/master
If path and new_path are the same, then dont delete the file
| -rw-r--r-- | youtube_dl/PostProcessor.py | 7 | 
1 files changed, 6 insertions, 1 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index 70dc01004..0c6885dda 100644 --- a/youtube_dl/PostProcessor.py +++ b/youtube_dl/PostProcessor.py @@ -188,6 +188,11 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):          prefix, sep, ext = path.rpartition(u'.') # not os.path.splitext, since the latter does not work on unicode in all setups          new_path = prefix + sep + extension + +        # If we download foo.mp3 and convert it to... foo.mp3, then don't delete foo.mp3, silly. +        if new_path == path: +            self._nopostoverwrites = True +          try:              if self._nopostoverwrites and os.path.exists(encodeFilename(new_path)):                  self._downloader.to_screen(u'[youtube] Post-process file %s exists, skipping' % new_path) @@ -210,7 +215,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):                  self._downloader.to_stderr(u'WARNING: Cannot update utime of audio file')          information['filepath'] = new_path -        return False,information +        return self._nopostoverwrites,information  class FFmpegVideoConvertor(FFmpegPostProcessor):      def __init__(self, downloader=None,preferedformat=None):  | 
