mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-22 16:57:40 +00:00
Merge remote-tracking branch 'adammw/southpark'
This commit is contained in:
commit
eb50741129
2 changed files with 5 additions and 2 deletions
|
@ -158,6 +158,9 @@ class MTVServicesInfoExtractor(InfoExtractor):
|
||||||
if mgid.endswith('.swf'):
|
if mgid.endswith('.swf'):
|
||||||
mgid = mgid[:-4]
|
mgid = mgid[:-4]
|
||||||
except RegexNotFoundError:
|
except RegexNotFoundError:
|
||||||
|
mgid = None
|
||||||
|
|
||||||
|
if mgid is None or ':' not in mgid:
|
||||||
mgid = self._search_regex(
|
mgid = self._search_regex(
|
||||||
[r'data-mgid="(.*?)"', r'swfobject.embedSWF\(".*?(mgid:.*?)"'],
|
[r'data-mgid="(.*?)"', r'swfobject.embedSWF\(".*?(mgid:.*?)"'],
|
||||||
webpage, u'mgid')
|
webpage, u'mgid')
|
||||||
|
|
|
@ -5,7 +5,7 @@ from .mtv import MTVServicesInfoExtractor
|
||||||
|
|
||||||
class SouthParkStudiosIE(MTVServicesInfoExtractor):
|
class SouthParkStudiosIE(MTVServicesInfoExtractor):
|
||||||
IE_NAME = 'southparkstudios.com'
|
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'
|
_FEED_URL = 'http://www.southparkstudios.com/feeds/video-player/mrss'
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ class SouthParkStudiosIE(MTVServicesInfoExtractor):
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'a7bff6c2-ed00-11e0-aca6-0026b9414f30',
|
'id': 'a7bff6c2-ed00-11e0-aca6-0026b9414f30',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Bat Daded',
|
'title': 'South Park|Bat Daded',
|
||||||
'description': 'Randy disqualifies South Park by getting into a fight with Bat Dad.',
|
'description': 'Randy disqualifies South Park by getting into a fight with Bat Dad.',
|
||||||
},
|
},
|
||||||
}]
|
}]
|
||||||
|
|
Loading…
Reference in a new issue