projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[downloader/http] Simplify
[youtube-dl]
/
youtube_dl
/
extractor
/
letv.py
diff --git
a/youtube_dl/extractor/letv.py
b/youtube_dl/extractor/letv.py
index fd5fd260e9e40baf294815d9b42c363d0f482380..a28abb0f0081d05c5c2d0c07080ba33db0badaed 100644
(file)
--- a/
youtube_dl/extractor/letv.py
+++ b/
youtube_dl/extractor/letv.py
@@
-15,10
+15,12
@@
from ..utils import (
determine_ext,
ExtractorError,
parse_iso8601,
determine_ext,
ExtractorError,
parse_iso8601,
+ int_or_none,
)
class LetvIE(InfoExtractor):
)
class LetvIE(InfoExtractor):
+ IE_DESC = '乐视网'
_VALID_URL = r'http://www\.letv\.com/ptv/vplay/(?P<id>\d+).html'
_TESTS = [{
_VALID_URL = r'http://www\.letv\.com/ptv/vplay/(?P<id>\d+).html'
_TESTS = [{
@@
-40,9
+42,6
@@
class LetvIE(InfoExtractor):
'title': '美人天下01',
'description': 'md5:f88573d9d7225ada1359eaf0dbf8bcda',
},
'title': '美人天下01',
'description': 'md5:f88573d9d7225ada1359eaf0dbf8bcda',
},
- 'expected_warnings': [
- 'publish time'
- ]
}, {
'note': 'This video is available only in Mainland China, thus a proxy is needed',
'url': 'http://www.letv.com/ptv/vplay/1118082.html',
}, {
'note': 'This video is available only in Mainland China, thus a proxy is needed',
'url': 'http://www.letv.com/ptv/vplay/1118082.html',
@@
-53,12
+52,7
@@
class LetvIE(InfoExtractor):
'title': '与龙共舞 完整版',
'description': 'md5:7506a5eeb1722bb9d4068f85024e3986',
},
'title': '与龙共舞 完整版',
'description': 'md5:7506a5eeb1722bb9d4068f85024e3986',
},
- 'expected_warnings': [
- 'publish time'
- ],
- 'params': {
- 'cn_verification_proxy': 'proxy.uku.im:8888'
- },
+ 'skip': 'Only available in China',
}]
@staticmethod
}]
@staticmethod
@@
-94,12
+88,13
@@
class LetvIE(InfoExtractor):
play_json_req = compat_urllib_request.Request(
'http://api.letv.com/mms/out/video/playJson?' + compat_urllib_parse.urlencode(params)
)
play_json_req = compat_urllib_request.Request(
'http://api.letv.com/mms/out/video/playJson?' + compat_urllib_parse.urlencode(params)
)
- play_json_req.add_header(
- 'Ytdl-Request-Proxy',
- self._downloader.params.get('cn_verification_proxy'))
+ cn_verification_proxy = self._downloader.params.get('cn_verification_proxy')
+ if cn_verification_proxy:
+ play_json_req.add_header('Ytdl-request-proxy', cn_verification_proxy)
+
play_json = self._download_json(
play_json_req,
play_json = self._download_json(
play_json_req,
- media_id, 'playJson data')
+ media_id, '
Downloading
playJson data')
# Check for errors
playstatus = play_json['playstatus']
# Check for errors
playstatus = play_json['playstatus']
@@
-140,7
+135,7
@@
class LetvIE(InfoExtractor):
}
if format_id[-1:] == 'p':
}
if format_id[-1:] == 'p':
- url_info_dict['height'] =
format_id[:-1]
+ url_info_dict['height'] =
int_or_none(format_id[:-1])
urls.append(url_info_dict)
urls.append(url_info_dict)