From f6a4af595b016ada86dcf4cb671bfd26eb7f7407 Mon Sep 17 00:00:00 2001 From: Thomas Tsiakalakis Date: Sun, 24 Feb 2019 18:38:21 +0100 Subject: [PATCH] [intldropout] adjusted regexes --- youtube_dl/extractor/intldropout.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/intldropout.py b/youtube_dl/extractor/intldropout.py index e4e673ee5..1b401b4a0 100644 --- a/youtube_dl/extractor/intldropout.py +++ b/youtube_dl/extractor/intldropout.py @@ -18,7 +18,7 @@ class IntlDropoutIE(VHXEmbedIE): _NETRC_MACHINE = 'intl.dropout.tv' _LOGIN_URL = 'https://intl.dropout.tv/login' _LOGOUT_URL = 'https://intl.dropout.tv/logout' - _VALID_URL = r'https://intl\.dropout\.tv/([^/]+/season:[^/]+/)?videos/(?P.+)' + _VALID_URL = r'https://intl\.dropout\.tv/(?:[^/]+/season:[^/]+/)?videos/(?P.+)' _TESTS = [ { 'url': 'https://intl.dropout.tv/um-actually/season:1/videos/c-3po-s-origins-hp-lovecraft-the-food-album-with-weird-al-yankovic', @@ -89,13 +89,13 @@ class IntlDropoutIE(VHXEmbedIE): webpage = self._download_webpage(url, None) video = self._html_search_regex(r']*"(?Phttps://embed.vhx.tv/videos/[0-9]+[^"]*)"[^>]*>', webpage, 'embed') video_id = self._search_regex(r'https://embed.vhx.tv/videos/(?P[0-9]+)', video, 'id') - video_title = self._html_search_regex(r'

]*>()?(?P[^<]+)<', webpage, 'title') + video_title = self._html_search_regex(r'<h1 class="[^"]*video-title[^"]*"[^>]*><strong>(?P<title>[^<]+)<', webpage, 'title') return self.url_result(video, video_id=video_id, video_title=video_title) class IntlDropoutPlaylistIE(IntlDropoutIE): IE_NAME = 'intldropout:playlist' - _VALID_URL = r'^https://intl\.dropout\.tv/(?P<id>[^/]+(/season:[^/]+)?)' + _VALID_URL = r'^https://intl\.dropout\.tv/(?P<id>[^/]+(/season:[^/]+)?)$' _TESTS = [ { 'url': 'https://intl.dropout.tv/um-actually-the-web-series',