[liveleak] Support multi-video pages (closes #6542)
This commit is contained in:
parent
e2481b9b6e
commit
381ad4f309
2 changed files with 28 additions and 16 deletions
|
@ -4,6 +4,7 @@ Core
|
||||||
* [utils] Fix unescapeHTML for misformed string like "&a"" (#13935)
|
* [utils] Fix unescapeHTML for misformed string like "&a"" (#13935)
|
||||||
|
|
||||||
Extractors
|
Extractors
|
||||||
|
+ [liveleak] Support multi-video pages (#6542)
|
||||||
+ [liveleak] Support another liveleak embedding pattern (#13336)
|
+ [liveleak] Support another liveleak embedding pattern (#13336)
|
||||||
* [cda] Fix extraction (#13935)
|
* [cda] Fix extraction (#13935)
|
||||||
|
|
||||||
|
|
|
@ -72,6 +72,13 @@ class LiveLeakIE(InfoExtractor):
|
||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'https://www.liveleak.com/view?i=677_1439397581',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '677_1439397581',
|
||||||
|
'title': 'Fuel Depot in China Explosion caught on video',
|
||||||
|
},
|
||||||
|
'playlist_count': 3,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
@ -109,8 +116,7 @@ class LiveLeakIE(InfoExtractor):
|
||||||
'age_limit': age_limit,
|
'age_limit': age_limit,
|
||||||
}
|
}
|
||||||
|
|
||||||
info_dict = entries[0]
|
for idx, info_dict in enumerate(entries):
|
||||||
|
|
||||||
for a_format in info_dict['formats']:
|
for a_format in info_dict['formats']:
|
||||||
if not a_format.get('height'):
|
if not a_format.get('height'):
|
||||||
a_format['height'] = int_or_none(self._search_regex(
|
a_format['height'] = int_or_none(self._search_regex(
|
||||||
|
@ -119,8 +125,13 @@ class LiveLeakIE(InfoExtractor):
|
||||||
|
|
||||||
self._sort_formats(info_dict['formats'])
|
self._sort_formats(info_dict['formats'])
|
||||||
|
|
||||||
|
# Don't append entry ID for one-video pages to keep backward compatibility
|
||||||
|
if len(entries) > 1:
|
||||||
|
info_dict['id'] = '%s_%s' % (video_id, idx + 1)
|
||||||
|
else:
|
||||||
|
info_dict['id'] = video_id
|
||||||
|
|
||||||
info_dict.update({
|
info_dict.update({
|
||||||
'id': video_id,
|
|
||||||
'title': video_title,
|
'title': video_title,
|
||||||
'description': video_description,
|
'description': video_description,
|
||||||
'uploader': video_uploader,
|
'uploader': video_uploader,
|
||||||
|
@ -128,7 +139,7 @@ class LiveLeakIE(InfoExtractor):
|
||||||
'thumbnail': video_thumbnail,
|
'thumbnail': video_thumbnail,
|
||||||
})
|
})
|
||||||
|
|
||||||
return info_dict
|
return self.playlist_result(entries, video_id, video_title)
|
||||||
|
|
||||||
|
|
||||||
class LiveLeakEmbedIE(InfoExtractor):
|
class LiveLeakEmbedIE(InfoExtractor):
|
||||||
|
|
Loading…
Reference in a new issue