From d23f9ec7ebdb11cfa3bb3b3a9eb388a6363a878e Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 13 Sep 2020 01:04:02 +0200 Subject: [PATCH] [gdcvault] fix extractor at least when not logged in? --- youtube_dlc/extractor/gdcvault.py | 67 +++++++++---------------------- 1 file changed, 19 insertions(+), 48 deletions(-) diff --git a/youtube_dlc/extractor/gdcvault.py b/youtube_dlc/extractor/gdcvault.py index 2f555c1d4..1220be2d9 100644 --- a/youtube_dlc/extractor/gdcvault.py +++ b/youtube_dlc/extractor/gdcvault.py @@ -122,67 +122,38 @@ def _login(self, webpage_url, display_id): request = sanitized_Request(login_url, urlencode_postdata(login_form)) request.add_header('Content-Type', 'application/x-www-form-urlencoded') self._download_webpage(request, display_id, 'Logging in') - start_page = self._download_webpage(webpage_url, display_id, 'Getting authenticated video page') + webpage = self._download_webpage(webpage_url, display_id, 'Getting authenticated video page') self._download_webpage(logout_url, display_id, 'Logging out') - return start_page + return webpage def _real_extract(self, url): video_id, name = re.match(self._VALID_URL, url).groups() display_id = name or video_id - webpage_url = 'http://www.gdcvault.com/play/' + video_id - start_page = self._download_webpage(webpage_url, display_id) + webpage = self._download_webpage(url, display_id) - direct_url = self._search_regex( - r's1\.addVariable\("file",\s*encodeURIComponent\("(/[^"]+)"\)\);', - start_page, 'url', default=None) - if direct_url: - title = self._html_search_regex( - r'Session Name:?\s*(.*?)', - start_page, 'title') - video_url = 'http://www.gdcvault.com' + direct_url - # resolve the url so that we can detect the correct extension - video_url = self._request_webpage( - HEADRequest(video_url), video_id).geturl() + title = self._html_search_regex( + r'Session Name:?\s*(.*?)', + webpage, 'title') - return { - 'id': video_id, - 'display_id': display_id, - 'url': video_url, - 'title': title, - } + PLAYER_REGEX = r'' + manifest_url = self._html_search_regex( + PLAYER_REGEX, webpage, 'manifest_url') - embed_url = KalturaIE._extract_url(start_page) - if embed_url: - embed_url = smuggle_url(embed_url, {'source_url': url}) - ie_key = 'Kaltura' - else: - PLAYER_REGEX = r'', - start_page, 'xml filename') - embed_url = '%s/xml/%s' % (xml_root, xml_name) - ie_key = 'DigitallySpeaking' + kaltura_id = self._search_regex( + r'entry_id=(?P(?:[^&])+)', manifest_url, + 'kaltura id', group='id') return { '_type': 'url_transparent', + 'url': 'kaltura:%s:%s' % (partner_id, kaltura_id), + 'ie_key': KalturaIE.ie_key(), 'id': video_id, 'display_id': display_id, - 'url': embed_url, - 'ie_key': ie_key, - } + 'title': title, + } \ No newline at end of file