Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[postprocessor/embedthumbnail] Use thumbnails downloaded by YoutubeDL

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-05-14 02:32:00 +08:00
parent 3749e36e9f
commit 8e59539752
3 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
youtube_dl/postprocessor/embedthumbnail.py
View file

@ -7,11 +7,7 @@ import subprocess
from .ffmpeg import FFmpegPostProcessor
from ..compat import (
compat_urlretrieve,
)
from ..utils import (
determine_ext,
check_executable,
encodeFilename,
PostProcessingError,
@ -25,26 +21,30 @@ class EmbedThumbnailPPError(PostProcessingError):
class EmbedThumbnailPP(FFmpegPostProcessor):
def __init__(self, downloader=None, already_have_thumbnail=False):
super(EmbedThumbnailPP, self).__init__(downloader)
self._already_have_thumbnail = already_have_thumbnail
def run(self, info):
filename = info['filepath']
temp_filename = prepend_extension(filename, 'temp')
temp_thumbnail = filename + '.' + determine_ext(info['thumbnail'])
if not info.get('thumbnail'):
if not info.get('thumbnails'):
raise EmbedThumbnailPPError('Thumbnail was not found. Nothing to do.')
compat_urlretrieve(info['thumbnail'], temp_thumbnail)
thumbnail_filename = info['thumbnails'][-1]['filename']
if info['ext'] == 'mp3':
options = [
'-i', temp_thumbnail, '-c', 'copy', '-map', '0', '-map', '1',
'-i', thumbnail_filename, '-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)
self.run_ffmpeg(filename, temp_filename, options)
os.remove(encodeFilename(temp_thumbnail))
if not self._already_have_thumbnail:
os.remove(encodeFilename(thumbnail_filename))
os.remove(encodeFilename(filename))
os.rename(encodeFilename(temp_filename), encodeFilename(filename))
@ -52,7 +52,7 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
if not check_executable('AtomicParsley', ['-v']):
raise EmbedThumbnailPPError('AtomicParsley was not found. Please install.')
cmd = ['AtomicParsley', filename, '--artwork', temp_thumbnail, '-o', temp_filename]
cmd = ['AtomicParsley', filename, '--artwork', thumbnail_filename, '-o', temp_filename]
self._downloader.to_screen('[atomicparsley] Adding thumbnail to "%s"' % filename)
@ -66,7 +66,8 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
msg = stderr.decode('utf-8', 'replace').strip()
raise EmbedThumbnailPPError(msg)
os.remove(encodeFilename(temp_thumbnail))
if not self._already_have_thumbnail:
os.remove(encodeFilename(thumbnail_filename))
# for formats that don't support thumbnails (like 3gp) AtomicParsley
# won't create to the temporary file
if b'No changes' in stdout: