Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-23 00:54:31 +01:00
Code Issues Releases Wiki Activity

[yuja] flexibility and conventions

Browse Source
This commit is contained in:
Brian Clinkenbeard 2020-04-04 20:53:29 -07:00
parent 1f6aed1bbb
commit 4e29a30a6f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/yuja.py
View File

@ -2,7 +2,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re import re
from ..utils import unified_timestamp from ..utils import (
unified_timestamp,
float_or_none
)
from .youtube import YoutubeIE from .youtube import YoutubeIE
from .common import InfoExtractor from .common import InfoExtractor
@ -55,13 +58,15 @@ class YuJaIE(InfoExtractor):
# for some URLs, auth ID is 0 and another auth ID must be resolved from the node ID # for some URLs, auth ID is 0 and another auth ID must be resolved from the node ID
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]+)' subdomain, video_id, node_id = re.match(
subdomain, video_id, node_id = re.match(_NODE_REGEX, url).groups() r'https?://(?P<subdomain>[a-z0-9]+)\.yuja\.com/V/(?:Watch|Video)\?v=(?P<id>[0-9]+)(?:.*)&node=(?P<node>[0-9]+)',
url).groups()
# get new link using node ID # get new link using node ID
direct_link = self._download_json( direct_link = self._download_json(
'https://%s.yuja.com/P/Data/VideoJSON?video=%i&node=%i&checkUser=true&a=%s' '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')
@ -81,7 +86,6 @@ class YuJaIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'format_id': 'mp4_hls', 'format_id': 'mp4_hls',
'protocol': 'm3u8', 'protocol': 'm3u8',
'source_preference': 1
}) })
if data.get('videoLinkMp4'): if data.get('videoLinkMp4'):
@ -89,7 +93,6 @@ class YuJaIE(InfoExtractor):
'url': data.get('videoLinkMp4'), 'url': data.get('videoLinkMp4'),
'ext': 'mp4', 'ext': 'mp4',
'format_id': 'mp4', 'format_id': 'mp4',
'source_preference': 0
}) })
return { return {
@ -98,7 +101,7 @@ class YuJaIE(InfoExtractor):
'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'),
'timestamp': unified_timestamp(data.get('postedDate')), 'timestamp': unified_timestamp(data.get('postedDate') or data.get('lastModifiedTimestamp')),
# 'automatic_captions': TODO: add captions # 'automatic_captions': TODO: add captions
'duration': float(data.get('duration')) 'duration': float_or_none(data.get('duration'))
} }