youtube-dl

commit 4bbf139aa75cace056989411003e4a1b6b2616e7
parent 407ae733ab24dbe4fdbd5b996aef6438f16834a2
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Wed, 22 Jan 2014 11:35:17 +0100

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

Diffstat:
M
youtube_dl/extractor/mtv.py
 | 
9
++++++---
M
youtube_dl/extractor/southparkstudios.py
 | 
8
--------

2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
@@ -112,9 +112,12 @@ class MTVServicesInfoExtractor(InfoExtractor):
         title = url_basename(url)
         webpage = self._download_webpage(url, title)
         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:
             mgid = self._search_regex(r'data-mgid="(.*?)"', webpage, u'mgid')
         return self._get_videos_info(mgid)
diff --git a/youtube_dl/extractor/southparkstudios.py b/youtube_dl/extractor/southparkstudios.py
@@ -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):
     IE_NAME = u'southpark.de'