aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-10-23 17:00:33 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-10-23 17:00:33 +0200
commit2450bcb28b46a6cb3d9f9accfdfd3ef6b7ac5f66 (patch)
tree17d7ab0d44f3aa893682d7ef3f80e3ad9bfc743d /youtube_dl/extractor
parent3126050c0fe204dfb2669f794097648b9c9fa8c8 (diff)
downloadyoutube-dl-2450bcb28b46a6cb3d9f9accfdfd3ef6b7ac5f66.tar.xz
[nowvideo] Fix key extraction
Extract it from the embed page
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/nowvideo.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/nowvideo.py b/youtube_dl/extractor/nowvideo.py
index ab52ad401..241cc160b 100644
--- a/youtube_dl/extractor/nowvideo.py
+++ b/youtube_dl/extractor/nowvideo.py
@@ -20,7 +20,10 @@ class NowVideoIE(InfoExtractor):
video_id = mobj.group('id')
webpage_url = 'http://www.nowvideo.ch/video/' + video_id
+ embed_url = 'http://embed.nowvideo.ch/embed.php?v=' + video_id
webpage = self._download_webpage(webpage_url, video_id)
+ embed_page = self._download_webpage(embed_url, video_id,
+ u'Downloading embed page')
self.report_extraction(video_id)
@@ -28,7 +31,7 @@ class NowVideoIE(InfoExtractor):
webpage, u'video title')
video_key = self._search_regex(r'var fkzd="(.*)";',
- webpage, u'video key')
+ embed_page, u'video key')
api_call = "http://www.nowvideo.ch/api/player.api.php?file={0}&numOfErrors=0&cid=1&key={1}".format(video_id, video_key)
api_response = self._download_webpage(api_call, video_id,