[tvnet] Improve video id extraction

This commit is contained in:
Sergey M․ 2018-06-12 01:50:43 +07:00
parent 0645be49cb
commit e51752754d
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 16 additions and 1 deletions

View File

@ -12,7 +12,7 @@ from ..utils import (
class TVNetIE(InfoExtractor): class TVNetIE(InfoExtractor):
_VALID_URL = r'https?://(?:[^/]+)\.tvnet\.gov\.vn/[^/]+/(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:[^/]+)\.tvnet\.gov\.vn/[^/]+/(?:\d+/)?(?P<id>[0-9]+)/'
_TESTS = [{ _TESTS = [{
# video # video
'url': 'http://de.tvnet.gov.vn/video/109788/vtv1---bac-tuyet-tai-lao-cai-va-ha-giang/tin-nong-24h', 'url': 'http://de.tvnet.gov.vn/video/109788/vtv1---bac-tuyet-tai-lao-cai-va-ha-giang/tin-nong-24h',
@ -36,6 +36,18 @@ class TVNetIE(InfoExtractor):
'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)', 'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)',
'is_live': False, 'is_live': False,
}, },
}, {
'url': 'http://us.tvnet.gov.vn/video/118023/129999/ngay-0705',
'info_dict': {
'id': '129999',
'ext': 'mp4',
'title': 'VTV1 - Quốc hội với cử tri (11/06/2018)',
'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)',
'is_live': False,
},
'params': {
'skip_download': True,
},
}, { }, {
# live stream # live stream
'url': 'http://us.tvnet.gov.vn/kenh-truyen-hinh/1011/vtv1', 'url': 'http://us.tvnet.gov.vn/kenh-truyen-hinh/1011/vtv1',
@ -62,6 +74,9 @@ class TVNetIE(InfoExtractor):
'params': { 'params': {
'skip_download': True, 'skip_download': True,
}, },
}, {
'url': 'http://us.tvnet.gov.vn/phim/6136/25510/vtv3---ca-mot-doi-an-oan-tap-1-50/phim-truyen-hinh',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):