Explorar el Código

rename southparkstudios.py to southpark.py

And make the extractor only recognize southpark.cc.com urls, the old urls are redirected.
Jaime Marquínez Ferrándiz hace 11 años
padre
commit
10d00a756a
Se han modificado 2 ficheros con 7 adiciones y 7 borrados
  1. 2 2
      youtube_dl/extractor/__init__.py
  2. 5 5
      youtube_dl/extractor/southpark.py

+ 2 - 2
youtube_dl/extractor/__init__.py

@@ -270,8 +270,8 @@ from .soundcloud import (
     SoundcloudPlaylistIE
 )
 from .soundgasm import SoundgasmIE
-from .southparkstudios import (
-    SouthParkStudiosIE,
+from .southpark import (
+    SouthParkIE,
     SouthparkDeIE,
 )
 from .space import SpaceIE

+ 5 - 5
youtube_dl/extractor/southparkstudios.py → youtube_dl/extractor/southpark.py

@@ -3,14 +3,14 @@ from __future__ import unicode_literals
 from .mtv import MTVServicesInfoExtractor
 
 
-class SouthParkStudiosIE(MTVServicesInfoExtractor):
-    IE_NAME = 'southparkstudios.com'
-    _VALID_URL = r'https?://(www\.)?(?P<url>(?:southpark\.cc|southparkstudios)\.com/(clips|full-episodes)/(?P<id>.+?)(\?|#|$))'
+class SouthParkIE(MTVServicesInfoExtractor):
+    IE_NAME = 'southpark.cc.com'
+    _VALID_URL = r'https?://(www\.)?(?P<url>southpark\.cc\.com/(clips|full-episodes)/(?P<id>.+?)(\?|#|$))'
 
     _FEED_URL = 'http://www.southparkstudios.com/feeds/video-player/mrss'
 
     _TESTS = [{
-        'url': 'http://www.southparkstudios.com/clips/104437/bat-daded#tab=featured',
+        'url': 'http://southpark.cc.com/clips/104437/bat-daded#tab=featured',
         'info_dict': {
             'id': 'a7bff6c2-ed00-11e0-aca6-0026b9414f30',
             'ext': 'mp4',
@@ -20,7 +20,7 @@ class SouthParkStudiosIE(MTVServicesInfoExtractor):
     }]
 
 
-class SouthparkDeIE(SouthParkStudiosIE):
+class SouthparkDeIE(SouthParkIE):
     IE_NAME = '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/'