projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] Generalize cli option converters
[youtube-dl]
/
youtube_dl
/
extractor
/
rtve.py
diff --git
a/youtube_dl/extractor/rtve.py
b/youtube_dl/extractor/rtve.py
index 8d9be1b98ce3adf338e7259c52181f3e2216213c..5b97d33caec2a08c79e648483ec67a1c288b6e4f 100644
(file)
--- a/
youtube_dl/extractor/rtve.py
+++ b/
youtube_dl/extractor/rtve.py
@@
-6,8
+6,9
@@
import re
import time
from .common import InfoExtractor
import time
from .common import InfoExtractor
-from ..compat import compat_urlparse
+from ..compat import compat_url
lib_request, compat_url
parse
from ..utils import (
from ..utils import (
+ ExtractorError,
float_or_none,
remove_end,
std_headers,
float_or_none,
remove_end,
std_headers,
@@
-16,7
+17,7
@@
from ..utils import (
def _decrypt_url(png):
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]
@@
-98,8
+99,12
@@
class RTVEALaCartaIE(InfoExtractor):
info = self._download_json(
'http://www.rtve.es/api/videos/%s/config/alacarta_videos.json' % video_id,
video_id)['page']['items'][0]
info = self._download_json(
'http://www.rtve.es/api/videos/%s/config/alacarta_videos.json' % video_id,
video_id)['page']['items'][0]
+ 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_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 = compat_urllib_request.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'):
auth_url = video_url.replace(
video_url = _decrypt_url(png)
if not video_url.endswith('.f4m'):
auth_url = video_url.replace(