Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[discovery] Add support for --geo-verification-proxy #17838

Merged
merged 2 commits into from Jan 2, 2019
Merged

[discovery] Add support for --geo-verification-proxy #17838

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d869af
[discovery] Add support for --geo-verification-proxy
lunaynx Oct 8, 2018
2b493e7
Update discovery.py
dstftw Jan 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions youtube_dl/extractor/discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class DiscoveryIE(DiscoveryGoBaseIE):

def _real_extract(self, url):
site, path, display_id = re.match(self._VALID_URL, url).groups()
webpage = self._download_webpage(url, display_id)
webpage = self._download_webpage(url, display_id, headers=self.geo_verification_headers())
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This


react_data = self._parse_json(self._search_regex(
r'window\.__reactTransmitPacket\s*=\s*({.+?});',
Expand Down Expand Up @@ -78,14 +78,17 @@ def _real_extract(self, url):
compat_str) or '3020a40c2356a645b4b4',
'nonce': ''.join([random.choice(string.ascii_letters) for _ in range(32)]),
'redirectUri': 'https://fusion.ddmcdn.com/app/mercury-sdk/180/redirectHandler.html?https://www.%s.com' % site,
})['access_token']
}, headers=self.geo_verification_headers())['access_token']
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and this does not look to be geo restricted.


try:
headers = self.geo_verification_headers()
headers.update({
'Authorization': 'Bearer ' + access_token,
})

stream = self._download_json(
'https://api.discovery.com/v1/streaming/video/' + video_id,
display_id, headers={
'Authorization': 'Bearer ' + access_token,
})
display_id, headers=headers)
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code in (401, 403):
e_description = self._parse_json(
Expand Down