diff options
| author | Jaime Marquínez Ferrándiz <[email protected]> | 2014-07-13 14:01:09 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <[email protected]> | 2014-07-13 14:01:09 +0200 |
| commit | eb50741129959fa59109c77920328565193d0c64 (patch) | |
| tree | abdbfe9ce1c7123bb548104fc14b3830eb9d3916 | |
| parent | 36cb99f95843aebac873c5f5281d3cd95f76dd01 (diff) | |
| parent | 3804b012760dcc512322b49c7ae1dc4b8231b0db (diff) | |
| download | youtube-dl-eb50741129959fa59109c77920328565193d0c64.tar.gz youtube-dl-eb50741129959fa59109c77920328565193d0c64.zip | |
Merge remote-tracking branch 'adammw/southpark'
| -rw-r--r-- | youtube_dl/extractor/mtv.py | 3 | ||||
| -rw-r--r-- | youtube_dl/extractor/southparkstudios.py | 4 |
2 files changed, 5 insertions, 2 deletions
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') diff --git a/youtube_dl/extractor/southparkstudios.py b/youtube_dl/extractor/southparkstudios.py index aea8e6439..6955269f7 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\.)?(?P<url>southparkstudios\.com/(clips|full-episodes)/(?P<id>.+?)(\?|#|$))' + _VALID_URL = r'https?://(www\.)?(?P<url>(?:southpark\.cc|southparkstudios)\.com/(clips|full-episodes)/(?P<id>.+?)(\?|#|$))' _FEED_URL = 'http://www.southparkstudios.com/feeds/video-player/mrss' @@ -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.', }, }] |