projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[soundcloud] Reduce pagination limit to fix 502 Bad Gateway errors when listing a...
[youtube-dl]
/
youtube_dl
/
postprocessor
/
embedthumbnail.py
diff --git
a/youtube_dl/postprocessor/embedthumbnail.py
b/youtube_dl/postprocessor/embedthumbnail.py
index 8f825f7859058c9c40cd55e50ec9832a92858c32..56be914b8f1b6e98802163ae1013392079d93fb3 100644
(file)
--- a/
youtube_dl/postprocessor/embedthumbnail.py
+++ b/
youtube_dl/postprocessor/embedthumbnail.py
@@
-1,4
+1,4
@@
-#
-*- coding: utf-8 -*-
+#
coding: utf-8
from __future__ import unicode_literals
from __future__ import unicode_literals
@@
-31,10
+31,16
@@
class EmbedThumbnailPP(FFmpegPostProcessor):
temp_filename = prepend_extension(filename, 'temp')
if not info.get('thumbnails'):
temp_filename = prepend_extension(filename, 'temp')
if not info.get('thumbnails'):
- raise EmbedThumbnailPPError('Thumbnail was not found. Nothing to do.')
+ self._downloader.to_screen('[embedthumbnail] There aren\'t any thumbnails to embed')
+ return [], info
thumbnail_filename = info['thumbnails'][-1]['filename']
thumbnail_filename = info['thumbnails'][-1]['filename']
+ if not os.path.exists(encodeFilename(thumbnail_filename)):
+ self._downloader.report_warning(
+ 'Skipping embedding the thumbnail because the file is missing.')
+ return [], info
+
if info['ext'] == 'mp3':
options = [
'-c', 'copy', '-map', '0', '-map', '1',
if info['ext'] == 'mp3':
options = [
'-c', 'copy', '-map', '0', '-map', '1',
@@
-49,7
+55,7
@@
class EmbedThumbnailPP(FFmpegPostProcessor):
os.remove(encodeFilename(filename))
os.rename(encodeFilename(temp_filename), encodeFilename(filename))
os.remove(encodeFilename(filename))
os.rename(encodeFilename(temp_filename), encodeFilename(filename))
- elif info['ext']
== 'm4a'
:
+ elif info['ext']
in ['m4a', 'mp4']
:
if not check_executable('AtomicParsley', ['-v']):
raise EmbedThumbnailPPError('AtomicParsley was not found. Please install.')
if not check_executable('AtomicParsley', ['-v']):
raise EmbedThumbnailPPError('AtomicParsley was not found. Please install.')
@@
-82,6
+88,6
@@
class EmbedThumbnailPP(FFmpegPostProcessor):
os.remove(encodeFilename(filename))
os.rename(encodeFilename(temp_filename), encodeFilename(filename))
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.')
+ raise EmbedThumbnailPPError('Only mp3 and m4a
/mp4
are supported for thumbnail embedding for now.')
return [], info
return [], info