Merge pull request #1784 from rzhxeo/southpark
Add support for southpark.de
This commit is contained in:
commit
ce80c8b8ee
2 changed files with 23 additions and 7 deletions
|
@ -116,7 +116,10 @@ from .slashdot import SlashdotIE
|
||||||
from .slideshare import SlideshareIE
|
from .slideshare import SlideshareIE
|
||||||
from .sohu import SohuIE
|
from .sohu import SohuIE
|
||||||
from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE
|
from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE
|
||||||
from .southparkstudios import SouthParkStudiosIE
|
from .southparkstudios import (
|
||||||
|
SouthParkStudiosIE,
|
||||||
|
SouthparkDeIE,
|
||||||
|
)
|
||||||
from .space import SpaceIE
|
from .space import SpaceIE
|
||||||
from .spankwire import SpankwireIE
|
from .spankwire import SpankwireIE
|
||||||
from .spiegel import SpiegelIE
|
from .spiegel import SpiegelIE
|
||||||
|
|
|
@ -5,21 +5,19 @@ from .mtv import MTVIE, _media_xml_tag
|
||||||
|
|
||||||
class SouthParkStudiosIE(MTVIE):
|
class SouthParkStudiosIE(MTVIE):
|
||||||
IE_NAME = u'southparkstudios.com'
|
IE_NAME = u'southparkstudios.com'
|
||||||
_VALID_URL = r'https?://www\.southparkstudios\.com/(clips|full-episodes)/(?P<id>.+?)(\?|#|$)'
|
_VALID_URL = r'(https?://)?(www\.)?(?P<url>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'
|
||||||
|
|
||||||
_TEST = {
|
# Overwrite MTVIE properties we don't want
|
||||||
|
_TESTS = [{
|
||||||
u'url': u'http://www.southparkstudios.com/clips/104437/bat-daded#tab=featured',
|
u'url': u'http://www.southparkstudios.com/clips/104437/bat-daded#tab=featured',
|
||||||
u'file': u'a7bff6c2-ed00-11e0-aca6-0026b9414f30.mp4',
|
u'file': u'a7bff6c2-ed00-11e0-aca6-0026b9414f30.mp4',
|
||||||
u'info_dict': {
|
u'info_dict': {
|
||||||
u'title': u'Bat Daded',
|
u'title': u'Bat Daded',
|
||||||
u'description': u'Randy disqualifies South Park by getting into a fight with Bat Dad.',
|
u'description': u'Randy disqualifies South Park by getting into a fight with Bat Dad.',
|
||||||
},
|
},
|
||||||
}
|
}]
|
||||||
|
|
||||||
# Overwrite MTVIE properties we don't want
|
|
||||||
_TESTS = []
|
|
||||||
|
|
||||||
def _get_thumbnail_url(self, uri, itemdoc):
|
def _get_thumbnail_url(self, uri, itemdoc):
|
||||||
search_path = '%s/%s' % (_media_xml_tag('group'), _media_xml_tag('thumbnail'))
|
search_path = '%s/%s' % (_media_xml_tag('group'), _media_xml_tag('thumbnail'))
|
||||||
|
@ -31,8 +29,23 @@ class SouthParkStudiosIE(MTVIE):
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
|
url = u'http://www.' + mobj.group(u'url')
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
mgid = self._search_regex(r'swfobject.embedSWF\(".*?(mgid:.*?)"',
|
mgid = self._search_regex(r'swfobject.embedSWF\(".*?(mgid:.*?)"',
|
||||||
webpage, u'mgid')
|
webpage, u'mgid')
|
||||||
return self._get_videos_info(mgid)
|
return self._get_videos_info(mgid)
|
||||||
|
|
||||||
|
class SouthparkDeIE(SouthParkStudiosIE):
|
||||||
|
IE_NAME = u'southpark.de'
|
||||||
|
_VALID_URL = r'(https?://)?(www\.)?(?P<url>southpark\.de/(clips|alle-episoden)/(?P<id>.+?)(\?|#|$))'
|
||||||
|
_FEED_URL = 'http://www.southpark.de/feeds/video-player/mrss/'
|
||||||
|
|
||||||
|
_TESTS = [{
|
||||||
|
u'url': u'http://www.southpark.de/clips/uygssh/the-government-wont-respect-my-privacy#tab=featured',
|
||||||
|
u'file': u'85487c96-b3b9-4e39-9127-ad88583d9bf2.mp4',
|
||||||
|
u'info_dict': {
|
||||||
|
u'title': u'The Government Won\'t Respect My Privacy',
|
||||||
|
u'description': u'Cartman explains the benefits of "Shitter" to Stan, Kyle and Craig.',
|
||||||
|
},
|
||||||
|
}]
|
||||||
|
|
Loading…
Reference in a new issue