mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-28 18:15:19 +02:00
[1tv] Improve extraction and add support for playlists (closes #11335)
This commit is contained in:
parent
8344296619
commit
9b5288c92a
@ -2,7 +2,10 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..compat import compat_urlparse
|
from ..compat import (
|
||||||
|
compat_str,
|
||||||
|
compat_urlparse,
|
||||||
|
)
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
int_or_none,
|
int_or_none,
|
||||||
qualities,
|
qualities,
|
||||||
@ -22,8 +25,7 @@ class FirstTVIE(InfoExtractor):
|
|||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '40049',
|
'id': '40049',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Гость Людмила Сенчина. Наедине со всеми. Выпуск от 12.02.2015',
|
'title': 'Гость Людмила Сенчина. Наедине со всеми. Выпуск от 12.02.2015',
|
||||||
'description': 'md5:36a39c1d19618fec57d12efe212a8370',
|
|
||||||
'thumbnail': 're:^https?://.*\.(?:jpg|JPG)$',
|
'thumbnail': 're:^https?://.*\.(?:jpg|JPG)$',
|
||||||
'upload_date': '20150212',
|
'upload_date': '20150212',
|
||||||
'duration': 2694,
|
'duration': 2694,
|
||||||
@ -34,8 +36,7 @@ class FirstTVIE(InfoExtractor):
|
|||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '364746',
|
'id': '364746',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Весенняя аллергия. Доброе утро. Фрагмент выпуска от 07.04.2016',
|
'title': 'Весенняя аллергия. Доброе утро. Фрагмент выпуска от 07.04.2016',
|
||||||
'description': 'md5:a242eea0031fd180a4497d52640a9572',
|
|
||||||
'thumbnail': 're:^https?://.*\.(?:jpg|JPG)$',
|
'thumbnail': 're:^https?://.*\.(?:jpg|JPG)$',
|
||||||
'upload_date': '20160407',
|
'upload_date': '20160407',
|
||||||
'duration': 179,
|
'duration': 179,
|
||||||
@ -44,6 +45,17 @@ class FirstTVIE(InfoExtractor):
|
|||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
|
}, {
|
||||||
|
'url': 'http://www.1tv.ru/news/issue/2016-12-01/14:00',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '14:00',
|
||||||
|
'title': 'Выпуск новостей в 14:00 1 декабря 2016 года. Новости. Первый канал',
|
||||||
|
'description': 'md5:2e921b948f8c1ff93901da78ebdb1dfd',
|
||||||
|
},
|
||||||
|
'playlist_count': 13,
|
||||||
|
}, {
|
||||||
|
'url': 'http://www.1tv.ru/shows/tochvtoch-supersezon/vystupleniya/evgeniy-dyatlov-vladimir-vysockiy-koni-priveredlivye-toch-v-toch-supersezon-fragment-vypuska-ot-06-11-2016',
|
||||||
|
'only_matching': True,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
@ -51,43 +63,66 @@ def _real_extract(self, url):
|
|||||||
|
|
||||||
webpage = self._download_webpage(url, display_id)
|
webpage = self._download_webpage(url, display_id)
|
||||||
playlist_url = compat_urlparse.urljoin(url, self._search_regex(
|
playlist_url = compat_urlparse.urljoin(url, self._search_regex(
|
||||||
r'data-playlist-url="([^"]+)', webpage, 'playlist url'))
|
r'data-playlist-url=(["\'])(?P<url>(?:(?!\1).)+)\1',
|
||||||
|
webpage, 'playlist url', group='url'))
|
||||||
|
|
||||||
item = self._download_json(playlist_url, display_id)[0]
|
parsed_url = compat_urlparse.urlparse(playlist_url)
|
||||||
video_id = item['id']
|
qs = compat_urlparse.parse_qs(parsed_url.query)
|
||||||
quality = qualities(('ld', 'sd', 'hd', ))
|
item_ids = qs.get('videos_ids[]') or qs.get('news_ids[]')
|
||||||
formats = []
|
|
||||||
for f in item.get('mbr', []):
|
items = self._download_json(playlist_url, display_id)
|
||||||
src = f.get('src')
|
|
||||||
if not src:
|
if item_ids:
|
||||||
continue
|
items = [
|
||||||
fname = f.get('name')
|
item for item in items
|
||||||
formats.append({
|
if item.get('uid') and compat_str(item['uid']) in item_ids]
|
||||||
'url': src,
|
else:
|
||||||
'format_id': fname,
|
items = [items[0]]
|
||||||
'quality': quality(fname),
|
|
||||||
|
entries = []
|
||||||
|
QUALITIES = ('ld', 'sd', 'hd', )
|
||||||
|
|
||||||
|
for item in items:
|
||||||
|
title = item['title']
|
||||||
|
quality = qualities(QUALITIES)
|
||||||
|
formats = []
|
||||||
|
for f in item.get('mbr', []):
|
||||||
|
src = f.get('src')
|
||||||
|
if not src or not isinstance(src, compat_str):
|
||||||
|
continue
|
||||||
|
tbr = int_or_none(self._search_regex(
|
||||||
|
r'_(\d{3,})\.mp4', src, 'tbr', default=None))
|
||||||
|
formats.append({
|
||||||
|
'url': src,
|
||||||
|
'format_id': f.get('name'),
|
||||||
|
'tbr': tbr,
|
||||||
|
'quality': quality(f.get('name')),
|
||||||
|
})
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
thumbnail = item.get('poster') or self._og_search_thumbnail(webpage)
|
||||||
|
duration = int_or_none(item.get('duration') or self._html_search_meta(
|
||||||
|
'video:duration', webpage, 'video duration', fatal=False))
|
||||||
|
upload_date = unified_strdate(self._html_search_meta(
|
||||||
|
'ya:ovs:upload_date', webpage, 'upload date', default=None))
|
||||||
|
|
||||||
|
entries.append({
|
||||||
|
'id': item.get('id') or uid,
|
||||||
|
'thumbnail': thumbnail,
|
||||||
|
'title': title,
|
||||||
|
'upload_date': upload_date,
|
||||||
|
'duration': int_or_none(duration),
|
||||||
|
'formats': formats
|
||||||
})
|
})
|
||||||
self._sort_formats(formats)
|
|
||||||
|
|
||||||
title = self._html_search_regex(
|
title = self._html_search_regex(
|
||||||
(r'<div class="tv_translation">\s*<h1><a href="[^"]+">([^<]*)</a>',
|
(r'<div class="tv_translation">\s*<h1><a href="[^"]+">([^<]*)</a>',
|
||||||
r"'title'\s*:\s*'([^']+)'"),
|
r"'title'\s*:\s*'([^']+)'"),
|
||||||
webpage, 'title', default=None) or item['title']
|
webpage, 'title', default=None) or self._og_search_title(
|
||||||
|
webpage, default=None)
|
||||||
description = self._html_search_regex(
|
description = self._html_search_regex(
|
||||||
r'<div class="descr">\s*<div> </div>\s*<p>([^<]*)</p></div>',
|
r'<div class="descr">\s*<div> </div>\s*<p>([^<]*)</p></div>',
|
||||||
webpage, 'description', default=None) or self._html_search_meta(
|
webpage, 'description', default=None) or self._html_search_meta(
|
||||||
'description', webpage, 'description')
|
'description', webpage, 'description', default=None)
|
||||||
duration = int_or_none(self._html_search_meta(
|
|
||||||
'video:duration', webpage, 'video duration', fatal=False))
|
|
||||||
upload_date = unified_strdate(self._html_search_meta(
|
|
||||||
'ya:ovs:upload_date', webpage, 'upload date', fatal=False))
|
|
||||||
|
|
||||||
return {
|
return self.playlist_result(entries, display_id, title, description)
|
||||||
'id': video_id,
|
|
||||||
'thumbnail': item.get('poster') or self._og_search_thumbnail(webpage),
|
|
||||||
'title': title,
|
|
||||||
'description': description,
|
|
||||||
'upload_date': upload_date,
|
|
||||||
'duration': int_or_none(duration),
|
|
||||||
'formats': formats
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user