projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d434ca5
)
[tudou] Modernize
author
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 12 Sep 2015 14:51:49 +0000
(22:51 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Sat, 12 Sep 2015 14:51:49 +0000
(22:51 +0800)
youtube_dl/extractor/tudou.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tudou.py
b/youtube_dl/extractor/tudou.py
index 68712cb4adec484df73d53a21b2ad397335371bd..c9d80a7efd97f2a3670560ca6d3c0a8645671247 100644
(file)
--- a/
youtube_dl/extractor/tudou.py
+++ b/
youtube_dl/extractor/tudou.py
@@
-2,9
+2,6
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import re
-import json
-
from .common import InfoExtractor
from .common import InfoExtractor
@@
-46,13
+43,10
@@
class TudouIE(InfoExtractor):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- m = re.search(r'vcode:\s*[\'"](.+?)[\'"]', webpage)
- if m and m.group(1):
- return {
- '_type': 'url',
- 'url': 'youku:' + m.group(1),
- 'ie_key': 'Youku'
- }
+ youku_vcode = self._search_regex(
+ r'vcode:\s*[\'"](.+?)[\'"]', webpage, 'youku vcode', default=None)
+ if youku_vcode:
+ return self.url_result('youku:' + youku_vcode, ie='Youku')
title = self._search_regex(
r",kw:\s*['\"](.+?)[\"']", webpage, 'title')
title = self._search_regex(
r",kw:\s*['\"](.+?)[\"']", webpage, 'title')
@@
-63,8
+57,8
@@
class TudouIE(InfoExtractor):
r"playerUrl\s*:\s*['\"](.+?\.swf)[\"']",
webpage, 'player URL', default=self._PLAYER_URL)
r"playerUrl\s*:\s*['\"](.+?\.swf)[\"']",
webpage, 'player URL', default=self._PLAYER_URL)
- seg
s_json = self._search_regex(r'segs: \'(.*)\'', webpage, 'segments')
-
segments = json.loads(segs_json
)
+ seg
ments = self._parse_json(self._search_regex(
+
r'segs: \'(.*)\'', webpage, 'segments'), video_id
)
# It looks like the keys are the arguments that have to be passed as
# the hd field in the request url, we pick the higher
# Also, filter non-number qualities (see issue #3643).
# It looks like the keys are the arguments that have to be passed as
# the hd field in the request url, we pick the higher
# Also, filter non-number qualities (see issue #3643).