projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[srgssr] Improve geo restriction detection
[youtube-dl]
/
youtube_dl
/
extractor
/
svt.py
diff --git
a/youtube_dl/extractor/svt.py
b/youtube_dl/extractor/svt.py
index 1c04dfb7bf757477d134cc7caa223ab47d0800ba..f2a2200bf87180f47ada72857a7eb617e0e0138e 100644
(file)
--- a/
youtube_dl/extractor/svt.py
+++ b/
youtube_dl/extractor/svt.py
@@
-16,7
+16,7
@@
class SVTBaseIE(InfoExtractor):
def _extract_video(self, video_info, video_id):
formats = []
for vr in video_info['videoReferences']:
def _extract_video(self, video_info, video_id):
formats = []
for vr in video_info['videoReferences']:
- player_type = vr.get('playerType')
+ player_type = vr.get('playerType')
or vr.get('format')
vurl = vr['url']
ext = determine_ext(vurl)
if ext == 'm3u8':
vurl = vr['url']
ext = determine_ext(vurl)
if ext == 'm3u8':
@@
-38,7
+38,8
@@
class SVTBaseIE(InfoExtractor):
'url': vurl,
})
if not formats and video_info.get('rights', {}).get('geoBlockedSweden'):
'url': vurl,
})
if not formats and video_info.get('rights', {}).get('geoBlockedSweden'):
- self.raise_geo_restricted('This video is only available in Sweden')
+ self.raise_geo_restricted(
+ 'This video is only available in Sweden', countries=['SE'])
self._sort_formats(formats)
subtitles = {}
self._sort_formats(formats)
subtitles = {}
@@
-129,7
+130,7
@@
class SVTPlayIE(SVTBaseIE):
'ext': 'mp4',
'title': 'Flygplan till Haile Selassie',
'duration': 3527,
'ext': 'mp4',
'title': 'Flygplan till Haile Selassie',
'duration': 3527,
- 'thumbnail': 're:^https?://.*[\.-]jpg$',
+ 'thumbnail':
r
're:^https?://.*[\.-]jpg$',
'age_limit': 0,
'subtitles': {
'sv': [{
'age_limit': 0,
'subtitles': {
'sv': [{