diff options
| author | Sergey M. <dstftw@gmail.com> | 2015-05-05 19:32:27 +0500 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2015-05-05 19:32:27 +0500 |
| commit | 22e462c97a4d6eb3e058e5e337e6913262389730 (patch) | |
| tree | 58c9150eb2135ca4e432974a35afacc9f818d509 | |
| parent | ce5c1ae51703d1be4e486cbe8d3dfc2ab16372a8 (diff) | |
| parent | dcf807790673ef8adb22ed6ff93f6232903d75f6 (diff) | |
| download | youtube-dl-22e462c97a4d6eb3e058e5e337e6913262389730.tar.xz | |
Merge pull request #5612 from rrooij/southparknl
Southparknl
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 3 | ||||
| -rw-r--r-- | youtube_dl/extractor/southpark.py | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 1c3a46dd8..5dfa781f8 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -484,7 +484,8 @@ from .soundgasm import ( from .southpark import ( SouthParkIE, SouthParkEsIE, - SouthparkDeIE, + SouthParkDeIE, + SouthParkNlIE ) from .space import SpaceIE from .spankbang import SpankBangIE diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py index e3b73295c..59e31198c 100644 --- a/youtube_dl/extractor/southpark.py +++ b/youtube_dl/extractor/southpark.py @@ -32,7 +32,7 @@ class SouthParkEsIE(SouthParkIE): }] -class SouthparkDeIE(SouthParkIE): +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/' @@ -46,3 +46,14 @@ class SouthparkDeIE(SouthParkIE): 'description': 'Cartman explains the benefits of "Shitter" to Stan, Kyle and Craig.', }, }] + + +class SouthParkNlIE(SouthParkIE): + IE_NAME = 'southpark.nl' + _VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.nl/(?:clips|full-episodes)/(?P<id>.+?)(\?|#|$))' + _FEED_URL = 'http://www.southpark.nl/feeds/video-player/mrss/' + + _TESTS = [{ + 'url': 'http://www.southpark.nl/full-episodes/s18e06-freemium-isnt-free', + 'playlist_count': 4, + }] |