projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9bb6d2f
)
fix bug: kankan extractor not support http://vod.kankan.com/v/70/70309.shtml
author
huohuarong
<huohuarong@gmail.com>
Fri, 2 Aug 2013 07:26:11 +0000
(15:26 +0800)
committer
huohuarong
<huohuarong@gmail.com>
Fri, 2 Aug 2013 07:26:11 +0000
(15:26 +0800)
youtube_dl/extractor/kankan.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/kankan.py
b/youtube_dl/extractor/kankan.py
index 8537ba5843221ba5b7575359e2f78357ded787bf..445d465017f513b55839ed9323c95212e6de7fb7 100644
(file)
--- a/
youtube_dl/extractor/kankan.py
+++ b/
youtube_dl/extractor/kankan.py
@@
-21,8
+21,10
@@
class KankanIE(InfoExtractor):
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
- title = self._search_regex(r'G_TITLE=[\'"](.+?)[\'"]', webpage, u'video title')
- gcid = self._search_regex(r'lurl:[\'"]http://.+?/.+?/(.+?)/', webpage, u'gcid')
+ title = self._search_regex(r'(?:G_TITLE=|G_MOVIE_TITLE = )[\'"](.+?)[\'"]', webpage, u'video title')
+ surls = re.search(r'surls:\[\'.+?\'\]|lurl:\'.+?\.flv\'', webpage).group(0)
+ gcids = re.findall(r"http://.+?/.+?/(.+?)/", surls)
+ gcid = gcids[-1]
video_info_page = self._download_webpage('http://p2s.cl.kankan.com/getCdnresource_flv?gcid=%s' % gcid,
video_id, u'Downloading video url info')
video_info_page = self._download_webpage('http://p2s.cl.kankan.com/getCdnresource_flv?gcid=%s' % gcid,
video_id, u'Downloading video url info')