R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[yuja] reduce line lengths

Browse Source
This commit is contained in:
Brian Clinkenbeard 2020-04-04 20:31:30 -07:00
parent 5667922fda
commit 1f6aed1bbb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/yuja.py
View File

@ -57,12 +57,16 @@ class YuJaIE(InfoExtractor):
if auth_id == '0': if auth_id == '0':
_NODE_REGEX = r'https?://(?P<subdomain>[a-z0-9]+)\.yuja\.com/V/(?:Watch|Video)\?v=(?P<id>[0-9]+)(?:.*)&node=(?P<node>[0-9]+)' _NODE_REGEX = r'https?://(?P<subdomain>[a-z0-9]+)\.yuja\.com/V/(?:Watch|Video)\?v=(?P<id>[0-9]+)(?:.*)&node=(?P<node>[0-9]+)'
subdomain, video_id, node_id = re.match(_NODE_REGEX, url).groups() subdomain, video_id, node_id = re.match(_NODE_REGEX, url).groups()
# get new link using node ID # get new link using node ID
direct_link = self._download_json('https://%s.yuja.com/P/Data/VideoJSON?video=%i&node=%i&checkUser=true&a=%s' direct_link = self._download_json(
'https://%s.yuja.com/P/Data/VideoJSON?video=%i&node=%i&checkUser=true&a=%s'
% (subdomain, int(video_id), int(node_id), int(auth_id)), video_id, query={})['video']['directLink'] % (subdomain, int(video_id), int(node_id), int(auth_id)), video_id, query={})['video']['directLink']
auth_id = re.match(self._VALID_URL, direct_link).group('auth') auth_id = re.match(self._VALID_URL, direct_link).group('auth')
data = self._download_json('https://%s.yuja.com/P/Data/VideoJSON?video=%i&a=%i&getPlayerType=true' data = self._download_json(
'https://%s.yuja.com/P/Data/VideoJSON?video=%i&a=%i&getPlayerType=true'
% (subdomain, int(video_id), int(auth_id)), video_id, query={})['video'] % (subdomain, int(video_id), int(auth_id)), video_id, query={})['video']
# for YouTube embeds # for YouTube embeds
@ -91,7 +95,6 @@ class YuJaIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': data['videoTitle'], 'title': data['videoTitle'],
# 'url': data.get('videoLinkMp4'),
'formats': formats, 'formats': formats,
'thumbnail': 'https://%s.yuja.com%s' % (subdomain, data.get('thumbImage')), 'thumbnail': 'https://%s.yuja.com%s' % (subdomain, data.get('thumbImage')),
'description': data.get('description'), 'description': data.get('description'),