projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0645be4
)
[tvnet] Improve video id extraction
author
Sergey M․
<dstftw@gmail.com>
Mon, 11 Jun 2018 18:50:43 +0000
(
01:50
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 11 Jun 2018 18:50:43 +0000
(
01:50
+0700)
youtube_dl/extractor/tvnet.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tvnet.py
b/youtube_dl/extractor/tvnet.py
index 0ec2da4da9361d7f10873cec63c13c0549d1ddac..1083d2730a0141b03abd0e6113a157c25e7eaa19 100644
(file)
--- a/
youtube_dl/extractor/tvnet.py
+++ b/
youtube_dl/extractor/tvnet.py
@@
-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 = [{
# video
'url': 'http://de.tvnet.gov.vn/video/109788/vtv1---bac-tuyet-tai-lao-cai-va-ha-giang/tin-nong-24h',
_TESTS = [{
# video
'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)',
'is_live': False,
},
'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)',
'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
'url': 'http://us.tvnet.gov.vn/kenh-truyen-hinh/1011/vtv1',
}, {
# live stream
'url': 'http://us.tvnet.gov.vn/kenh-truyen-hinh/1011/vtv1',
@@
-62,6
+74,9
@@
class TVNetIE(InfoExtractor):
'params': {
'skip_download': True,
},
'params': {
'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):