debian/control: Update list of extractors.

[youtubedl] / youtube_dl / extractor / nowvideo.py

diff --git a/youtube_dl/extractor/nowvideo.py b/youtube_dl/extractor/nowvideo.py
index ab52ad4011851405e9a6b17f73720a8cd646860c..241cc160b9ca58bfc6b88bf9c12fe134df3b3d66 100644 (file)
--- 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
 
         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)
         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)
 
 
         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 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,
 
         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,