From a169b6ccb6b861b4d0edfdbfe169e70ae40e51d8 Mon Sep 17 00:00:00 2001 From: coolsa Date: Sun, 14 Jan 2018 04:02:36 -0700 Subject: [PATCH] [weeklybeats] Corrected regex with groups --- youtube_dl/extractor/weeklybeats.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/weeklybeats.py b/youtube_dl/extractor/weeklybeats.py index 7410cd6ef..6897e8cae 100644 --- a/youtube_dl/extractor/weeklybeats.py +++ b/youtube_dl/extractor/weeklybeats.py @@ -5,7 +5,7 @@ from .common import InfoExtractor class WeeklyBeatsIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?weeklybeats\.com/(.+)/music/(.+)' + _VALID_URL = r'https?://(?:www\.)?weeklybeats\.com/(.+)/music/(?P.+)' _TEST = { 'url': 'https://weeklybeats.com/pulsn/music/week-1-bass-drop', 'md5': '03465d0fa355147822d2ba1100a82c7c', @@ -20,14 +20,14 @@ class WeeklyBeatsIE(InfoExtractor): } def _real_extract(self, url): - video_id = self._search_regex(r'https://weeklybeats.com/[^/]+/music/([^/]*)/?', url, 'video_id') + video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) return { 'id': video_id, - 'title': self._search_regex(r']+property="og:title"[^>]+content="([^\"]+)"[^>]*>', webpage, 'title', fatal=False), - 'description': self._search_regex(r']+property="og:description"[^>]+content="([^\"]*)"[^>]*>', webpage, 'description', fatal=False), - 'uploader': self._search_regex(r']+class="form_popular_tags ?artist"[^>]*>View by:([^<]+)<', webpage, 'uploader', fatal=False), - 'url': self._search_regex(r'mp3: \'([^\']+)\'', webpage, 'url') + 'title': self._search_regex(r']+id=(["\'])item_title\1>[^>]*

(?P[^<]+)', webpage, 'title', group='title'), + 'description': self._og_search_description(webpage), + 'uploader': self._search_regex(r'<a[^>]+class=(["\'])[^"\']+artist\1[^>]*>View by:(?P<uploader>[^<]+)', webpage, 'uploader', group='uploader'), + 'url': self._search_regex(r'<a[^>]+id=(["\'])item_download\1[^>]+href=\1(?P<url>[^"\']+)\?', webpage, 'url', group="url"), # TODO more properties (see youtube_dl/extractor/common.py) }