projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
826dcff
)
[discovery] use API call for video data extraction(#21808)
author
Remita Amine
<remitamine@gmail.com>
Thu, 1 Aug 2019 21:44:38 +0000
(22:44 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Thu, 1 Aug 2019 21:45:10 +0000
(22:45 +0100)
youtube_dl/extractor/discovery.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/discovery.py
b/youtube_dl/extractor/discovery.py
index 9003545cedfc70aee5c9bf8de64e455fa6275601..c4b90cd90a3bf7d4e781c1c1414032c3c71dd9a2 100644
(file)
--- a/
youtube_dl/extractor/discovery.py
+++ b/
youtube_dl/extractor/discovery.py
@@
-5,14
+5,8
@@
import re
import string
from .discoverygo import DiscoveryGoBaseIE
import string
from .discoverygo import DiscoveryGoBaseIE
-from ..compat import (
- compat_str,
- compat_urllib_parse_unquote,
-)
-from ..utils import (
- ExtractorError,
- try_get,
-)
+from ..compat import compat_urllib_parse_unquote
+from ..utils import ExtractorError
from ..compat import compat_HTTPError
from ..compat import compat_HTTPError
@@
-40,15
+34,15
@@
class DiscoveryIE(DiscoveryGoBaseIE):
cookingchanneltv|
motortrend
)
cookingchanneltv|
motortrend
)
- )\.com
(?P<path>/tv-shows/[^/]+/(?:video|full-episode)s/(?P<id>[^./?#]+)
)'''
+ )\.com
/tv-shows/[^/]+/(?:video|full-episode)s/(?P<id>[^./?#]+
)'''
_TESTS = [{
_TESTS = [{
- 'url': 'https://
www.discovery.com/tv-shows/cash-cab/videos/dave-fole
y',
+ 'url': 'https://
go.discovery.com/tv-shows/cash-cab/videos/riding-with-matthew-perr
y',
'info_dict': {
'info_dict': {
- 'id': '5a2
d9b4d6b66d17a5026e1fd
',
+ 'id': '5a2
f35ce6b66d17a5026e29e
',
'ext': 'mp4',
'ext': 'mp4',
- 'title': '
Dave Fole
y',
- 'description': 'md5:
4b39bcafccf9167ca42810eb5f28b01f
',
- 'duration':
608
,
+ 'title': '
Riding with Matthew Perr
y',
+ 'description': 'md5:
a34333153e79bc4526019a5129e7f878
',
+ 'duration':
84
,
},
'params': {
'skip_download': True, # requires ffmpeg
},
'params': {
'skip_download': True, # requires ffmpeg
@@
-62,17
+56,10
@@
class DiscoveryIE(DiscoveryGoBaseIE):
}]
_GEO_COUNTRIES = ['US']
_GEO_BYPASS = False
}]
_GEO_COUNTRIES = ['US']
_GEO_BYPASS = False
+ _API_BASE_URL = 'https://api.discovery.com/v1/'
def _real_extract(self, url):
def _real_extract(self, url):
- site, path, display_id = re.match(self._VALID_URL, url).groups()
- webpage = self._download_webpage(url, display_id)
-
- react_data = self._parse_json(self._search_regex(
- r'window\.__reactTransmitPacket\s*=\s*({.+?});',
- webpage, 'react data'), display_id)
- content_blocks = react_data['layout'][path]['contentBlocks']
- video = next(cb for cb in content_blocks if cb.get('type') == 'video')['content']['items'][0]
- video_id = video['id']
+ site, display_id = re.match(self._VALID_URL, url).groups()
access_token = None
cookies = self._get_cookies(url)
access_token = None
cookies = self._get_cookies(url)
@@
-82,27
+69,33
@@
class DiscoveryIE(DiscoveryGoBaseIE):
if auth_storage_cookie and auth_storage_cookie.value:
auth_storage = self._parse_json(compat_urllib_parse_unquote(
compat_urllib_parse_unquote(auth_storage_cookie.value)),
if auth_storage_cookie and auth_storage_cookie.value:
auth_storage = self._parse_json(compat_urllib_parse_unquote(
compat_urllib_parse_unquote(auth_storage_cookie.value)),
-
video
_id, fatal=False) or {}
+
display
_id, fatal=False) or {}
access_token = auth_storage.get('a') or auth_storage.get('access_token')
if not access_token:
access_token = self._download_json(
access_token = auth_storage.get('a') or auth_storage.get('access_token')
if not access_token:
access_token = self._download_json(
- 'https://%s.com/anonymous' % site, display_id, query={
+ 'https://%s.com/anonymous' % site, display_id,
+ 'Downloading token JSON metadata', query={
'authRel': 'authorization',
'authRel': 'authorization',
- 'client_id': try_get(
- react_data, lambda x: x['application']['apiClientId'],
- compat_str) or '3020a40c2356a645b4b4',
+ 'client_id': '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']
'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']
- try:
- headers = self.geo_verification_headers()
- headers['Authorization'] = 'Bearer ' + access_token
+ headers = self.geo_verification_headers()
+ headers['Authorization'] = 'Bearer ' + access_token
+ try:
+ video = self._download_json(
+ self._API_BASE_URL + 'content/videos',
+ display_id, 'Downloading content JSON metadata',
+ headers=headers, query={
+ 'slug': display_id,
+ })[0]
+ video_id = video['id']
stream = self._download_json(
stream = self._download_json(
-
'https://api.discovery.com/v1/
streaming/video/' + video_id,
- display_id, headers=headers)
+
self._API_BASE_URL + '
streaming/video/' + video_id,
+ display_id,
'Downloading streaming JSON metadata',
headers=headers)
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code in (401, 403):
e_description = self._parse_json(
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code in (401, 403):
e_description = self._parse_json(