Browse Source

[southparkstudios] Use the generic `_real_extract` provided by the base class

totalwebcasting
Jaime Marquínez Ferrándiz 11 years ago
parent
commit
4bbf139aa7
2 changed files with 6 additions and 11 deletions
  1. +6
    -3
      youtube_dl/extractor/mtv.py
  2. +0
    -8
      youtube_dl/extractor/southparkstudios.py

+ 6
- 3
youtube_dl/extractor/mtv.py View File

@ -112,9 +112,12 @@ class MTVServicesInfoExtractor(InfoExtractor):
title = url_basename(url) title = url_basename(url)
webpage = self._download_webpage(url, title) webpage = self._download_webpage(url, title)
try: try:
# the url is in the format http://media.mtvnservices.com/fb/{mgid}.swf
fb_url = self._og_search_video_url(webpage)
mgid = url_basename(fb_url).rpartition('.')[0]
# the url can be http://media.mtvnservices.com/fb/{mgid}.swf
# or http://media.mtvnservices.com/{mgid}
og_url = self._og_search_video_url(webpage)
mgid = url_basename(og_url)
if mgid.endswith('.swf'):
mgid = mgid[:-4]
except RegexNotFoundError: except RegexNotFoundError:
mgid = self._search_regex(r'data-mgid="(.*?)"', webpage, u'mgid') mgid = self._search_regex(r'data-mgid="(.*?)"', webpage, u'mgid')
return self._get_videos_info(mgid) return self._get_videos_info(mgid)


+ 0
- 8
youtube_dl/extractor/southparkstudios.py View File

@ -18,14 +18,6 @@ class SouthParkStudiosIE(MTVServicesInfoExtractor):
}, },
}] }]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
url = u'http://www.' + mobj.group(u'url')
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
mgid = self._search_regex(r'swfobject.embedSWF\(".*?(mgid:.*?)"',
webpage, u'mgid')
return self._get_videos_info(mgid)
class SouthparkDeIE(SouthParkStudiosIE): class SouthparkDeIE(SouthParkStudiosIE):
IE_NAME = u'southpark.de' IE_NAME = u'southpark.de'


Loading…
Cancel
Save