projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4cb18ab
)
[ooyala] Make more robust
author
Sergey M․
<dstftw@gmail.com>
Fri, 23 Jun 2017 13:56:21 +0000
(20:56 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 23 Jun 2017 13:56:21 +0000
(20:56 +0700)
youtube_dl/extractor/ooyala.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ooyala.py
b/youtube_dl/extractor/ooyala.py
index ef8adccc142c5ea0a617568625d6a78e4a345d86..a25f326b55ebee70748f599d4c7f637d1f2aba1d 100644
(file)
--- a/
youtube_dl/extractor/ooyala.py
+++ b/
youtube_dl/extractor/ooyala.py
@@
-3,12
+3,14
@@
import re
import base64
from .common import InfoExtractor
import base64
from .common import InfoExtractor
+from ..compat import compat_str
from ..utils import (
from ..utils import (
- int_or_none,
- float_or_none,
+ determine_ext,
ExtractorError,
ExtractorError,
+ float_or_none,
+ int_or_none,
+ try_get,
unsmuggle_url,
unsmuggle_url,
- determine_ext,
)
from ..compat import compat_urllib_parse_urlencode
)
from ..compat import compat_urllib_parse_urlencode
@@
-39,13
+41,15
@@
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']:
- s_url = base64.b64decode(
- stream['url']['data'].encode('ascii')).decode('utf-8')
+ url_data = try_get(stream, lambda x: x['url']['data'], compat_str)
+ if not url_data:
+ continue
+ s_url = base64.b64decode(url_data.encode('ascii')).decode('utf-8')
if not s_url or s_url in urls:
continue
urls.append(s_url)
ext = determine_ext(s_url, None)
if not s_url or s_url in urls:
continue
urls.append(s_url)
ext = determine_ext(s_url, None)
- delivery_type = stream
['delivery_type']
+ delivery_type = stream
.get('delivery_type')
if delivery_type == 'hls' or ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
re.sub(r'/ip(?:ad|hone)/', '/all/', s_url), embed_code, 'mp4', 'm3u8_native',
if delivery_type == 'hls' or ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
re.sub(r'/ip(?:ad|hone)/', '/all/', s_url), embed_code, 'mp4', 'm3u8_native',
@@
-65,7
+69,7
@@
class OoyalaBaseIE(InfoExtractor):
else:
formats.append({
'url': s_url,
else:
formats.append({
'url': s_url,
- 'ext': ext or
stream.get('delivery_type')
,
+ 'ext': ext or
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')),