projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[msn] improve extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
appletrailers.py
diff --git
a/youtube_dl/extractor/appletrailers.py
b/youtube_dl/extractor/appletrailers.py
index a6801f3d4860414c286277c92bd994e16212cffd..a9ef733e011237338d904f956c4324cc6dd7a72b 100644
(file)
--- a/
youtube_dl/extractor/appletrailers.py
+++ b/
youtube_dl/extractor/appletrailers.py
@@
-70,7
+70,8
@@
class AppleTrailersIE(InfoExtractor):
}, {
'url': 'http://trailers.apple.com/trailers/magnolia/blackthorn/',
'info_dict': {
}, {
'url': 'http://trailers.apple.com/trailers/magnolia/blackthorn/',
'info_dict': {
- 'id': 'blackthorn',
+ 'id': '4489',
+ 'title': 'Blackthorn',
},
'playlist_mincount': 2,
'expected_warnings': ['Unable to download JSON metadata'],
},
'playlist_mincount': 2,
'expected_warnings': ['Unable to download JSON metadata'],
@@
-116,7
+117,7
@@
class AppleTrailersIE(InfoExtractor):
continue
formats.append({
'format_id': '%s-%s' % (version, size),
continue
formats.append({
'format_id': '%s-%s' % (version, size),
- 'url': re.sub(r'_(\d+p.mov)', r'_h\1', src),
+ 'url': re.sub(r'_(\d+p
\
.mov)', r'_h\1', src),
'width': int_or_none(size_data.get('width')),
'height': int_or_none(size_data.get('height')),
'language': version[:2],
'width': int_or_none(size_data.get('width')),
'height': int_or_none(size_data.get('height')),
'language': version[:2],
@@
-178,7
+179,7
@@
class AppleTrailersIE(InfoExtractor):
formats = []
for format in settings['metadata']['sizes']:
# The src is a file pointing to the real video file
formats = []
for format in settings['metadata']['sizes']:
# The src is a file pointing to the real video file
- format_url = re.sub(r'_(\d*p.mov)', r'_h\1', format['src'])
+ format_url = re.sub(r'_(\d*p
\
.mov)', r'_h\1', format['src'])
formats.append({
'url': format_url,
'format': format['type'],
formats.append({
'url': format_url,
'format': format['type'],
@@
-261,7
+262,7
@@
class AppleTrailersSectionIE(InfoExtractor):
'title': 'Most Popular',
'id': 'mostpopular',
},
'title': 'Most Popular',
'id': 'mostpopular',
},
- 'playlist_mincount':
8
0,
+ 'playlist_mincount':
3
0,
}, {
'url': 'http://trailers.apple.com/#section=moviestudios',
'info_dict': {
}, {
'url': 'http://trailers.apple.com/#section=moviestudios',
'info_dict': {