diff options
| author | Pierre Rudloff <contact@rudloff.pro> | 2013-08-31 00:37:29 +0200 |
|---|---|---|
| committer | Pierre Rudloff <contact@rudloff.pro> | 2013-08-31 00:37:29 +0200 |
| commit | 847f582290c6ad6ec0c72760ea3cfa6417d28e3c (patch) | |
| tree | c12baa61c649ec00e5fdfe35b1f88f0025d54f99 /youtube_dl/extractor/kankan.py | |
| parent | cd9c100963e8b8bf651d1f359e5f7812603ca0fd (diff) | |
| parent | 10f5c016ec6262e5d29327e97fe4f3d1127ccdff (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/kankan.py')
| -rw-r--r-- | youtube_dl/extractor/kankan.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/kankan.py b/youtube_dl/extractor/kankan.py index 8537ba584..445d46501 100644 --- 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) - 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') |