projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix uploader id and uploader URL extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
tvnet.py
diff --git
a/youtube_dl/extractor/tvnet.py
b/youtube_dl/extractor/tvnet.py
index 1083d2730a0141b03abd0e6113a157c25e7eaa19..4222ff9ee239fd2b55cc7771892ace9f3c59d43f 100644
(file)
--- a/
youtube_dl/extractor/tvnet.py
+++ b/
youtube_dl/extractor/tvnet.py
@@
-4,15
+4,15
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..compat import compat_str
from ..utils import (
int_or_none,
unescapeHTML,
from ..utils import (
int_or_none,
unescapeHTML,
+ url_or_none,
)
class TVNetIE(InfoExtractor):
)
class TVNetIE(InfoExtractor):
- _VALID_URL = r'https?://(?:[^/]+)\.tvnet\.gov\.vn/[^/]+/(?:\d+/)?(?P<id>
[0-9]+)/
'
+ _VALID_URL = r'https?://(?:[^/]+)\.tvnet\.gov\.vn/[^/]+/(?:\d+/)?(?P<id>
\d+)(?:/|$)
'
_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',
@@
-106,9
+106,8
@@
class TVNetIE(InfoExtractor):
for stream in self._download_json(data_file, video_id):
if not isinstance(stream, dict):
continue
for stream in self._download_json(data_file, video_id):
if not isinstance(stream, dict):
continue
- stream_url = stream.get('url')
- if (stream_url in stream_urls or not stream_url or
- not isinstance(stream_url, compat_str)):
+ stream_url = url_or_none(stream.get('url'))
+ if stream_url in stream_urls or not stream_url:
continue
stream_urls.add(stream_url)
formats.extend(self._extract_m3u8_formats(
continue
stream_urls.add(stream_url)
formats.extend(self._extract_m3u8_formats(