projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[rentv] Fix extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
ooyala.py
diff --git
a/youtube_dl/extractor/ooyala.py
b/youtube_dl/extractor/ooyala.py
index a25f326b55ebee70748f599d4c7f637d1f2aba1d..ad8bf03f86a8bf3511fdc864ba462337f7bb51ec 100644
(file)
--- a/
youtube_dl/extractor/ooyala.py
+++ b/
youtube_dl/extractor/ooyala.py
@@
-1,9
+1,13
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
+
import re
import re
-import base64
from .common import InfoExtractor
from .common import InfoExtractor
-from ..compat import compat_str
+from ..compat import (
+ compat_b64decode,
+ compat_str,
+ compat_urllib_parse_urlencode,
+)
from ..utils import (
determine_ext,
ExtractorError,
from ..utils import (
determine_ext,
ExtractorError,
@@
-12,7
+16,6
@@
from ..utils import (
try_get,
unsmuggle_url,
)
try_get,
unsmuggle_url,
)
-from ..compat import compat_urllib_parse_urlencode
class OoyalaBaseIE(InfoExtractor):
class OoyalaBaseIE(InfoExtractor):
@@
-44,7
+47,7
@@
class OoyalaBaseIE(InfoExtractor):
url_data = try_get(stream, lambda x: x['url']['data'], compat_str)
if not url_data:
continue
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')
+ s_url =
compat_b64decode(url_data
).decode('utf-8')
if not s_url or s_url in urls:
continue
urls.append(s_url)
if not s_url or s_url in urls:
continue
urls.append(s_url)
@@
-140,6
+143,11
@@
class OoyalaIE(OoyalaBaseIE):
'title': 'Divide Tool Path.mp4',
'duration': 204.405,
}
'title': 'Divide Tool Path.mp4',
'duration': 204.405,
}
+ },
+ {
+ # empty stream['url']['data']
+ 'url': 'http://player.ooyala.com/player.js?embedCode=w2bnZtYjE6axZ_dw1Cd0hQtXd_ige2Is',
+ 'only_matching': True,
}
]
}
]