Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-15 21:57:53 +01:00
Code Issues Projects Releases Wiki Activity

[NBC/ThePlatform/Generic] Add a generic detector for NBCSportsVPlayer and enhance error detection in ThePlatformIE

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-03-31 03:36:09 +08:00
parent 1d31e7a2fc
commit a2edf2e7ff
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/generic.py
View File

@ -29,6 +29,7 @@ from ..utils import (
xpath_text, xpath_text,
) )
from .brightcove import BrightcoveIE from .brightcove import BrightcoveIE
from .nbc import NBCSportsVPlayerIE
from .ooyala import OoyalaIE from .ooyala import OoyalaIE
from .rutv import RUTVIE from .rutv import RUTVIE
from .smotri import SmotriIE from .smotri import SmotriIE
@ -639,6 +640,15 @@ class GenericIE(InfoExtractor):
'upload_date': '20150228', 'upload_date': '20150228',
'title': 'pdv_maddow_netcast_m4v-02-27-2015-201624', 'title': 'pdv_maddow_netcast_m4v-02-27-2015-201624',
} }
},
# NBC Sports vplayer embeds
{
'url': 'http://bbs.clutchfans.net/showthread.php?t=244180',
'info_dict': {
'id': '_hqLjQ95yx8Z',
'ext': 'flv'
},
'skip': 'This content expired on 9/17/14 12:23 PM',
} }
] ]
@ -1252,6 +1262,11 @@ class GenericIE(InfoExtractor):
if mobj is not None: if mobj is not None:
return self.url_result('5min:%s' % mobj.group('id'), 'FiveMin') return self.url_result('5min:%s' % mobj.group('id'), 'FiveMin')
# Look for NBC Sports VPlayer embeds
nbc_sports_url = NBCSportsVPlayerIE._extract_url(webpage)
if nbc_sports_url:
return self.url_result(nbc_sports_url, 'NBCSportsVPlayer')
def check_video(vurl): def check_video(vurl):
if YoutubeIE.suitable(vurl): if YoutubeIE.suitable(vurl):
return True return True

2
youtube_dl/extractor/nbc.py
View File

@ -51,7 +51,7 @@ class NBCIE(InfoExtractor):
class NBCSportsVPlayerIE(InfoExtractor): class NBCSportsVPlayerIE(InfoExtractor):
_VALID_URL = r'https?://vplayer\.nbcsports\.com/(?:[^/]+/)+(?P<id>[0-9a-zA-Z]+)' _VALID_URL = r'https?://vplayer\.nbcsports\.com/(?:[^/]+/)+(?P<id>[0-9a-zA-Z_]+)'
_TEST = { _TEST = {
'url': 'https://vplayer.nbcsports.com/p/BxmELC/nbcsports_share/select/9CsDKds0kvHI', 'url': 'https://vplayer.nbcsports.com/p/BxmELC/nbcsports_share/select/9CsDKds0kvHI',

2
youtube_dl/extractor/theplatform.py
View File

@ -92,7 +92,7 @@ class ThePlatformIE(InfoExtractor):
error_msg = next( error_msg = next(
n.attrib['abstract'] n.attrib['abstract']
for n in meta.findall(_x('.//smil:ref')) for n in meta.findall(_x('.//smil:ref'))
if n.attrib.get('title') == 'Geographic Restriction') if n.attrib.get('title') == 'Geographic Restriction' or n.attrib.get('title') == 'Expired')
except StopIteration: except StopIteration:
pass pass
else: else: