Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-11 06:27:14 +08:00
Code Issues Releases Wiki Activity

[VTV] Improve based on code review

Browse Source
This commit is contained in:
Thomas van der Berg 2018-02-08 23:19:28 +01:00
parent b2247d5125
commit c045997cbb
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
youtube_dl/extractor/vtv.py
View File

@ -8,17 +8,19 @@ import re
from ..utils import extract_attributes
class VTVIE(InfoExtractor):
_VALID_URL = r'https?://..\.tvnet\.gov\.vn/[^/]*/(?P<id>[0-9]+)/?.*'
_VALID_URL = r'https?://(au|ca|cz|de|jp|kr|tw|us|vn)\.tvnet\.gov\.vn/[^/]*/(?P<id>[0-9]+)/?'
_TESTS = [{
# Livestream. Channel: VTV 1
'url': 'http://us.tvnet.gov.vn/kenh-truyen-hinh/1011/vtv1',
'info_dict': {
'id': '1011',
'ext': 'mp4',
'title': r're:VTV1 | LiveTV - TV Net .*',
'title': r're:^VTV1 | LiveTV - TV Net [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
'thumbnail': r're:https?://.*\.png$',
}
}, {
'url': 'http://us.tvnet.gov.vn/video/109788/vtv1---bac-tuyet-tai-lao-cai-va-ha-giang/tin-nong-24h',
# Downloading a video.
'url': 'http://de.tvnet.gov.vn/video/109788/vtv1---bac-tuyet-tai-lao-cai-va-ha-giang/tin-nong-24h',
'md5': '5263c63d738569ed507980f1e49ebc03',
'info_dict': {
'id': '109788',
@ -27,11 +29,13 @@ class VTVIE(InfoExtractor):
'thumbnail': r're:https?://.*\.JPG$',
}
}, {
'url': 'http://us.tvnet.gov.vn/kenh-truyen-hinh/1014',
# Radio live stream. Channel: VOV 1
'url': 'http://vn.tvnet.gov.vn/kenh-truyen-hinh/1014',
'info_dict': {
'id': '1014',
'ext': 'm4a',
'title': r're:VOV1 | LiveTV - TV Net .*',
'vcodec': 'none',
'title': r're:VOV1 | LiveTV - TV Net [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
'thumbnail': r're:https?://.*\.png$',
}
@ -41,7 +45,7 @@ class VTVIE(InfoExtractor):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title', fatal=False)
title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title', default=None, fatal=False)
if title is None:
title = self._og_search_title(webpage)
title.strip()
@ -51,25 +55,26 @@ class VTVIE(InfoExtractor):
thumbnail = mediaplayer_div_attributes.get("data-image")
json_url = mediaplayer_div_attributes.get("data-file")
json_url = mediaplayer_div_attributes["data-file"]
video_streams = self._download_json(json_url, video_id)
# little hack to better support radio streams
if title.startswith("VOV"):
ext = "m4a"
else:
ext = "mp4"
# get any working playlist from streams. Currently there's 2 and the first always works,
# but you never know in the future
for stream in video_streams:
formats = self._extract_m3u8_formats(stream.get("url"), video_id, ext=ext, fatal=False)
if len(formats) != 0:
formats = self._extract_m3u8_formats(stream.get("url"), video_id, ext="mp4", fatal=False)
if formats:
break
if re.match(r'https?://[^/]*/video/.*', url) is not None:
# better support radio streams
if title.startswith("VOV"):
for f in formats:
f["ext"] = "m4a"
f["vcodec"] = "none"
if "/video/" in url or "/radio/" in url:
is_live = False
elif re.match(r'https?://[^/]*/kenh-truyen-hinh/.*', url) is not None:
elif "/kenh-truyen-hinh/" in url:
is_live = True
else:
is_live = None