fenix
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Sergey M․ 2019-08-16 23:36:23 +07:00
parent 0326bcb6c1
commit 0add33abcb
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/extractor/youtube.py
View File

@ -1809,10 +1809,15 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
break break
def extract_unavailable_message(): def extract_unavailable_message():
return self._html_search_regex( messages = []
(r'(?s)<div[^>]+id=["\']unavailable-submessage["\'][^>]+>(.+?)</div', for tag, kind in (('h1', 'message'), ('div', 'submessage')):
r'(?s)<h1[^>]+id=["\']unavailable-message["\'][^>]*>(.+?)</h1>'), msg = self._html_search_regex(
video_webpage, 'unavailable message', default=None) 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: if not video_info:
unavailable_message = extract_unavailable_message() unavailable_message = extract_unavailable_message()