projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vier] Adapt extraction to redesign (#13575)
[youtube-dl]
/
youtube_dl
/
extractor
/
fusion.py
diff --git
a/youtube_dl/extractor/fusion.py
b/youtube_dl/extractor/fusion.py
index 771abcdb198280111785f7319a1209faac2a62fe..ede729b5262c286c347b544fe7493bea020b5afd 100644
(file)
--- a/
youtube_dl/extractor/fusion.py
+++ b/
youtube_dl/extractor/fusion.py
@@
-5,10
+5,9
@@
from .ooyala import OoyalaIE
class FusionIE(InfoExtractor):
class FusionIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?fusion\.net/video/
\d+/(?P<id>[\w-]
+)'
- _TEST
=
{
+ _VALID_URL = r'https?://(?:www\.)?fusion\.net/video/
(?P<id>\d
+)'
+ _TEST
S = [
{
'url': 'http://fusion.net/video/201781/u-s-and-panamanian-forces-work-together-to-stop-a-vessel-smuggling-drugs/',
'url': 'http://fusion.net/video/201781/u-s-and-panamanian-forces-work-together-to-stop-a-vessel-smuggling-drugs/',
- 'md5': '55c3dd61d2b96dc17c4ab6711d02a39e',
'info_dict': {
'id': 'ZpcWNoMTE6x6uVIIWYpHh0qQDjxBuq5P',
'ext': 'mp4',
'info_dict': {
'id': 'ZpcWNoMTE6x6uVIIWYpHh0qQDjxBuq5P',
'ext': 'mp4',
@@
-16,14
+15,21
@@
class FusionIE(InfoExtractor):
'description': 'md5:0cc84a9943c064c0f46b128b41b1b0d7',
'duration': 140.0,
},
'description': 'md5:0cc84a9943c064c0f46b128b41b1b0d7',
'duration': 140.0,
},
+ 'params': {
+ 'skip_download': True,
+ },
'add_ie': ['Ooyala'],
'add_ie': ['Ooyala'],
- }
+ }, {
+ 'url': 'http://fusion.net/video/201781',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id)
def _real_extract(self, url):
display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id)
- ooyala_code = self._search_regex(r'data-video-id="([^"]{32})"',
- webpage, 'ooyala code')
+ ooyala_code = self._search_regex(
+ r'data-ooyala-id=(["\'])(?P<code>(?:(?!\1).)+)\1',
+ webpage, 'ooyala code', group='code')
return OoyalaIE._build_url_result(ooyala_code)
return OoyalaIE._build_url_result(ooyala_code)