projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[cbssports] fix extraction(fixes #16217)
[youtube-dl]
/
youtube_dl
/
extractor
/
onionstudios.py
diff --git
a/youtube_dl/extractor/onionstudios.py
b/youtube_dl/extractor/onionstudios.py
index 1d336cf3069d8aae29eeb4e90a7c3f20241cab2e..c6e3d5640da8f4f0040e862a9641fb73deb391a4 100644
(file)
--- a/
youtube_dl/extractor/onionstudios.py
+++ b/
youtube_dl/extractor/onionstudios.py
@@
-13,11
+13,11
@@
from ..utils import (
class OnionStudiosIE(InfoExtractor):
class OnionStudiosIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?onionstudios\.com/(?:video
s/[^/]+-
|embed\?.*\bid=)(?P<id>\d+)(?!-)'
+ _VALID_URL = r'https?://(?:www\.)?onionstudios\.com/(?:video
(?:s/[^/]+-|/)
|embed\?.*\bid=)(?P<id>\d+)(?!-)'
_TESTS = [{
'url': 'http://www.onionstudios.com/videos/hannibal-charges-forward-stops-for-a-cocktail-2937',
_TESTS = [{
'url': 'http://www.onionstudios.com/videos/hannibal-charges-forward-stops-for-a-cocktail-2937',
- 'md5': '
e49f947c105b8a78a675a0ee1bddedfe
',
+ 'md5': '
719d1f8c32094b8c33902c17bcae5e34
',
'info_dict': {
'id': '2937',
'ext': 'mp4',
'info_dict': {
'id': '2937',
'ext': 'mp4',
@@
-29,12
+29,15
@@
class OnionStudiosIE(InfoExtractor):
}, {
'url': 'http://www.onionstudios.com/embed?id=2855&autoplay=true',
'only_matching': True,
}, {
'url': 'http://www.onionstudios.com/embed?id=2855&autoplay=true',
'only_matching': True,
+ }, {
+ 'url': 'http://www.onionstudios.com/video/6139.json',
+ 'only_matching': True,
}]
@staticmethod
def _extract_url(webpage):
mobj = re.search(
}]
@staticmethod
def _extract_url(webpage):
mobj = re.search(
- r'
<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?onionstudios\.com/embed.+?
)\1', webpage)
+ r'
(?s)<(?:iframe|bulbs-video)[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?onionstudios\.com/(?:embed.+?|video/\d+\.json)
)\1', webpage)
if mobj:
return mobj.group('url')
if mobj:
return mobj.group('url')