projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[limelight] Improve embeds detection (closes #13895)
[youtube-dl]
/
youtube_dl
/
extractor
/
tvigle.py
diff --git
a/youtube_dl/extractor/tvigle.py
b/youtube_dl/extractor/tvigle.py
index aa07c82519848c43935c3c96e1160e82a4201f07..3475ef4c3b91b69c136c53e251a25d3d902152f3 100644
(file)
--- a/
youtube_dl/extractor/tvigle.py
+++ b/
youtube_dl/extractor/tvigle.py
@@
-1,4
+1,4
@@
-#
en
coding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
@@
-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+))'
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/',
_TESTS = [
{
'url': 'http://www.tvigle.ru/video/sokrat/',
@@
-30,6
+33,7
@@
class TvigleIE(InfoExtractor):
'duration': 6586,
'age_limit': 12,
},
'duration': 6586,
'age_limit': 12,
},
+ 'skip': 'georestricted',
},
{
'url': 'http://www.tvigle.ru/video/vladimir-vysotskii/vedushchii-teleprogrammy-60-minut-ssha-o-vladimire-vysotskom/',
},
{
'url': 'http://www.tvigle.ru/video/vladimir-vysotskii/vedushchii-teleprogrammy-60-minut-ssha-o-vladimire-vysotskom/',
@@
-42,6
+46,7
@@
class TvigleIE(InfoExtractor):
'duration': 186.080,
'age_limit': 0,
},
'duration': 186.080,
'age_limit': 0,
},
+ 'skip': 'georestricted',
}, {
'url': 'https://cloud.tvigle.ru/video/5267604/',
'only_matching': True,
}, {
'url': 'https://cloud.tvigle.ru/video/5267604/',
'only_matching': True,
@@
-56,7
+61,9
@@
class TvigleIE(InfoExtractor):
if not video_id:
webpage = self._download_webpage(url, display_id)
video_id = self._html_search_regex(
if not video_id:
webpage = self._download_webpage(url, display_id)
video_id = self._html_search_regex(
- r'class="video-preview current_playing" id="(\d+)">',
+ (r'<div[^>]+class=["\']player["\'][^>]+id=["\'](\d+)',
+ r'var\s+cloudId\s*=\s*["\'](\d+)',
+ r'class="video-preview current_playing" id="(\d+)"'),
webpage, 'video id')
video_data = self._download_json(
webpage, 'video id')
video_data = self._download_json(
@@
-68,8
+75,13
@@
class TvigleIE(InfoExtractor):
error_message = item.get('errorMessage')
if not videos and error_message:
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')
title = item['title']
description = item.get('description')
@@
-79,10
+91,10
@@
class TvigleIE(InfoExtractor):
formats = []
for vcodec, fmts in item['videos'].items():
formats = []
for vcodec, fmts in item['videos'].items():
+ if vcodec == 'hls':
+ continue
for format_id, video_url in fmts.items():
if format_id == 'm3u8':
for format_id, video_url in fmts.items():
if format_id == 'm3u8':
- formats.extend(self._extract_m3u8_formats(
- video_url, video_id, 'mp4', m3u8_id=vcodec))
continue
height = self._search_regex(
r'^(\d+)[pP]$', format_id, 'height', default=None)
continue
height = self._search_regex(
r'^(\d+)[pP]$', format_id, 'height', default=None)