mirror of
https://gitlab.com/dstftw/youtube-dl.git
synced 2020-11-16 09:42:26 +00:00
[lifenews] Add support for multiple videos on the same page (#2482)
This commit is contained in:
parent
f604c93c64
commit
fc26f3b4c2
|
@ -6,7 +6,8 @@ import re
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
int_or_none,
|
int_or_none,
|
||||||
unified_strdate
|
unified_strdate,
|
||||||
|
ExtractorError,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -34,11 +35,9 @@ class LifeNewsIE(InfoExtractor):
|
||||||
|
|
||||||
webpage = self._download_webpage('http://lifenews.ru/news/%s' % video_id, video_id, 'Downloading page')
|
webpage = self._download_webpage('http://lifenews.ru/news/%s' % video_id, video_id, 'Downloading page')
|
||||||
|
|
||||||
video_url = self._html_search_regex(
|
videos = re.findall(r'<video.*?poster="(?P<poster>[^"]+)".*?src="(?P<video>[^"]+)".*?></video>', webpage)
|
||||||
r'<video.*?src="([^"]+)".*?></video>', webpage, 'video URL')
|
if not videos:
|
||||||
|
raise ExtractorError('No media links available for %s' % video_id)
|
||||||
thumbnail = self._html_search_regex(
|
|
||||||
r'<video.*?poster="([^"]+)".*?"></video>', webpage, 'video thumbnail')
|
|
||||||
|
|
||||||
title = self._og_search_title(webpage)
|
title = self._og_search_title(webpage)
|
||||||
TITLE_SUFFIX = ' - Первый по срочным новостям — LIFE | NEWS'
|
TITLE_SUFFIX = ' - Первый по срочным новостям — LIFE | NEWS'
|
||||||
|
@ -57,13 +56,19 @@ class LifeNewsIE(InfoExtractor):
|
||||||
if upload_date is not None:
|
if upload_date is not None:
|
||||||
upload_date = unified_strdate(upload_date)
|
upload_date = unified_strdate(upload_date)
|
||||||
|
|
||||||
return {
|
def make_entry(video_id, media, video_number=None):
|
||||||
'id': video_id,
|
return {
|
||||||
'url': video_url,
|
'id': video_id,
|
||||||
'thumbnail': thumbnail,
|
'url': media[1],
|
||||||
'title': title,
|
'thumbnail': media[0],
|
||||||
'description': description,
|
'title': title if video_number is None else '%s-video%s' % (title, video_number),
|
||||||
'view_count': int_or_none(view_count),
|
'description': description,
|
||||||
'comment_count': int_or_none(comment_count),
|
'view_count': int_or_none(view_count),
|
||||||
'upload_date': upload_date,
|
'comment_count': int_or_none(comment_count),
|
||||||
}
|
'upload_date': upload_date,
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(videos) == 1:
|
||||||
|
return make_entry(video_id, videos[0])
|
||||||
|
else:
|
||||||
|
return [make_entry(video_id, media, video_number+1) for video_number, media in enumerate(videos)]
|
Loading…
Reference in a new issue