projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Clarify output
[youtube-dl]
/
youtube_dl
/
extractor
/
mlb.py
diff --git
a/youtube_dl/extractor/mlb.py
b/youtube_dl/extractor/mlb.py
index bfdb462ebaf663df7d7c4f3c1618988f0aa1d1e3..1a241aca77983ac9626a53e59bf85ad4394cc8fd 100644
(file)
--- a/
youtube_dl/extractor/mlb.py
+++ b/
youtube_dl/extractor/mlb.py
@@
-6,12
+6,11
@@
from .common import InfoExtractor
from ..utils import (
parse_duration,
parse_iso8601,
from ..utils import (
parse_duration,
parse_iso8601,
- find_xpath_attr,
)
class MLBIE(InfoExtractor):
)
class MLBIE(InfoExtractor):
- _VALID_URL = r'https?://m
\.mlb\.com/(?:(?:.*?/)?video/(?:topic/[\da-z_-]+/)?v|shared/video/embed/embed\.html
\?.*?\bcontent_id=)(?P<id>n?\d+)'
+ _VALID_URL = r'https?://m
(?:lb)?\.mlb\.com/(?:(?:.*?/)?video/(?:topic/[\da-z_-]+/)?v|(?:shared/video/embed/embed\.html|[^/]+/video/play\.jsp)
\?.*?\bcontent_id=)(?P<id>n?\d+)'
_TESTS = [
{
'url': 'http://m.mlb.com/sea/video/topic/51231442/v34698933/nymsea-ackley-robs-a-home-run-with-an-amazing-catch/?c_id=sea',
_TESTS = [
{
'url': 'http://m.mlb.com/sea/video/topic/51231442/v34698933/nymsea-ackley-robs-a-home-run-with-an-amazing-catch/?c_id=sea',
@@
-73,6
+72,14
@@
class MLBIE(InfoExtractor):
'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,
},
'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,
},
+ {
+ 'url': 'http://mlb.mlb.com/shared/video/embed/embed.html?content_id=36599553',
+ 'only_matching': True,
+ },
+ {
+ 'url': 'http://mlb.mlb.com/es/video/play.jsp?content_id=36599553',
+ 'only_matching': True,
+ },
]
def _real_extract(self, url):
]
def _real_extract(self, url):
@@
-88,8
+95,9
@@
class MLBIE(InfoExtractor):
duration = parse_duration(detail.find('./duration').text)
timestamp = parse_iso8601(detail.attrib['date'][:-5])
duration = parse_duration(detail.find('./duration').text)
timestamp = parse_iso8601(detail.attrib['date'][:-5])
- thumbnail = find_xpath_attr(
- detail, './thumbnailScenarios/thumbnailScenario', 'type', '45').text
+ thumbnails = [{
+ 'url': thumbnail.text,
+ } for thumbnail in detail.findall('./thumbnailScenarios/thumbnailScenario')]
formats = []
for media_url in detail.findall('./url'):
formats = []
for media_url in detail.findall('./url'):
@@
-116,5
+124,5
@@
class MLBIE(InfoExtractor):
'duration': duration,
'timestamp': timestamp,
'formats': formats,
'duration': duration,
'timestamp': timestamp,
'formats': formats,
- 'thumbnail
': thumbnail
,
+ 'thumbnail
s': thumbnails
,
}
}