MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-02 16:32:56 +01:00
Code Issues Releases Wiki Activity

[box] allow subdomain for box without file id in url

Browse Source
This commit is contained in:
anderstornkvist 2021-01-19 10:41:04 +01:00
parent 78352870bf
commit 0cca4de1ae
No known key found for this signature in database
GPG Key ID: 40AD4A2D7F93201F
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/box.py
View File

@ -14,7 +14,7 @@ from ..utils import (
class BoxIE(InfoExtractor): class BoxIE(InfoExtractor):
_VALID_URL = r'https?://(?:[^.]+\.)?app\.box\.com/s/(?P<shared_name>[^/]+)/file/(?P<id>\d+)' _VALID_URL = r'https?://(?P<prefix>(?:[^.]+\.)?)app\.box\.com/s/(?P<shared_name>[^/]+)(?:/file/(?P<id>\d+))?'
_TEST = { _TEST = {
'url': 'https://mlssoccer.app.box.com/s/0evd2o3e08l60lr4ygukepvnkord1o1x/file/510727257538', 'url': 'https://mlssoccer.app.box.com/s/0evd2o3e08l60lr4ygukepvnkord1o1x/file/510727257538',
'md5': '1f81b2fd3960f38a40a3b8823e5fcd43', 'md5': '1f81b2fd3960f38a40a3b8823e5fcd43',
@ -30,20 +30,22 @@ class BoxIE(InfoExtractor):
} }
def _real_extract(self, url): def _real_extract(self, url):
shared_name, file_id = re.match(self._VALID_URL, url).groups() prefix, shared_name, file_id = re.match(self._VALID_URL, url).groups()
webpage = self._download_webpage(url, file_id) webpage = self._download_webpage(url, file_id)
if not file_id:
file_id = re.search(r'"typedID":\s*"f_(\d+)"', webpage).group(1)
request_token = self._parse_json(self._search_regex( request_token = self._parse_json(self._search_regex(
r'Box\.config\s*=\s*({.+?});', webpage, r'Box\.config\s*=\s*({.+?});', webpage,
'Box config'), file_id)['requestToken'] 'Box config'), file_id)['requestToken']
access_token = self._download_json( access_token = self._download_json(
'https://app.box.com/app-api/enduserapp/elements/tokens', file_id, 'https://' + prefix + 'app.box.com/app-api/enduserapp/elements/tokens', file_id,
'Downloading token JSON metadata', 'Downloading token JSON metadata',
data=json.dumps({'fileIDs': [file_id]}).encode(), headers={ data=json.dumps({'fileIDs': [file_id]}).encode(), headers={
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-Request-Token': request_token, 'X-Request-Token': request_token,
'X-Box-EndUser-API': 'sharedName=' + shared_name, 'X-Box-EndUser-API': 'sharedName=' + shared_name,
})[file_id]['read'] })[file_id]['read']
shared_link = 'https://app.box.com/s/' + shared_name shared_link = 'https://' + prefix + 'app.box.com/s/' + shared_name
f = self._download_json( f = self._download_json(
'https://api.box.com/2.0/files/' + file_id, file_id, 'https://api.box.com/2.0/files/' + file_id, file_id,
'Downloading file JSON metadata', headers={ 'Downloading file JSON metadata', headers={