diff options
| author | Sergey M․ <[email protected]> | 2015-05-08 20:07:53 +0600 |
|---|---|---|
| committer | Sergey M․ <[email protected]> | 2015-05-08 20:07:53 +0600 |
| commit | d1feb308116f57ceae3888db5e1b93394300f564 (patch) | |
| tree | e550aab5d920321c92ce616e420badfa2e52089c | |
| parent | 43837189c18af635cfb1cd8fe503265b4b218c32 (diff) | |
| download | youtube-dl-d1feb308116f57ceae3888db5e1b93394300f564.tar.gz youtube-dl-d1feb308116f57ceae3888db5e1b93394300f564.zip | |
[mlb] Fallback to extracting video id from webpage for all URLs that does not contain it explicitly (Closes #5630)
| -rw-r--r-- | youtube_dl/extractor/mlb.py | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/youtube_dl/extractor/mlb.py b/youtube_dl/extractor/mlb.py index ee9ff73bf..109eecefd 100644 --- a/youtube_dl/extractor/mlb.py +++ b/youtube_dl/extractor/mlb.py @@ -10,7 +10,21 @@ from ..utils import ( class MLBIE(InfoExtractor): - _VALID_URL = r'https?://m(?:lb)?\.(?:[\da-z_-]+\.)?mlb\.com/(?:(?:.*?/)?video/(?:topic/[\da-z_-]+/)?v|(?:shared/video/embed/(?:embed|m-internal-embed)\.html|[^/]+/video/play\.jsp)\?.*?\bcontent_id=)(?P<id>n?\d+)' + _VALID_URL = r'''(?x) + https?:// + m(?:lb)?\.(?:[\da-z_-]+\.)?mlb\.com/ + (?: + (?: + (?:.*?/)?video/(?:topic/[\da-z_-]+/)?v| + (?: + shared/video/embed/(?:embed|m-internal-embed)\.html| + [^/]+/video/play\.jsp + )\?.*?\bcontent_id= + ) + (?P<id>n?\d+)| + (?P<path>.+?) + ) + ''' _TESTS = [ { 'url': 'http://m.mlb.com/sea/video/topic/51231442/v34698933/nymsea-ackley-robs-a-home-run-with-an-amazing-catch/?c_id=sea', @@ -95,6 +109,12 @@ class MLBIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') + if not video_id: + video_path = mobj.group('path') + webpage = self._download_webpage(url, video_path) + video_id = self._search_regex( + r'data-videoid="(\d+)"', webpage, 'video id') + detail = self._download_xml( 'http://m.mlb.com/gen/multimedia/detail/%s/%s/%s/%s.xml' % (video_id[-3], video_id[-2], video_id[-1], video_id), video_id) |