From 73900846b16d33f769d35ac945a97a66cc17fd5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Thu, 19 Mar 2015 00:53:26 +0600 Subject: [PATCH] [ultimedia] Capture and output unavailable video message --- youtube_dl/extractor/ultimedia.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/youtube_dl/extractor/ultimedia.py b/youtube_dl/extractor/ultimedia.py index 97e4445d4..0c1b08d7d 100644 --- a/youtube_dl/extractor/ultimedia.py +++ b/youtube_dl/extractor/ultimedia.py @@ -3,6 +3,7 @@ from .common import InfoExtractor from ..utils import ( + ExtractorError, qualities, unified_strdate, clean_html, @@ -49,6 +50,10 @@ def _real_extract(self, url): deliver_page = self._download_webpage( deliver_url, video_id, 'Downloading iframe page') + if '>This video is currently not available' in deliver_page: + raise ExtractorError( + 'Video %s is currently not available' % video_id, expected=True) + player = self._parse_json( self._search_regex( r"jwplayer\('player(?:_temp)?'\)\.setup\(({.+?})\)\.on", deliver_page, 'player'),