diff options
Diffstat (limited to 'hypervideo_dl/extractor/videomore.py')
| -rw-r--r-- | hypervideo_dl/extractor/videomore.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/hypervideo_dl/extractor/videomore.py b/hypervideo_dl/extractor/videomore.py index e0c10aa..17ef3b1 100644 --- a/hypervideo_dl/extractor/videomore.py +++ b/hypervideo_dl/extractor/videomore.py @@ -5,13 +5,11 @@ import re from .common import InfoExtractor from ..compat import ( - compat_parse_qs, compat_str, - compat_urllib_parse_urlparse, ) from ..utils import ( - ExtractorError, int_or_none, + parse_qs, ) @@ -145,9 +143,9 @@ class VideomoreIE(InfoExtractor): return mobj.group('url') def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) + mobj = self._match_valid_url(url) video_id = mobj.group('sid') or mobj.group('id') - partner_id = mobj.group('partner_id') or compat_parse_qs(compat_urllib_parse_urlparse(url).query).get('partner_id', [None])[0] or '97' + partner_id = mobj.group('partner_id') or parse_qs(url).get('partner_id', [None])[0] or '97' item = self._download_json( 'https://siren.more.tv/player/config', video_id, query={ @@ -193,8 +191,8 @@ class VideomoreIE(InfoExtractor): error = item.get('error') if error: if error in ('Данное видео недоступно для просмотра на территории этой страны', 'Данное видео доступно для просмотра только на территории России'): - self.raise_geo_restricted(countries=['RU']) - raise ExtractorError(error, expected=True) + self.raise_geo_restricted(countries=['RU'], metadata_available=True) + self.raise_no_formats(error, expected=True) self._sort_formats(formats) return { |