aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-02-25 23:27:14 +0700
committerSergey M․ <dstftw@gmail.com>2017-02-25 23:27:45 +0700
commitb3aec47665104223578181c71cc90112f5b17fce (patch)
tree43fc59206a7f44ee50ffc1b30ca88874f7a725f3 /youtube_dl
parent9d0c08a02c55136221621e8b8dda5860211af8dd (diff)
[tvigle] Raise GeoRestrictedError
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/tvigle.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/youtube_dl/extractor/tvigle.py b/youtube_dl/extractor/tvigle.py
index f3817ab28..3475ef4c3 100644
--- a/youtube_dl/extractor/tvigle.py
+++ b/youtube_dl/extractor/tvigle.py
@@ -17,6 +17,9 @@ class TvigleIE(InfoExtractor):
IE_DESC = 'Интернет-телевидение Tvigle.ru'
_VALID_URL = r'https?://(?:www\.)?(?:tvigle\.ru/(?:[^/]+/)+(?P<display_id>[^/]+)/$|cloud\.tvigle\.ru/video/(?P<id>\d+))'
+ _GEO_BYPASS = False
+ _GEO_COUNTRIES = ['RU']
+
_TESTS = [
{
'url': 'http://www.tvigle.ru/video/sokrat/',
@@ -72,8 +75,13 @@ class TvigleIE(InfoExtractor):
error_message = item.get('errorMessage')
if not videos and error_message:
- raise ExtractorError(
- '%s returned error: %s' % (self.IE_NAME, error_message), expected=True)
+ if item.get('isGeoBlocked') is True:
+ self.raise_geo_restricted(
+ msg=error_message, countries=self._GEO_COUNTRIES)
+ else:
+ raise ExtractorError(
+ '%s returned error: %s' % (self.IE_NAME, error_message),
+ expected=True)
title = item['title']
description = item.get('description')