mirror of
https://codeberg.org/polarisfm/youtube-dl
synced 2024-11-22 16:44:32 +01:00
Merge branch 'embedthumb'
This commit is contained in:
commit
09aa111918
@ -240,9 +240,7 @@ def _real_main(argv=None):
|
|||||||
if opts.xattrs:
|
if opts.xattrs:
|
||||||
postprocessors.append({'key': 'XAttrMetadata'})
|
postprocessors.append({'key': 'XAttrMetadata'})
|
||||||
if opts.embedthumbnail:
|
if opts.embedthumbnail:
|
||||||
if not opts.addmetadata:
|
postprocessors.append({'key': 'EmbedThumbnail'})
|
||||||
postprocessors.append({'key': 'FFmpegAudioFix'})
|
|
||||||
postprocessors.append({'key': 'AtomicParsley'})
|
|
||||||
# Please keep ExecAfterDownload towards the bottom as it allows the user to modify the final file in any way.
|
# 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.
|
# So if the user is able to remove the file before your postprocessor runs it might cause a few problems.
|
||||||
if opts.exec_cmd:
|
if opts.exec_cmd:
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from .atomicparsley import AtomicParsleyPP
|
from .embedthumbnail import EmbedThumbnailPP
|
||||||
from .ffmpeg import (
|
from .ffmpeg import (
|
||||||
FFmpegPostProcessor,
|
FFmpegPostProcessor,
|
||||||
FFmpegAudioFixPP,
|
|
||||||
FFmpegEmbedSubtitlePP,
|
FFmpegEmbedSubtitlePP,
|
||||||
FFmpegExtractAudioPP,
|
FFmpegExtractAudioPP,
|
||||||
FFmpegFixupStretchedPP,
|
FFmpegFixupStretchedPP,
|
||||||
@ -23,9 +22,8 @@ def get_postprocessor(key):
|
|||||||
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'AtomicParsleyPP',
|
'EmbedThumbnailPP',
|
||||||
'ExecAfterDownloadPP',
|
'ExecAfterDownloadPP',
|
||||||
'FFmpegAudioFixPP',
|
|
||||||
'FFmpegEmbedSubtitlePP',
|
'FFmpegEmbedSubtitlePP',
|
||||||
'FFmpegExtractAudioPP',
|
'FFmpegExtractAudioPP',
|
||||||
'FFmpegFixupM4aPP',
|
'FFmpegFixupM4aPP',
|
||||||
|
@ -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
|
|
78
youtube_dl/postprocessor/embedthumbnail.py
Normal file
78
youtube_dl/postprocessor/embedthumbnail.py
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
from .ffmpeg import FFmpegPostProcessor
|
||||||
|
|
||||||
|
from ..compat import (
|
||||||
|
compat_urlretrieve,
|
||||||
|
)
|
||||||
|
from ..utils import (
|
||||||
|
check_executable,
|
||||||
|
encodeFilename,
|
||||||
|
PostProcessingError,
|
||||||
|
prepend_extension,
|
||||||
|
shell_quote
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class EmbedThumbnailPPError(PostProcessingError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class EmbedThumbnailPP(FFmpegPostProcessor):
|
||||||
|
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':
|
||||||
|
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)
|
||||||
|
|
||||||
|
self.run_ffmpeg(filename, temp_filename, options)
|
||||||
|
|
||||||
|
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
|
@ -280,6 +280,8 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
|
|||||||
errnote='Cannot update utime of audio file')
|
errnote='Cannot update utime of audio file')
|
||||||
|
|
||||||
information['filepath'] = new_path
|
information['filepath'] = new_path
|
||||||
|
information['ext'] = extension
|
||||||
|
|
||||||
return [path], information
|
return [path], information
|
||||||
|
|
||||||
|
|
||||||
@ -588,21 +590,6 @@ class FFmpegMergerPP(FFmpegPostProcessor):
|
|||||||
return info['__files_to_merge'], info
|
return info['__files_to_merge'], info
|
||||||
|
|
||||||
|
|
||||||
class FFmpegAudioFixPP(FFmpegPostProcessor):
|
|
||||||
def run(self, info):
|
|
||||||
filename = info['filepath']
|
|
||||||
temp_filename = prepend_extension(filename, 'temp')
|
|
||||||
|
|
||||||
options = ['-vn', '-acodec', 'copy']
|
|
||||||
self._downloader.to_screen('[ffmpeg] Fixing audio file "%s"' % filename)
|
|
||||||
self.run_ffmpeg(filename, temp_filename, options)
|
|
||||||
|
|
||||||
os.remove(encodeFilename(filename))
|
|
||||||
os.rename(encodeFilename(temp_filename), encodeFilename(filename))
|
|
||||||
|
|
||||||
return [], info
|
|
||||||
|
|
||||||
|
|
||||||
class FFmpegFixupStretchedPP(FFmpegPostProcessor):
|
class FFmpegFixupStretchedPP(FFmpegPostProcessor):
|
||||||
def run(self, info):
|
def run(self, info):
|
||||||
stretched_ratio = info.get('stretched_ratio')
|
stretched_ratio = info.get('stretched_ratio')
|
||||||
|
Loading…
Reference in New Issue
Block a user