dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[tv4] Bypass geo restriction and improve detection

This commit is contained in:
Sergey M․ 2017-02-19 06:24:38 +07:00
parent f1a78ee4ef
commit c58b7ffef4
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/tv4.py
View File

@ -24,6 +24,7 @@ class TV4IE(InfoExtractor):
sport/| sport/|
) )
)(?P<id>[0-9]+)''' )(?P<id>[0-9]+)'''
_GEO_COUNTRIES = ['SE']
_TESTS = [ _TESTS = [
{ {
'url': 'http://www.tv4.se/kalla-fakta/klipp/kalla-fakta-5-english-subtitles-2491650', 'url': 'http://www.tv4.se/kalla-fakta/klipp/kalla-fakta-5-english-subtitles-2491650',
@ -71,10 +72,6 @@ class TV4IE(InfoExtractor):
'http://www.tv4play.se/player/assets/%s.json' % video_id, 'http://www.tv4play.se/player/assets/%s.json' % video_id,
video_id, 'Downloading video info JSON') video_id, 'Downloading video info JSON')
# If is_geo_restricted is true, it doesn't necessarily mean we can't download it
if info.get('is_geo_restricted'):
self.report_warning('This content might not be available in your country due to licensing restrictions.')
title = info['title'] title = info['title']
subtitles = {} subtitles = {}
@ -113,6 +110,10 @@ class TV4IE(InfoExtractor):
'url': manifest_url, 'url': manifest_url,
'ext': 'vtt', 'ext': 'vtt',
}]}) }]})
if not formats and info.get('is_geo_restricted'):
self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
self._sort_formats(formats) self._sort_formats(formats)
return { return {