From ddbed36455f8b3053f38d84b2e62e2fb5cd66eac Mon Sep 17 00:00:00 2001 From: pulpe Date: Fri, 24 Apr 2015 08:48:49 +0200 Subject: [embedthumbnail] Add support for mp3 cover embedding --- youtube_dl/postprocessor/embedthumbnail.py | 87 ++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 youtube_dl/postprocessor/embedthumbnail.py (limited to 'youtube_dl/postprocessor/embedthumbnail.py') 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 -- cgit v1.2.3 From 31fd9c76013faaa86b0c515d9305de548856ef84 Mon Sep 17 00:00:00 2001 From: pulpe Date: Fri, 24 Apr 2015 09:08:57 +0200 Subject: [embedthumbnail] use FFmpegPostProcessor for mp3 --- youtube_dl/postprocessor/embedthumbnail.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'youtube_dl/postprocessor/embedthumbnail.py') diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dl/postprocessor/embedthumbnail.py index b6507db27..a2d6b14db 100644 --- a/youtube_dl/postprocessor/embedthumbnail.py +++ b/youtube_dl/postprocessor/embedthumbnail.py @@ -5,7 +5,8 @@ from __future__ import unicode_literals import os import subprocess -from .common import PostProcessor +from .ffmpeg import FFmpegPostProcessor + from ..compat import ( compat_urlretrieve, ) @@ -22,7 +23,7 @@ class EmbedThumbnailPPError(PostProcessingError): pass -class EmbedThumbnailPP(PostProcessor): +class EmbedThumbnailPP(FFmpegPostProcessor): def run(self, info): filename = info['filepath'] temp_filename = prepend_extension(filename, 'temp') @@ -34,22 +35,12 @@ class EmbedThumbnailPP(PostProcessor): 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] + options = ['-i', temp_thumbnail, '-c', 'copy', '-map', '0', '-map', '1', + '-metadata:s:v', 'title="Album cover"', '-metadata:s:v', 'comment="Cover (Front)"'] 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) + self.run_ffmpeg(filename, temp_filename, options) os.remove(encodeFilename(temp_thumbnail)) os.remove(encodeFilename(filename)) -- cgit v1.2.3