Initiate new release.

[youtubedl] / youtube_dl / extractor / appletrailers.py

diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dl/extractor/appletrailers.py
index 0c01fa1a13ffa6fbfbfe7b7fb2283d5ed4f8b70f..576f03b5b71115771555e1d8d46f4a108eb9de93 100644 (file)
--- a/youtube_dl/extractor/appletrailers.py
+++ b/youtube_dl/extractor/appletrailers.py
@@ -4,16 +4,19 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

+from ..compat import compat_urlparse

 from ..utils import (
 from ..utils import (

-    compat_urlparse,

     int_or_none,
 )
 
 
 class AppleTrailersIE(InfoExtractor):
     int_or_none,
 )
 
 
 class AppleTrailersIE(InfoExtractor):

-    _VALID_URL = r'https?://(?:www\.)?trailers\.apple\.com/trailers/(?P<company>[^/]+)/(?P<movie>[^/]+)'
-    _TEST = {
+    _VALID_URL = r'https?://(?:www\.)?trailers\.apple\.com/(?:trailers|ca)/(?P<company>[^/]+)/(?P<movie>[^/]+)'
+    _TESTS = [{

         "url": "http://trailers.apple.com/trailers/wb/manofsteel/",
         "url": "http://trailers.apple.com/trailers/wb/manofsteel/",

+        'info_dict': {
+            'id': 'manofsteel',
+        },

         "playlist": [
             {
                 "md5": "d97a8e575432dbcb81b7c3acb741f8a8",
         "playlist": [
             {
                 "md5": "d97a8e575432dbcb81b7c3acb741f8a8",


@@ -60,7 +63,10 @@ class AppleTrailersIE(InfoExtractor):
                 },
             },
         ]
                 },
             },
         ]

-    }
+    }, {
+        'url': 'http://trailers.apple.com/ca/metropole/autrui/',
+        'only_matching': True,
+    }]

 
     _JSON_RE = r'iTunes.playURL\((.*?)\);'
 
 
     _JSON_RE = r'iTunes.playURL\((.*?)\);'
 


@@ -122,14 +128,15 @@ class AppleTrailersIE(InfoExtractor):
             playlist.append({
                 '_type': 'video',
                 'id': video_id,
             playlist.append({
                 '_type': 'video',
                 'id': video_id,

-                'title': title,

                 'formats': formats,
                 'title': title,
                 'duration': duration,
                 'thumbnail': thumbnail,
                 'upload_date': upload_date,
                 'uploader_id': uploader_id,
                 'formats': formats,
                 'title': title,
                 'duration': duration,
                 'thumbnail': thumbnail,
                 'upload_date': upload_date,
                 'uploader_id': uploader_id,

-                'user_agent': 'QuickTime compatible (youtube-dl)',
+                'http_headers': {
+                    'User-Agent': 'QuickTime compatible (youtube-dl)',
+                },

             })
 
         return {
             })
 
         return {