[dailymotion] Fix ff cookie and use it for embed page (Closes #5330)
authorSergey M․ <dstftw@gmail.com>
Tue, 31 Mar 2015 14:55:21 +0000 (20:55 +0600)
committerSergey M․ <dstftw@gmail.com>
Tue, 31 Mar 2015 14:55:21 +0000 (20:55 +0600)
youtube_dl/extractor/dailymotion.py

index 4f67c3aacc5dec5410b76d08728eecaf429f222b..47d58330b6cfd5b1df32374e9debb11a89347554 100644 (file)
@@ -25,8 +25,7 @@ class DailymotionBaseInfoExtractor(InfoExtractor):
     def _build_request(url):
         """Build a request with the family filter disabled"""
         request = compat_urllib_request.Request(url)
-        request.add_header('Cookie', 'family_filter=off')
-        request.add_header('Cookie', 'ff=off')
+        request.add_header('Cookie', 'family_filter=off; ff=off')
         return request
 
 
@@ -112,8 +111,9 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
             video_upload_date = mobj.group(3) + mobj.group(2) + mobj.group(1)
 
         embed_url = 'http://www.dailymotion.com/embed/video/%s' % video_id
-        embed_page = self._download_webpage(embed_url, video_id,
-                                            'Downloading embed page')
+        embed_request = self._build_request(embed_url)
+        embed_page = self._download_webpage(
+            embed_request, video_id, 'Downloading embed page')
         info = self._search_regex(r'var info = ({.*?}),$', embed_page,
                                   'video info', flags=re.MULTILINE)
         info = json.loads(info)