diff options
| author | Filippo Valsorda <[email protected]> | 2018-01-07 15:03:28 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-01-07 15:03:28 +0100 |
| commit | 97bc05116e15df3cf1b7b7216c60fad7ee0acc9f (patch) | |
| tree | 453059413184d22a44241d251a82196c5d2461eb /youtube_dl/extractor/ivi.py | |
| parent | 7608a91ee7b40c74a35c30b44731606382702592 (diff) | |
| parent | 0a5b1295b7c1aa6395b65ee137087c540b37b32b (diff) | |
| download | youtube-dl-97bc05116e15df3cf1b7b7216c60fad7ee0acc9f.tar.gz youtube-dl-97bc05116e15df3cf1b7b7216c60fad7ee0acc9f.zip | |
Merge branch 'master' into totalwebcastingtotalwebcasting
Diffstat (limited to 'youtube_dl/extractor/ivi.py')
| -rw-r--r-- | youtube_dl/extractor/ivi.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/youtube_dl/extractor/ivi.py b/youtube_dl/extractor/ivi.py index 3d3c15024..cb51cef2d 100644 --- a/youtube_dl/extractor/ivi.py +++ b/youtube_dl/extractor/ivi.py @@ -16,6 +16,8 @@ class IviIE(InfoExtractor): IE_DESC = 'ivi.ru' IE_NAME = 'ivi' _VALID_URL = r'https?://(?:www\.)?ivi\.ru/(?:watch/(?:[^/]+/)?|video/player\?.*?videoId=)(?P<id>\d+)' + _GEO_BYPASS = False + _GEO_COUNTRIES = ['RU'] _TESTS = [ # Single movie @@ -91,7 +93,11 @@ class IviIE(InfoExtractor): if 'error' in video_json: error = video_json['error'] - if error['origin'] == 'NoRedisValidData': + origin = error['origin'] + if origin == 'NotAllowedForLocation': + self.raise_geo_restricted( + msg=error['message'], countries=self._GEO_COUNTRIES) + elif origin == 'NoRedisValidData': raise ExtractorError('Video %s does not exist' % video_id, expected=True) raise ExtractorError( 'Unable to download video %s: %s' % (video_id, error['message']), |