aboutsummaryrefslogtreecommitdiffstats
path: root/hypervideo_dl/extractor/livestream.py
diff options
context:
space:
mode:
Diffstat (limited to 'hypervideo_dl/extractor/livestream.py')
-rw-r--r--hypervideo_dl/extractor/livestream.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/hypervideo_dl/extractor/livestream.py b/hypervideo_dl/extractor/livestream.py
index 45bf26d..d883eaf 100644
--- a/hypervideo_dl/extractor/livestream.py
+++ b/hypervideo_dl/extractor/livestream.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
import re
import itertools
@@ -25,6 +23,8 @@ from ..utils import (
class LivestreamIE(InfoExtractor):
IE_NAME = 'livestream'
_VALID_URL = r'https?://(?:new\.)?livestream\.com/(?:accounts/(?P<account_id>\d+)|(?P<account_name>[^/]+))/(?:events/(?P<event_id>\d+)|(?P<event_name>[^/]+))(?:/videos/(?P<id>\d+))?'
+ _EMBED_REGEX = [r'<iframe[^>]+src="(?P<url>https?://(?:new\.)?livestream\.com/[^"]+/player[^"]+)"']
+
_TESTS = [{
'url': 'http://new.livestream.com/CoheedandCambria/WebsterHall/videos/4719370',
'md5': '53274c76ba7754fb0e8d072716f2292b',
@@ -126,7 +126,6 @@ class LivestreamIE(InfoExtractor):
if f4m_url:
formats.extend(self._extract_f4m_formats(
f4m_url, video_id, f4m_id='hds', fatal=False))
- self._sort_formats(formats)
comments = [{
'author_id': comment.get('author_id'),
@@ -171,7 +170,6 @@ class LivestreamIE(InfoExtractor):
'url': rtsp_url,
'format_id': 'rtsp',
})
- self._sort_formats(formats)
return {
'id': broadcast_id,
@@ -300,7 +298,6 @@ class LivestreamOriginalIE(InfoExtractor):
'format_id': 'rtsp',
})
- self._sort_formats(formats)
return formats
def _extract_folder(self, url, folder_id):