From 04a7c7a84901692058b23209f30c55ccbe88704f Mon Sep 17 00:00:00 2001 From: dirkf Date: Sat, 29 Oct 2022 07:32:52 +0100 Subject: [PATCH] Fix test --- youtube_dl/extractor/platzi.py | 56 ++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/youtube_dl/extractor/platzi.py b/youtube_dl/extractor/platzi.py index 0f79cf555..c9597a747 100644 --- a/youtube_dl/extractor/platzi.py +++ b/youtube_dl/extractor/platzi.py @@ -3,7 +3,9 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..compat import ( + compat_kwargs, compat_str, + compat_urllib_parse_urlparse, ) from ..utils import ( clean_html, @@ -78,6 +80,26 @@ class PlatziIE(PlatziBaseIE): ''' _TESTS = [{ + 'url': 'https://platzi.com/clases/1927-intro-selenium/29383-bienvenida-al-curso', + 'md5': '0af120f1ffd18a2246f19099d52b83e2', + 'info_dict': { + 'id': '29383', + 'ext': 'mp4', + 'title': 'Por qué aprender Selenium y qué verás', + 'description': 'md5:bbe91d2760052ca4054a3149a6580436', + 'timestamp': 1627400390, + 'upload_date': '20210727', + 'creator': 'Héctor Vega', + 'series': 'Curso de Introducción a Selenium con Python', + 'duration': 11700, + 'categories': list, + }, + 'params': { + 'format': 'bestvideo', + # 'skip_download': True, + }, + 'expected_warnings': ['HTTP Error 401'] + }, { 'url': 'https://platzi.com/clases/1311-next-js/12074-creando-nuestra-primera-pagina/', 'md5': '8f56448241005b561c10f11a595b37e3', 'info_dict': { @@ -87,7 +109,7 @@ class PlatziIE(PlatziBaseIE): 'description': 'md5:4c866e45034fc76412fbf6e60ae008bc', 'duration': 420, }, - 'skip': 'Requires platzi account credentials', + 'skip': 'Content expired', }, { 'url': 'https://courses.platzi.com/classes/1367-communication-codestream/13430-background/', 'info_dict': { @@ -97,23 +119,39 @@ class PlatziIE(PlatziBaseIE): 'description': 'md5:49c83c09404b15e6e71defaf87f6b305', 'duration': 360, }, - 'skip': 'Requires platzi account credentials', - 'params': { - 'skip_download': True, - }, + 'skip': 'Content expired', }] + def _download_webpage_handle(self, url_or_request, video_id, *args, **kwargs): + # CF likes Connection: keep-alive and so disfavours Py2 + # retry on 403 may get in + kwargs['expected_status'] = 403 + x = super(PlatziIE, self)._download_webpage_handle(url_or_request, video_id, *args, **kwargs) + if x is not False and x[1].getcode() == 403: + kwargs.pop('expected_status', None) + note = kwargs.pop('note', '') + kwargs['note'] = (note or 'Downloading webpage') + ' - retrying' + x = super(PlatziIE, self)._download_webpage_handle(url_or_request, video_id, *args, **kwargs) + return x + def _real_extract(self, url): lecture_id = self._match_id(url) - headers = {'User-Agent': 'Mozilla/5.0'} - webpage = self._download_webpage(url, lecture_id, headers=headers) + # header parameters required fpor Py3 to breach site's CF fence w/o 403 + headers = { + 'User-Agent': 'Mozilla/5.0', # (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.0.0 Safari/537.36', + } + webpage, urlh = self._download_webpage_handle(url, lecture_id, headers=headers) + if compat_urllib_parse_urlparse(urlh.geturl()).path == '/': + raise ExtractorError( + 'Redirected to home page: content expired?', expected=True) + data_preloaded_state = self._parse_json( self._search_regex( (r'window\s*.\s*__PRELOADED_STATE__\s*=\s*({.*?});?\s*