projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[teamfourstar] Simplify _VALID_URL and relax regexes
[youtube-dl]
/
youtube_dl
/
extractor
/
ooyala.py
diff --git
a/youtube_dl/extractor/ooyala.py
b/youtube_dl/extractor/ooyala.py
index 09bc291f028964a2ac36818e5ef25725ddf6fad9..c2807d0f61b2ab5134944bd0c79b2030df80d3a1 100644
(file)
--- a/
youtube_dl/extractor/ooyala.py
+++ b/
youtube_dl/extractor/ooyala.py
@@
-8,6
+8,7
@@
from ..utils import (
float_or_none,
ExtractorError,
unsmuggle_url,
float_or_none,
ExtractorError,
unsmuggle_url,
+ determine_ext,
)
from ..compat import compat_urllib_parse_urlencode
)
from ..compat import compat_urllib_parse_urlencode
@@
-17,7
+18,7
@@
class OoyalaBaseIE(InfoExtractor):
_CONTENT_TREE_BASE = _PLAYER_BASE + 'player_api/v1/content_tree/'
_AUTHORIZATION_URL_TEMPLATE = _PLAYER_BASE + 'sas/player_api/v2/authorization/embed_code/%s/%s?'
_CONTENT_TREE_BASE = _PLAYER_BASE + 'player_api/v1/content_tree/'
_AUTHORIZATION_URL_TEMPLATE = _PLAYER_BASE + 'sas/player_api/v2/authorization/embed_code/%s/%s?'
- def _extract(self, content_tree_url, video_id, domain='example.org'):
+ def _extract(self, content_tree_url, video_id, domain='example.org'
, supportedformats=None
):
content_tree = self._download_json(content_tree_url, video_id)['content_tree']
metadata = content_tree[list(content_tree)[0]]
embed_code = metadata['embed_code']
content_tree = self._download_json(content_tree_url, video_id)['content_tree']
metadata = content_tree[list(content_tree)[0]]
embed_code = metadata['embed_code']
@@
-28,7
+29,7
@@
class OoyalaBaseIE(InfoExtractor):
self._AUTHORIZATION_URL_TEMPLATE % (pcode, embed_code) +
compat_urllib_parse_urlencode({
'domain': domain,
self._AUTHORIZATION_URL_TEMPLATE % (pcode, embed_code) +
compat_urllib_parse_urlencode({
'domain': domain,
- 'supportedFormats': 'mp4,rtmp,m3u8,hds',
+ 'supportedFormats':
supportedformats or
'mp4,rtmp,m3u8,hds',
}), video_id)
cur_auth_data = auth_data['authorization_data'][embed_code]
}), video_id)
cur_auth_data = auth_data['authorization_data'][embed_code]
@@
-37,26
+38,27
@@
class OoyalaBaseIE(InfoExtractor):
formats = []
if cur_auth_data['authorized']:
for stream in cur_auth_data['streams']:
formats = []
if cur_auth_data['authorized']:
for stream in cur_auth_data['streams']:
- url = base64.b64decode(
+
s_
url = base64.b64decode(
stream['url']['data'].encode('ascii')).decode('utf-8')
stream['url']['data'].encode('ascii')).decode('utf-8')
- if url in urls:
+ if
s_
url in urls:
continue
continue
- urls.append(url)
+ urls.append(s_url)
+ ext = determine_ext(s_url, None)
delivery_type = stream['delivery_type']
delivery_type = stream['delivery_type']
- if delivery_type == 'hls' or
'.m3u8' in url
:
+ if delivery_type == 'hls' or
ext == 'm3u8'
:
formats.extend(self._extract_m3u8_formats(
formats.extend(self._extract_m3u8_formats(
-
url
, embed_code, 'mp4', 'm3u8_native',
+
re.sub(r'/ip(?:ad|hone)/', '/all/', s_url)
, embed_code, 'mp4', 'm3u8_native',
m3u8_id='hls', fatal=False))
m3u8_id='hls', fatal=False))
- elif delivery_type == 'hds' or
'.f4m' in url
:
+ elif delivery_type == 'hds' or
ext == 'f4m'
:
formats.extend(self._extract_f4m_formats(
formats.extend(self._extract_f4m_formats(
- url + '?hdcore=3.7.0', embed_code, f4m_id='hds', fatal=False))
- elif
'.smil' in url
:
+
s_
url + '?hdcore=3.7.0', embed_code, f4m_id='hds', fatal=False))
+ elif
ext == 'smil'
:
formats.extend(self._extract_smil_formats(
formats.extend(self._extract_smil_formats(
- url, embed_code, fatal=False))
+
s_
url, embed_code, fatal=False))
else:
formats.append({
else:
formats.append({
- 'url': url,
- 'ext': stream.get('delivery_type'),
+ 'url':
s_
url,
+ 'ext':
ext or
stream.get('delivery_type'),
'vcodec': stream.get('video_codec'),
'format_id': delivery_type,
'width': int_or_none(stream.get('width')),
'vcodec': stream.get('video_codec'),
'format_id': delivery_type,
'width': int_or_none(stream.get('width')),
@@
-143,8
+145,9
@@
class OoyalaIE(OoyalaBaseIE):
url, smuggled_data = unsmuggle_url(url, {})
embed_code = self._match_id(url)
domain = smuggled_data.get('domain')
url, smuggled_data = unsmuggle_url(url, {})
embed_code = self._match_id(url)
domain = smuggled_data.get('domain')
+ supportedformats = smuggled_data.get('supportedformats')
content_tree_url = self._CONTENT_TREE_BASE + 'embed_code/%s/%s' % (embed_code, embed_code)
content_tree_url = self._CONTENT_TREE_BASE + 'embed_code/%s/%s' % (embed_code, embed_code)
- return self._extract(content_tree_url, embed_code, domain)
+ return self._extract(content_tree_url, embed_code, domain
, supportedformats
)
class OoyalaExternalIE(OoyalaBaseIE):
class OoyalaExternalIE(OoyalaBaseIE):