From 6a46dc8db7c5d71107cc555a0f178c7c26c109d6 Mon Sep 17 00:00:00 2001 From: Adam Malcontenti-Wilson Date: Sun, 13 Jul 2014 12:48:30 +1000 Subject: [PATCH 1/3] Add southpark.cc.com to southpark IE --- youtube_dl/extractor/southparkstudios.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/southparkstudios.py b/youtube_dl/extractor/southparkstudios.py index aea8e6439..e2df242c5 100644 --- a/youtube_dl/extractor/southparkstudios.py +++ b/youtube_dl/extractor/southparkstudios.py @@ -5,7 +5,7 @@ from .mtv import MTVServicesInfoExtractor class SouthParkStudiosIE(MTVServicesInfoExtractor): IE_NAME = 'southparkstudios.com' - _VALID_URL = r'https?://(www\.)?(?Psouthparkstudios\.com/(clips|full-episodes)/(?P.+?)(\?|#|$))' + _VALID_URL = r'https?://(www\.)?(?P(?:southpark\.cc|southparkstudios)\.com/(clips|full-episodes)/(?P.+?)(\?|#|$))' _FEED_URL = 'http://www.southparkstudios.com/feeds/video-player/mrss' From b1298d8e064e3c1d31bdfffe8a3b5cfed8b0b61d Mon Sep 17 00:00:00 2001 From: Adam Malcontenti-Wilson Date: Sun, 13 Jul 2014 21:15:18 +1000 Subject: [PATCH 2/3] Test for colon in mgid --- youtube_dl/extractor/mtv.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py index af9490ccc..228b42d2b 100644 --- a/youtube_dl/extractor/mtv.py +++ b/youtube_dl/extractor/mtv.py @@ -158,6 +158,9 @@ class MTVServicesInfoExtractor(InfoExtractor): if mgid.endswith('.swf'): mgid = mgid[:-4] except RegexNotFoundError: + mgid = None + + if mgid is None or ':' not in mgid: mgid = self._search_regex( [r'data-mgid="(.*?)"', r'swfobject.embedSWF\(".*?(mgid:.*?)"'], webpage, u'mgid') From 3804b012760dcc512322b49c7ae1dc4b8231b0db Mon Sep 17 00:00:00 2001 From: Adam Malcontenti-Wilson Date: Sun, 13 Jul 2014 21:29:04 +1000 Subject: [PATCH 3/3] Update test --- youtube_dl/extractor/southparkstudios.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/southparkstudios.py b/youtube_dl/extractor/southparkstudios.py index e2df242c5..6955269f7 100644 --- a/youtube_dl/extractor/southparkstudios.py +++ b/youtube_dl/extractor/southparkstudios.py @@ -14,7 +14,7 @@ class SouthParkStudiosIE(MTVServicesInfoExtractor): 'info_dict': { 'id': 'a7bff6c2-ed00-11e0-aca6-0026b9414f30', 'ext': 'mp4', - 'title': 'Bat Daded', + 'title': 'South Park|Bat Daded', 'description': 'Randy disqualifies South Park by getting into a fight with Bat Dad.', }, }]