diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-05-09 12:41:56 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-05-09 12:41:56 +0200 |
| commit | 3b5f65a64c06859cdee0b93f319c80d5c116cedd (patch) | |
| tree | ff1de96a077f202e3e38dc28919980c4b39f26c4 | |
| parent | 5c0b2c16a80c509dbcee48f48da3de0bf9912cda (diff) | |
| download | hypervideo-pre-3b5f65a64c06859cdee0b93f319c80d5c116cedd.tar.lz hypervideo-pre-3b5f65a64c06859cdee0b93f319c80d5c116cedd.tar.xz hypervideo-pre-3b5f65a64c06859cdee0b93f319c80d5c116cedd.zip | |
[mlb] Fix extraction of articles
And move test from generic, since it's directly handled by MLBIE
| -rw-r--r-- | youtube_dl/extractor/generic.py | 13 | ||||
| -rw-r--r-- | youtube_dl/extractor/mlb.py | 14 |
2 files changed, 13 insertions, 14 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 7c38bce7c..3d756e848 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -414,19 +414,6 @@ class GenericIE(InfoExtractor): 'thumbnail': 're:^https?://.*\.jpg$', }, }, - # MLB articles - { - 'url': 'http://m.mlb.com/news/article/118550098/blue-jays-kevin-pillar-goes-spidey-up-the-wall-to-rob-tim-beckham-of-a-homer', - 'md5': 'b190e70141fb9a1552a85426b4da1b5d', - 'info_dict': { - 'id': '75609783', - 'ext': 'mp4', - 'title': 'Must C: Pillar climbs for catch', - 'description': '4/15/15: Blue Jays outfielder Kevin Pillar continues his defensive dominance by climbing the wall in left to rob Tim Beckham of a home run', - 'timestamp': 1429124820, - 'upload_date': '20150415', - } - }, # Wistia embed { 'url': 'http://education-portal.com/academy/lesson/north-american-exploration-failed-colonies-of-spain-france-england.html#lesson', diff --git a/youtube_dl/extractor/mlb.py b/youtube_dl/extractor/mlb.py index 4e054fb53..40c9ecb35 100644 --- a/youtube_dl/extractor/mlb.py +++ b/youtube_dl/extractor/mlb.py @@ -83,6 +83,18 @@ class MLBIE(InfoExtractor): }, }, { + 'url': 'http://m.mlb.com/news/article/118550098/blue-jays-kevin-pillar-goes-spidey-up-the-wall-to-rob-tim-beckham-of-a-homer', + 'md5': 'b190e70141fb9a1552a85426b4da1b5d', + 'info_dict': { + 'id': '75609783', + 'ext': 'mp4', + 'title': 'Must C: Pillar climbs for catch', + 'description': '4/15/15: Blue Jays outfielder Kevin Pillar continues his defensive dominance by climbing the wall in left to rob Tim Beckham of a home run', + 'timestamp': 1429124820, + 'upload_date': '20150415', + } + }, + { 'url': 'http://m.mlb.com/shared/video/embed/embed.html?content_id=35692085&topic_id=6479266&width=400&height=224&property=mlb', 'only_matching': True, }, @@ -113,7 +125,7 @@ class MLBIE(InfoExtractor): video_path = mobj.group('path') webpage = self._download_webpage(url, video_path) video_id = self._search_regex( - r'data-videoid="(\d+)"', webpage, 'video id') + r'data-video-?id="(\d+)"', webpage, 'video id') detail = self._download_xml( 'http://m.mlb.com/gen/multimedia/detail/%s/%s/%s/%s.xml' |