projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[foxnews] Clarify IE_DESC
[youtube-dl]
/
youtube_dl
/
extractor
/
foxnews.py
diff --git
a/youtube_dl/extractor/foxnews.py
b/youtube_dl/extractor/foxnews.py
index 7de88ab6614e15c6c5f44866a3d3e302cf7b19bd..3a4a59135da5b8b813090fffaf3f7cb9477f3743 100644
(file)
--- a/
youtube_dl/extractor/foxnews.py
+++ b/
youtube_dl/extractor/foxnews.py
@@
-10,7
+10,8
@@
from ..utils import (
class FoxNewsIE(InfoExtractor):
class FoxNewsIE(InfoExtractor):
- _VALID_URL = r'https?://video\.fox(?:news|business)\.com/v/(?:video-embed\.html\?video_id=)?(?P<id>\d+)'
+ IE_DESC = 'Fox News and Fox Business Video'
+ _VALID_URL = r'https?://(?P<host>video\.fox(?:news|business)\.com)/v/(?:video-embed\.html\?video_id=)?(?P<id>\d+)'
_TESTS = [
{
'url': 'http://video.foxnews.com/v/3937480/frozen-in-time/#sp=show-clips',
_TESTS = [
{
'url': 'http://video.foxnews.com/v/3937480/frozen-in-time/#sp=show-clips',
@@
-44,15
+45,19
@@
class FoxNewsIE(InfoExtractor):
'url': 'http://video.foxnews.com/v/video-embed.html?video_id=3937480&d=video.foxnews.com',
'only_matching': True,
},
'url': 'http://video.foxnews.com/v/video-embed.html?video_id=3937480&d=video.foxnews.com',
'only_matching': True,
},
+ {
+ 'url': 'http://video.foxbusiness.com/v/4442309889001',
+ 'only_matching': True,
+ },
]
def _real_extract(self, url):
]
def _real_extract(self, url):
-
video_id = self._match_id(
url)
-
-
m = re.match(r'^https?://video\.fox(news|business)', url
)
+
mobj = re.match(self._VALID_URL,
url)
+ video_id = mobj.group('id')
+
host = mobj.group('host'
)
video = self._download_json(
video = self._download_json(
- 'http://
video.fox' + m.group(1) + '.com/v/feed/video/%s.js?template=fox' % video_id
, video_id)
+ 'http://
%s/v/feed/video/%s.js?template=fox' % (host, video_id)
, video_id)
item = video['channel']['item']
title = item['title']
item = video['channel']['item']
title = item['title']