diff options
| -rw-r--r-- | youtube_dl/__init__.py | 4 | ||||
| -rw-r--r-- | youtube_dl/postprocessor/__init__.py | 4 | ||||
| -rw-r--r-- | youtube_dl/postprocessor/atomicparsley.py | 62 | ||||
| -rw-r--r-- | youtube_dl/postprocessor/embedthumbnail.py | 87 | ||||
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 2 |
5 files changed, 92 insertions, 67 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 1c8b411b7..d7759db68 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -240,9 +240,7 @@ def _real_main(argv=None): if opts.xattrs: postprocessors.append({'key': 'XAttrMetadata'}) if opts.embedthumbnail: - if not opts.addmetadata: - postprocessors.append({'key': 'FFmpegAudioFix'}) - postprocessors.append({'key': 'AtomicParsley'}) + postprocessors.append({'key': 'EmbedThumbnail'}) # Please keep ExecAfterDownload towards the bottom as it allows the user to modify the final file in any way. # So if the user is able to remove the file before your postprocessor runs it might cause a few problems. if opts.exec_cmd: diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py index f39acadce..ab7f1a29a 100644 --- a/youtube_dl/postprocessor/__init__.py +++ b/youtube_dl/postprocessor/__init__.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from .atomicparsley import AtomicParsleyPP +from .embedthumbnail import EmbedThumbnailPP from .ffmpeg import ( FFmpegPostProcessor, FFmpegAudioFixPP, @@ -23,7 +23,7 @@ def get_postprocessor(key): __all__ = [ - 'AtomicParsleyPP', + 'EmbedThumbnailPP', 'ExecAfterDownloadPP', 'FFmpegAudioFixPP', 'FFmpegEmbedSubtitlePP', diff --git a/youtube_dl/postprocessor/atomicparsley.py b/youtube_dl/postprocessor/atomicparsley.py deleted file mode 100644 index e4e198695..000000000 --- a/youtube_dl/postprocessor/atomicparsley.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - - -import os -import subprocess - -from .common import PostProcessor -from ..compat import ( - compat_urlretrieve, -) -from ..utils import ( - check_executable, - encodeFilename, - PostProcessingError, - prepend_extension, - shell_quote -) - - -class AtomicParsleyPPError(PostProcessingError): - pass - - -class AtomicParsleyPP(PostProcessor): - def run(self, info): - if not check_executable('AtomicParsley', ['-v']): - raise AtomicParsleyPPError('AtomicParsley was not found. Please install.') - - filename = info['filepath'] - temp_filename = prepend_extension(filename, 'temp') - temp_thumbnail = prepend_extension(filename, 'thumb') - - if not info.get('thumbnail'): - raise AtomicParsleyPPError('Thumbnail was not found. Nothing to do.') - - compat_urlretrieve(info['thumbnail'], temp_thumbnail) - - cmd = ['AtomicParsley', filename, '--artwork', temp_thumbnail, '-o', temp_filename] - - self._downloader.to_screen('[atomicparsley] Adding thumbnail to "%s"' % filename) - - if self._downloader.params.get('verbose', False): - self._downloader.to_screen('[debug] AtomicParsley command line: %s' % shell_quote(cmd)) - - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = p.communicate() - - if p.returncode != 0: - msg = stderr.decode('utf-8', 'replace').strip() - raise AtomicParsleyPPError(msg) - - os.remove(encodeFilename(temp_thumbnail)) - # for formats that don't support thumbnails (like 3gp) AtomicParsley - # won't create to the temporary file - if b'No changes' in stdout: - self._downloader.report_warning('The file format doesn\'t support embedding a thumbnail') - else: - os.remove(encodeFilename(filename)) - os.rename(encodeFilename(temp_filename), encodeFilename(filename)) - - return [], info diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dl/postprocessor/embedthumbnail.py new file mode 100644 index 000000000..b6507db27 --- /dev/null +++ b/youtube_dl/postprocessor/embedthumbnail.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + + +import os +import subprocess + +from .common import PostProcessor +from ..compat import ( + compat_urlretrieve, +) +from ..utils import ( + check_executable, + encodeFilename, + PostProcessingError, + prepend_extension, + shell_quote +) + + +class EmbedThumbnailPPError(PostProcessingError): + pass + + +class EmbedThumbnailPP(PostProcessor): + def run(self, info): + filename = info['filepath'] + temp_filename = prepend_extension(filename, 'temp') + temp_thumbnail = prepend_extension(filename, 'thumb') + + if not info.get('thumbnail'): + raise EmbedThumbnailPPError('Thumbnail was not found. Nothing to do.') + + compat_urlretrieve(info['thumbnail'], temp_thumbnail) + + if info['ext'] == 'mp3': + if not check_executable('ffmpeg', ['-version']): + raise AtomicParsleyPPError('FFmpeg was not found. Please install.') + + cmd = ['ffmpeg', '-i', filename, '-i', temp_thumbnail, '-c', 'copy', '-map', '0', '-map', '1', '-metadata:s:v', 'title="Album cover"', '-metadata:s:v', 'comment="Cover (Front)"', temp_filename] + + self._downloader.to_screen('[ffmpeg] Adding thumbnail to "%s"' % filename) + + if self._downloader.params.get('verbose', False): + self._downloader.to_screen('[debug] FFmpeg command line: %s' % shell_quote(cmd)) + + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + + if p.returncode != 0: + msg = stderr.decode('utf-8', 'replace').strip() + raise EmbedThumbnailPPError(msg) + + os.remove(encodeFilename(temp_thumbnail)) + os.remove(encodeFilename(filename)) + os.rename(encodeFilename(temp_filename), encodeFilename(filename)) + + elif info['ext'] == 'm4a': + if not check_executable('AtomicParsley', ['-v']): + raise EmbedThumbnailPPError('AtomicParsley was not found. Please install.') + + cmd = ['AtomicParsley', filename, '--artwork', temp_thumbnail, '-o', temp_filename] + + self._downloader.to_screen('[atomicparsley] Adding thumbnail to "%s"' % filename) + + if self._downloader.params.get('verbose', False): + self._downloader.to_screen('[debug] AtomicParsley command line: %s' % shell_quote(cmd)) + + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + + if p.returncode != 0: + msg = stderr.decode('utf-8', 'replace').strip() + raise EmbedThumbnailPPError(msg) + + os.remove(encodeFilename(temp_thumbnail)) + # for formats that don't support thumbnails (like 3gp) AtomicParsley + # won't create to the temporary file + if b'No changes' in stdout: + self._downloader.report_warning('The file format doesn\'t support embedding a thumbnail') + else: + os.remove(encodeFilename(filename)) + os.rename(encodeFilename(temp_filename), encodeFilename(filename)) + else: + raise EmbedThumbnailPPError('Only mp3 and m4a are supported for thumbnail embedding for now.') + + return [], info diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index df6fb6665..c01f2eedd 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -280,6 +280,8 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): errnote='Cannot update utime of audio file') information['filepath'] = new_path + information['ext'] = extension + return [path], information |