projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update description value for the write_info_json test (required after 27dcce19045670f...
[youtube-dl]
/
youtube_dl
/
extractor
/
appletrailers.py
diff --git
a/youtube_dl/extractor/appletrailers.py
b/youtube_dl/extractor/appletrailers.py
index 6d6237f8af79c02048da0e1b1624f33086a120b6..a527f10de250596e42f19f0957433e2a72fe5bbf 100644
(file)
--- a/
youtube_dl/extractor/appletrailers.py
+++ b/
youtube_dl/extractor/appletrailers.py
@@
-10,7
+10,7
@@
from ..utils import (
class AppleTrailersIE(InfoExtractor):
class AppleTrailersIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?trailers
.apple
.com/trailers/(?P<company>[^/]+)/(?P<movie>[^/]+)'
+ _VALID_URL = r'https?://(?:www\.)?trailers
\.apple\
.com/trailers/(?P<company>[^/]+)/(?P<movie>[^/]+)'
_TEST = {
u"url": u"http://trailers.apple.com/trailers/wb/manofsteel/",
u"playlist": [
_TEST = {
u"url": u"http://trailers.apple.com/trailers/wb/manofsteel/",
u"playlist": [
@@
-113,7
+113,7
@@
class AppleTrailersIE(InfoExtractor):
})
formats = sorted(formats, key=lambda f: (f['height'], f['width']))
})
formats = sorted(formats, key=lambda f: (f['height'], f['width']))
-
info =
{
+
playlist.append(
{
'_type': 'video',
'id': video_id,
'title': title,
'_type': 'video',
'id': video_id,
'title': title,
@@
-124,12
+124,7
@@
class AppleTrailersIE(InfoExtractor):
'upload_date': upload_date,
'uploader_id': uploader_id,
'user_agent': 'QuickTime compatible (youtube-dl)',
'upload_date': upload_date,
'uploader_id': uploader_id,
'user_agent': 'QuickTime compatible (youtube-dl)',
- }
- # TODO: Remove when #980 has been merged
- info['url'] = formats[-1]['url']
- info['ext'] = formats[-1]['ext']
-
- playlist.append(info)
+ })
return {
'_type': 'playlist',
return {
'_type': 'playlist',