X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ffivemin.py;h=3a50bab5c9bd04c9d176a88be080033368fe46c7;hb=a5d524ef4676062335303ad249cc35a1a237ad07;hp=b596bf587b77045c1b16bba932df3e3823b9ebef;hpb=8f5c0218d8b1ed3975d84789b73b34cc7c67d188;p=youtube-dl diff --git a/youtube_dl/extractor/fivemin.py b/youtube_dl/extractor/fivemin.py index b596bf587..3a50bab5c 100644 --- a/youtube_dl/extractor/fivemin.py +++ b/youtube_dl/extractor/fivemin.py @@ -6,6 +6,7 @@ from .common import InfoExtractor from ..utils import ( compat_str, compat_urllib_parse, + ExtractorError, ) @@ -58,9 +59,17 @@ class FiveMinIE(InfoExtractor): 'isPlayerSeed': 'true', 'url': embed_url, }) - info = self._download_json( + response = self._download_json( 'https://syn.5min.com/handlers/SenseHandler.ashx?' + query, - video_id)['binding'][0] + video_id) + if not response['success']: + err_msg = response['errorMessage'] + if err_msg == 'ErrorVideoUserNotGeo': + msg = 'Video not available from your location' + else: + msg = 'Aol said: %s' % err_msg + raise ExtractorError(msg, expected=True, video_id=video_id) + info = response['binding'][0] second_id = compat_str(int(video_id[:-2]) + 1) formats = []