aboutsummaryrefslogtreecommitdiffstats
path: root/hypervideo_dl/extractor/viewlift.py
diff options
context:
space:
mode:
Diffstat (limited to 'hypervideo_dl/extractor/viewlift.py')
-rw-r--r--hypervideo_dl/extractor/viewlift.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/hypervideo_dl/extractor/viewlift.py b/hypervideo_dl/extractor/viewlift.py
index 4627f66..3812601 100644
--- a/hypervideo_dl/extractor/viewlift.py
+++ b/hypervideo_dl/extractor/viewlift.py
@@ -1,7 +1,4 @@
-from __future__ import unicode_literals
-
import json
-import re
from .common import InfoExtractor
from ..compat import compat_HTTPError
@@ -65,6 +62,7 @@ class ViewLiftBaseIE(InfoExtractor):
class ViewLiftEmbedIE(ViewLiftBaseIE):
IE_NAME = 'viewlift:embed'
_VALID_URL = r'https?://(?:(?:www|embed)\.)?(?P<domain>%s)/embed/player\?.*\bfilmId=(?P<id>[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12})' % ViewLiftBaseIE._DOMAINS_REGEX
+ _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:embed\.)?(?:%s)/embed/player.+?)\1' % ViewLiftBaseIE._DOMAINS_REGEX]
_TESTS = [{
'url': 'http://embed.snagfilms.com/embed/player?filmId=74849a00-85a9-11e1-9660-123139220831&w=500',
'md5': '2924e9215c6eff7a55ed35b72276bd93',
@@ -91,14 +89,6 @@ class ViewLiftEmbedIE(ViewLiftBaseIE):
'only_matching': True,
}]
- @staticmethod
- def _extract_url(webpage):
- mobj = re.search(
- r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:embed\.)?(?:%s)/embed/player.+?)\1' % ViewLiftBaseIE._DOMAINS_REGEX,
- webpage)
- if mobj:
- return mobj.group('url')
-
def _real_extract(self, url):
domain, film_id = self._match_valid_url(url).groups()
site = domain.split('.')[-2]
@@ -144,7 +134,6 @@ class ViewLiftEmbedIE(ViewLiftBaseIE):
'url': sub_url,
})
- self._sort_formats(formats)
return {
'id': film_id,
'title': title,