Merge tag 'upstream/2015.11.27.1'

[youtubedl] / youtube_dl / extractor / rtve.py

diff --git a/youtube_dl/extractor/rtve.py b/youtube_dl/extractor/rtve.py
index 849300140ecbf598874d22b090262eabec1e7ea5..603d7bd00620cef13cd957a54053dc7f77010e05 100644 (file)
--- a/youtube_dl/extractor/rtve.py
+++ b/youtube_dl/extractor/rtve.py
@@ -6,18 +6,18 @@ import re
 import time
 
 from .common import InfoExtractor
 import time
 
 from .common import InfoExtractor

-from ..compat import compat_urlparse

 from ..utils import (
     ExtractorError,
     float_or_none,
     remove_end,
 from ..utils import (
     ExtractorError,
     float_or_none,
     remove_end,

+    sanitized_Request,

     std_headers,
     struct_unpack,
 )
 
 
 def _decrypt_url(png):
     std_headers,
     struct_unpack,
 )
 
 
 def _decrypt_url(png):

-    encrypted_data = base64.b64decode(png)
+    encrypted_data = base64.b64decode(png.encode('utf-8'))

     text_index = encrypted_data.find(b'tEXt')
     text_chunk = encrypted_data[text_index - 4:]
     length = struct_unpack('!I', text_chunk[:4])[0]
     text_index = encrypted_data.find(b'tEXt')
     text_chunk = encrypted_data[text_index - 4:]
     length = struct_unpack('!I', text_chunk[:4])[0]


@@ -102,18 +102,14 @@ class RTVEALaCartaIE(InfoExtractor):
         if info['state'] == 'DESPU':
             raise ExtractorError('The video is no longer available', expected=True)
         png_url = 'http://www.rtve.es/ztnr/movil/thumbnail/%s/videos/%s.png' % (self._manager, video_id)
         if info['state'] == 'DESPU':
             raise ExtractorError('The video is no longer available', expected=True)
         png_url = 'http://www.rtve.es/ztnr/movil/thumbnail/%s/videos/%s.png' % (self._manager, video_id)

-        png = self._download_webpage(png_url, video_id, 'Downloading url information')
+        png_request = sanitized_Request(png_url)
+        png_request.add_header('Referer', url)
+        png = self._download_webpage(png_request, video_id, 'Downloading url information')

         video_url = _decrypt_url(png)
         if not video_url.endswith('.f4m'):
         video_url = _decrypt_url(png)
         if not video_url.endswith('.f4m'):

-            auth_url = video_url.replace(
+            video_url = video_url.replace(

                 'resources/', 'auth/resources/'
             ).replace('.net.rtve', '.multimedia.cdn.rtve')
                 'resources/', 'auth/resources/'
             ).replace('.net.rtve', '.multimedia.cdn.rtve')

-            video_path = self._download_webpage(
-                auth_url, video_id, 'Getting video url')
-            # Use mvod1.akcdn instead of flash.akamaihd.multimedia.cdn to get
-            # the right Content-Length header and the mp4 format
-            video_url = compat_urlparse.urljoin(
-                'http://mvod1.akcdn.rtve.es/', video_path)

 
         subtitles = None
         if info.get('sbtFile') is not None:
 
         subtitles = None
         if info.get('sbtFile') is not None: