aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/appletrailers.py
diff options
context:
space:
mode:
authorRogério Brito <rbrito@ime.usp.br>2015-03-01 02:04:05 -0300
committerRogério Brito <rbrito@ime.usp.br>2015-03-01 02:04:05 -0300
commitf46044c66663049e286c20ee015db99d47d9dd8a (patch)
tree2cb6012ef82b16d62e4caf392cd5f3d0a712be18 /youtube_dl/extractor/appletrailers.py
parenta6abd8dc822fb70852437ab5a77ced5f633739f8 (diff)
downloadyoutube-dl-f46044c66663049e286c20ee015db99d47d9dd8a.zip
youtube-dl-f46044c66663049e286c20ee015db99d47d9dd8a.tar.gz
youtube-dl-f46044c66663049e286c20ee015db99d47d9dd8a.tar.bz2
Imported Upstream version 2015.02.28
Diffstat (limited to 'youtube_dl/extractor/appletrailers.py')
-rw-r--r--youtube_dl/extractor/appletrailers.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dl/extractor/appletrailers.py
index 287f71e..576f03b 100644
--- a/youtube_dl/extractor/appletrailers.py
+++ b/youtube_dl/extractor/appletrailers.py
@@ -11,9 +11,12 @@ from ..utils import (
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/",
+ 'info_dict': {
+ 'id': 'manofsteel',
+ },
"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\((.*?)\);'