mirrors
/
youtube-dl
0
0
Fork 0
Code Releases 1 Activity

rename southparkstudios.py to southpark.py 

And make the extractor only recognize southpark.cc.com urls, the old urls are redirected.
main
Jaime Marquínez Ferrándiz 2014-07-13 14:08:23 +02:00
parent eb50741129
commit 10d00a756a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/__init__.py
View File

@ -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

10
youtube_dl/extractor/southparkstudios.py → youtube_dl/extractor/southpark.py
View File

@ -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/'