From b6aef5870b11505232c7bb849a9c3a029b549f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20L=C3=B3pez=20Juan?= Date: Sat, 23 Dec 2017 23:46:44 +0100 Subject: [PATCH] [ccma] Additional test, shorter URL regex --- youtube_dl/extractor/ccma.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/ccma.py b/youtube_dl/extractor/ccma.py index 056b3d0a3..4397e9626 100644 --- a/youtube_dl/extractor/ccma.py +++ b/youtube_dl/extractor/ccma.py @@ -13,7 +13,7 @@ from ..utils import ( class CCMAIE(InfoExtractor): - _VALID_URL = r'^https?://(?:www\.)?ccma\.cat/(?:[^/]+/)*?(?Pvideo|audio)/(?P\d+).*$|^https?://(?:www\.)?ccma\.cat/(?Ptv3|catradio)/(?:[^/]+/)*?(?P\d+)/?$' + _VALID_URL = r'^https?://(?:www\.)?ccma\.cat/((?:[^/]+/)*?(?Pvideo|audio)/(?P\d+)|(?Ptv3|catradio)/(?:[^/]+/)*?(?P\d+)/?$)' _TESTS = [{ 'url': 'http://www.ccma.cat/tv3/alacarta/lespot-de-la-marato-de-tv3/lespot-de-la-marato-de-tv3/video/5630208/', 'md5': '7296ca43977c8ea4469e719c609b0871', @@ -45,6 +45,17 @@ class CCMAIE(InfoExtractor): 'description': 'md5:feca2bcac2bace0c37395f625ea4065e', 'title': 'Arrimadas (Cs): "Hem guanyat les eleccions al Parlament de Catalunya"' } + }, { + 'url': 'http://www.ccma.cat/catradio/alacarta/lendema-del-21d/sabria-erc-no-ens-podem-entretenir-ni-un-moment-per-formar-govern/coleccio/11011/986031/', + 'md5': '471586ce88bcbbdd031afafe75ec72e0', + 'info_dict': { + 'id': '986031', + 'ext': 'mp3', + 'upload_date': '20181210', + 'title': 'SabriĆ  (ERC): "No ens podem entretenir ni un moment per formar govern"', + 'description': 'md5:faf8ec9faf2115fbf462ad3f7ad175df', + 'timestamp': 1544424300, + } }] def _real_extract(self, url):