Merge tag 'upstream/2015.02.06'

[youtubedl] / youtube_dl / extractor / livestream.py

diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py
index 363a12ad0ab53a53892b59623fbd92d1cbf98358..5247c6f58500e301dab50ed48039df0c070b493a 100644 (file)
--- a/youtube_dl/extractor/livestream.py
+++ b/youtube_dl/extractor/livestream.py
@@ -4,10 +4,12 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_str,
     compat_urllib_parse_urlparse,
     compat_urlparse,
     compat_str,
     compat_urllib_parse_urlparse,
     compat_urlparse,

+)
+from ..utils import (

     ExtractorError,
     find_xpath_attr,
     int_or_none,
     ExtractorError,
     find_xpath_attr,
     int_or_none,


@@ -18,7 +20,7 @@ from ..utils import (
 
 class LivestreamIE(InfoExtractor):
     IE_NAME = 'livestream'
 
 class LivestreamIE(InfoExtractor):
     IE_NAME = 'livestream'

-    _VALID_URL = r'http://new\.livestream\.com/.*?/(?P<event_name>.*?)(/videos/(?P<id>\d+))?/?$'
+    _VALID_URL = r'https?://new\.livestream\.com/.*?/(?P<event_name>.*?)(/videos/(?P<id>[0-9]+)(?:/player)?)?/?(?:$|[?#])'

     _TESTS = [{
         'url': 'http://new.livestream.com/CoheedandCambria/WebsterHall/videos/4719370',
         'md5': '53274c76ba7754fb0e8d072716f2292b',
     _TESTS = [{
         'url': 'http://new.livestream.com/CoheedandCambria/WebsterHall/videos/4719370',
         'md5': '53274c76ba7754fb0e8d072716f2292b',


@@ -37,6 +39,9 @@ class LivestreamIE(InfoExtractor):
             'title': 'TEDCity2.0 (English)',
         },
         'playlist_mincount': 4,
             'title': 'TEDCity2.0 (English)',
         },
         'playlist_mincount': 4,

+    }, {
+        'url': 'https://new.livestream.com/accounts/362/events/3557232/videos/67864563/player?autoPlay=false&height=360&mute=false&width=640',
+        'only_matching': True,

     }]
 
     def _parse_smil(self, video_id, smil_url):
     }]
 
     def _parse_smil(self, video_id, smil_url):