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

[itv] Improve geo restriction detection and use geo bypass mechanism

This commit is contained in:
Sergey M․ 2017-02-04 18:51:51 +07:00 committed by Sergey M
parent e633f21a96
commit 28200e654b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/extractor/itv.py
View File

@ -98,7 +98,10 @@ class ITVIE(InfoExtractor):
headers=headers, data=etree.tostring(req_env)) headers=headers, data=etree.tostring(req_env))
playlist = xpath_element(resp_env, './/Playlist') playlist = xpath_element(resp_env, './/Playlist')
if playlist is None: if playlist is None:
fault_code = xpath_text(resp_env, './/faultcode')
fault_string = xpath_text(resp_env, './/faultstring') fault_string = xpath_text(resp_env, './/faultstring')
if fault_code == 'InvalidGeoRegion':
self.raise_geo_restricted(msg=fault_string, countries=['GB'])
raise ExtractorError('%s said: %s' % (self.IE_NAME, fault_string)) raise ExtractorError('%s said: %s' % (self.IE_NAME, fault_string))
title = xpath_text(playlist, 'EpisodeTitle', fatal=True) title = xpath_text(playlist, 'EpisodeTitle', fatal=True)
video_element = xpath_element(playlist, 'VideoEntries/Video', fatal=True) video_element = xpath_element(playlist, 'VideoEntries/Video', fatal=True)