From 71e311795103a41f143740248e864824bc681a7f Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Sat, 8 Apr 2017 14:49:28 +0100 Subject: [PATCH 1/3] Update RBMA Radio URL It's been rebranded as "Red Bull Radio". --- youtube_dl/extractor/rbmaradio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/rbmaradio.py b/youtube_dl/extractor/rbmaradio.py index 53b82fba3..0536eb165 100644 --- a/youtube_dl/extractor/rbmaradio.py +++ b/youtube_dl/extractor/rbmaradio.py @@ -13,7 +13,7 @@ from ..utils import ( class RBMARadioIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?rbmaradio\.com/shows/(?P[^/]+)/episodes/(?P[^/?#&]+)' + _VALID_URL = r'https?://(?:www\.)?(rbmaradio|redbullradio)\.com/shows/(?P[^/]+)/episodes/(?P[^/?#&]+)' _TEST = { 'url': 'https://www.rbmaradio.com/shows/main-stage/episodes/ford-lopatin-live-at-primavera-sound-2011', 'md5': '6bc6f9bcb18994b4c983bc3bf4384d95', From de37fea111f0067882397cf82977526bfcb2a1bb Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Sat, 8 Apr 2017 15:12:29 +0100 Subject: [PATCH 2/3] Update info_dict with correct metadata Make the extractor test pass. --- youtube_dl/extractor/rbmaradio.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/rbmaradio.py b/youtube_dl/extractor/rbmaradio.py index 0536eb165..c86a8e0d8 100644 --- a/youtube_dl/extractor/rbmaradio.py +++ b/youtube_dl/extractor/rbmaradio.py @@ -20,8 +20,8 @@ class RBMARadioIE(InfoExtractor): 'info_dict': { 'id': 'ford-lopatin-live-at-primavera-sound-2011', 'ext': 'mp3', - 'title': 'Main Stage - Ford & Lopatin', - 'description': 'md5:4f340fb48426423530af5a9d87bd7b91', + 'title': 'Main Stage - Ford & Lopatin at Primavera Sound', + 'description': 'md5:d41d8cd98f00b204e9800998ecf8427e', 'thumbnail': r're:^https?://.*\.jpg', 'duration': 2452, 'timestamp': 1307103164, From 560fdb55c0012a233e34e4b1c09dfe9c08dd4665 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Sat, 8 Apr 2017 15:35:22 +0100 Subject: [PATCH 3/3] Use non-capturing group in URL regex --- youtube_dl/extractor/rbmaradio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/rbmaradio.py b/youtube_dl/extractor/rbmaradio.py index c86a8e0d8..afa7b9161 100644 --- a/youtube_dl/extractor/rbmaradio.py +++ b/youtube_dl/extractor/rbmaradio.py @@ -13,7 +13,7 @@ from ..utils import ( class RBMARadioIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?(rbmaradio|redbullradio)\.com/shows/(?P[^/]+)/episodes/(?P[^/?#&]+)' + _VALID_URL = r'https?://(?:www\.)?(?:rbmaradio|redbullradio)\.com/shows/(?P[^/]+)/episodes/(?P[^/?#&]+)' _TEST = { 'url': 'https://www.rbmaradio.com/shows/main-stage/episodes/ford-lopatin-live-at-primavera-sound-2011', 'md5': '6bc6f9bcb18994b4c983bc3bf4384d95',