From 3c1b81b95735bf8fb065ba7a32f220c37b8a10dc Mon Sep 17 00:00:00 2001 From: Naglis Jonaitis Date: Thu, 11 Dec 2014 16:58:45 +0200 Subject: [PATCH 1/2] [ntv] Rename `flash_ver` to `flash_version` in the format dict RTMP downloader uses `flash_version` --- youtube_dl/extractor/ntv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/ntv.py b/youtube_dl/extractor/ntv.py index 13c8d79cd8..ee740cd9c0 100644 --- a/youtube_dl/extractor/ntv.py +++ b/youtube_dl/extractor/ntv.py @@ -130,7 +130,7 @@ def _real_extract(self, url): 'rtmp_conn': 'B:1', 'player_url': 'http://www.ntv.ru/swf/vps1.swf?update=20131128', 'page_url': 'http://www.ntv.ru', - 'flash_ver': 'LNX 11,2,202,341', + 'flash_version': 'LNX 11,2,202,341', 'rtmp_live': True, 'ext': 'flv', 'filesize': int(size.text), From 158731f83e2af39b3ecd8af3eaf4ce5b26ff6908 Mon Sep 17 00:00:00 2001 From: Naglis Jonaitis Date: Thu, 11 Dec 2014 17:07:50 +0200 Subject: [PATCH 2/2] [tvplay] Don't raise an exception if `is_geo_blocked` is True Videos which return `is_geo_blocked' to be True can actually be downloaded from the country to which the video is restricted --- youtube_dl/extractor/tvplay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dl/extractor/tvplay.py index eb94737546..0157392cce 100644 --- a/youtube_dl/extractor/tvplay.py +++ b/youtube_dl/extractor/tvplay.py @@ -182,8 +182,8 @@ def _real_extract(self, url): 'http://playapi.mtgx.tv/v1/videos/%s' % video_id, video_id, 'Downloading video JSON') if video['is_geo_blocked']: - raise ExtractorError( - 'This content is not available in your country due to copyright reasons', expected=True) + self.report_warning( + 'This content might not be available in your country due to copyright reasons') streams = self._download_json( 'http://playapi.mtgx.tv/v1/videos/stream/%s' % video_id, video_id, 'Downloading streams JSON')