projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
06cd4cd
)
[youtube] Fix empty description extraction (#26575) (closes #26006)
author
Daniel Peukert
<dan.peukert@gmail.com>
Sun, 13 Sep 2020 14:23:21 +0000
(16:23 +0200)
committer
GitHub
<noreply@github.com>
Sun, 13 Sep 2020 14:23:21 +0000
(21:23 +0700)
youtube_dl/extractor/youtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/youtube.py
b/youtube_dl/extractor/youtube.py
index 6ae2e58c17651e4d3928d734543775c0736f7502..02f3ab61aef7be11e68f7f16985823b9d908e70e 100644
(file)
--- a/
youtube_dl/extractor/youtube.py
+++ b/
youtube_dl/extractor/youtube.py
@@
-1264,7
+1264,23
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
'params': {
'skip_download': True,
},
'params': {
'skip_download': True,
},
- }
+ },
+ {
+ # empty description results in an empty string
+ 'url': 'https://www.youtube.com/watch?v=x41yOUIvK2k',
+ 'info_dict': {
+ 'id': 'x41yOUIvK2k',
+ 'ext': 'mp4',
+ 'title': 'IMG 3456',
+ 'description': '',
+ 'upload_date': '20170613',
+ 'uploader_id': 'ElevageOrVert',
+ 'uploader': 'ElevageOrVert',
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ },
]
def __init__(self, *args, **kwargs):
]
def __init__(self, *args, **kwargs):
@@
-1931,7
+1947,9
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
''', replace_url, video_description)
video_description = clean_html(video_description)
else:
''', replace_url, video_description)
video_description = clean_html(video_description)
else:
- video_description = video_details.get('shortDescription') or self._html_search_meta('description', video_webpage)
+ video_description = video_details.get('shortDescription')
+ if video_description is None:
+ video_description = self._html_search_meta('description', video_webpage)
if not smuggled_data.get('force_singlefeed', False):
if not self._downloader.params.get('noplaylist'):
if not smuggled_data.get('force_singlefeed', False):
if not self._downloader.params.get('noplaylist'):