depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-25 03:32:05 +00:00
Code Issues Releases Wiki Activity

[tvplay] Capture and output native error message

Browse source
This commit is contained in:
Sergey M․ 2016-08-05 22:49:19 +07:00
parent d50aca41f8
commit 3859ebeee6
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
youtube_dl/extractor/tvplay.py
View file

@ -5,15 +5,17 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import ( from ..compat import (
compat_HTTPError,
compat_str, compat_str,
compat_urlparse, compat_urlparse,
) )
from ..utils import ( from ..utils import (
determine_ext,
ExtractorError,
int_or_none,
parse_iso8601, parse_iso8601,
qualities, qualities,
determine_ext,
update_url_query, update_url_query,
int_or_none,
) )
@ -206,12 +208,15 @@ class TVPlayIE(InfoExtractor):
title = video['title'] title = video['title']
if video.get('is_geo_blocked'): try:
self.report_warning( streams = self._download_json(
'This content might not be available in your country due to copyright reasons') 'http://playapi.mtgx.tv/v1/videos/stream/%s' % video_id,
video_id, 'Downloading streams JSON')
streams = self._download_json( except ExtractorError as e:
'http://playapi.mtgx.tv/v1/videos/stream/%s' % video_id, video_id, 'Downloading streams JSON') if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
msg = self._parse_json(e.cause.read().decode('utf-8'), video_id)
raise ExtractorError(msg['msg'], expected=True)
raise
quality = qualities(['hls', 'medium', 'high']) quality = qualities(['hls', 'medium', 'high'])
formats = [] formats = []
@ -251,6 +256,11 @@ class TVPlayIE(InfoExtractor):
'url': video_url, 'url': video_url,
}) })
formats.append(fmt) formats.append(fmt)
if not formats and video.get('is_geo_blocked'):
self.raise_geo_restricted(
'This content might not be available in your country due to copyright reasons')
self._sort_formats(formats) self._sort_formats(formats)
# TODO: webvtt in m3u8 # TODO: webvtt in m3u8