github/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-08-23 06:35:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[youtube] Use youtube instead of youtube music if premium isn't presented.

Browse source
This commit is contained in:
craftingmod 2021-04-18 04:10:12 +09:00
commit 81ace95c13
1 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
youtube_dl/extractor/youtube.py
View file

@ -1483,6 +1483,18 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
webpage = self._download_webpage( webpage = self._download_webpage(
webpage_url + '&bpctr=9999999999&has_verified=1', video_id, fatal=False) webpage_url + '&bpctr=9999999999&has_verified=1', video_id, fatal=False)
# define early for use
def get_text(x):
if not x:
return
text = x.get('simpleText')
if text and isinstance(text, compat_str):
return text
runs = x.get('runs')
if not isinstance(runs, list):
return
return ''.join([r['text'] for r in runs if isinstance(r.get('text'), compat_str)])
# check is music # check is music
is_music = re.match(r'^https?://music\.youtube\.com/.+', url) is_music = re.match(r'^https?://music\.youtube\.com/.+', url)
@ -1506,9 +1518,22 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
lambda x: x['player_response'][0], lambda x: x['player_response'][0],
compat_str) or '{}', video_id) compat_str) or '{}', video_id)
if pr: if pr:
self.to_screen("Parsed youtube music info!") # check cookie works
player_response = pr playability_status = pr.get('playabilityStatus') or {}
elif webpage: pemr = try_get(
playability_status,
lambda x: x['errorScreen']['playerErrorMessageRenderer'],
dict) or {}
reason = get_text(pemr.get('reason')) or playability_status.get('reason')
if reason != None and reason.find("This video is only available to Music Premium members") >= 0:
# accept only music premium
self.report_warning(reason.replace("video", "URL") + ". Using youtube mode instead of yt-music mode.", video_id)
else:
self.to_screen("Using yt-music.")
player_response = pr
if player_response == None and webpage:
player_response = self._extract_yt_initial_variable( player_response = self._extract_yt_initial_variable(
webpage, self._YT_INITIAL_PLAYER_RESPONSE_RE, webpage, self._YT_INITIAL_PLAYER_RESPONSE_RE,
video_id, 'initial player response') video_id, 'initial player response')
@ -1539,17 +1564,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
return self.url_result( return self.url_result(
trailer_video_id, self.ie_key(), trailer_video_id) trailer_video_id, self.ie_key(), trailer_video_id)
def get_text(x):
if not x:
return
text = x.get('simpleText')
if text and isinstance(text, compat_str):
return text
runs = x.get('runs')
if not isinstance(runs, list):
return
return ''.join([r['text'] for r in runs if isinstance(r.get('text'), compat_str)])
search_meta = ( search_meta = (
lambda x: self._html_search_meta(x, webpage, default=None)) \ lambda x: self._html_search_meta(x, webpage, default=None)) \
if webpage else lambda x: None if webpage else lambda x: None