diff options
Diffstat (limited to 'hypervideo_dl/extractor/videomore.py')
| -rw-r--r-- | hypervideo_dl/extractor/videomore.py | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/hypervideo_dl/extractor/videomore.py b/hypervideo_dl/extractor/videomore.py index 17ef3b1..ddc33f7 100644 --- a/hypervideo_dl/extractor/videomore.py +++ b/hypervideo_dl/extractor/videomore.py @@ -1,8 +1,3 @@ -# coding: utf-8 -from __future__ import unicode_literals - -import re - from .common import InfoExtractor from ..compat import ( compat_str, @@ -50,6 +45,12 @@ class VideomoreIE(InfoExtractor): (?P<id>\d+) (?:[/?#&]|\.(?:xml|json)|$) ''' + _EMBED_REGEX = [r'''(?x) + (?: + <iframe[^>]+src=([\'"])| + <object[^>]+data=(["\'])https?://videomore\.ru/player\.swf\?.*config= + )(?P<url>https?://videomore\.ru/[^?#"']+/\d+(?:\.xml)?) + '''] _TESTS = [{ 'url': 'http://videomore.ru/kino_v_detalayah/5_sezon/367617', 'md5': '44455a346edc0d509ac5b5a5b531dc35', @@ -129,19 +130,6 @@ class VideomoreIE(InfoExtractor): }] _GEO_BYPASS = False - @staticmethod - def _extract_url(webpage): - mobj = re.search( - r'<object[^>]+data=(["\'])https?://videomore\.ru/player\.swf\?.*config=(?P<url>https?://videomore\.ru/(?:[^/]+/)+\d+\.xml).*\1', - webpage) - if not mobj: - mobj = re.search( - r'<iframe[^>]+src=([\'"])(?P<url>https?://videomore\.ru/embed/\d+)', - webpage) - - if mobj: - return mobj.group('url') - def _real_extract(self, url): mobj = self._match_valid_url(url) video_id = mobj.group('sid') or mobj.group('id') @@ -193,7 +181,6 @@ class VideomoreIE(InfoExtractor): if error in ('Данное видео недоступно для просмотра на территории этой страны', 'Данное видео доступно для просмотра только на территории России'): self.raise_geo_restricted(countries=['RU'], metadata_available=True) self.raise_no_formats(error, expected=True) - self._sort_formats(formats) return { 'id': video_id, |