commit 0add33abcb9eb3ac93f7af312940b033b4ae4168
parent 0326bcb6c1a45067a804d2f32aa854a3fcd9b4ce
Author: Sergey M․ <dstftw@gmail.com>
Date:   Fri, 16 Aug 2019 23:36:23 +0700

[youtube] Improve unavailable message extraction (refs #22117)

Diffstat:
Myoutube_dl/extractor/youtube.py | 13+++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py @@ -1809,10 +1809,15 @@ class YoutubeIE(YoutubeBaseInfoExtractor): break def extract_unavailable_message(): - return self._html_search_regex( - (r'(?s)<div[^>]+id=["\']unavailable-submessage["\'][^>]+>(.+?)</div', - r'(?s)<h1[^>]+id=["\']unavailable-message["\'][^>]*>(.+?)</h1>'), - video_webpage, 'unavailable message', default=None) + messages = [] + for tag, kind in (('h1', 'message'), ('div', 'submessage')): + msg = self._html_search_regex( + r'(?s)<{tag}[^>]+id=["\']unavailable-{kind}["\'][^>]*>(.+?)</{tag}>'.format(tag=tag, kind=kind), + video_webpage, 'unavailable %s' % kind, default=None) + if msg: + messages.append(msg) + if messages: + return '\n'.join(messages) if not video_info: unavailable_message = extract_unavailable_message()