From 958b162ef889017c94d13353f4b8e724a499f49f Mon Sep 17 00:00:00 2001 From: rrooij Date: Mon, 11 May 2015 17:38:08 +0200 Subject: [PATCH 1/2] [southpark] Sort alphabetically --- youtube_dl/extractor/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index b376fd279..3368edf7c 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -489,8 +489,8 @@ from .soundgasm import ( ) from .southpark import ( SouthParkIE, - SouthParkEsIE, SouthParkDeIE, + SouthParkEsIE, SouthParkNlIE ) from .space import SpaceIE From ef8272080130a73286ea40ce45fa512d7c7b1db9 Mon Sep 17 00:00:00 2001 From: rrooij Date: Mon, 11 May 2015 18:02:25 +0200 Subject: [PATCH 2/2] [southparkdk] Add extractor --- youtube_dl/extractor/__init__.py | 1 + youtube_dl/extractor/southpark.py | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 3368edf7c..de19dfd7a 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -490,6 +490,7 @@ from .soundgasm import ( from .southpark import ( SouthParkIE, SouthParkDeIE, + SouthParkDkIE, SouthParkEsIE, SouthParkNlIE ) diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py index 59e31198c..83e5a7659 100644 --- a/youtube_dl/extractor/southpark.py +++ b/youtube_dl/extractor/southpark.py @@ -57,3 +57,13 @@ class SouthParkNlIE(SouthParkIE): 'url': 'http://www.southpark.nl/full-episodes/s18e06-freemium-isnt-free', 'playlist_count': 4, }] + +class SouthParkDkIE(SouthParkIE): + IE_NAME = 'southpark.dk' + _VALID_URL = r'https?://(?:www\.)?(?Psouthparkstudios\.dk/(?:clips|full-episodes)/(?P.+?)(\?|#|$))' + _FEED_URL = 'http://www.southparkstudios.dk/feeds/video-player/mrss/' + + _TESTS = [{ + 'url': 'http://www.southparkstudios.dk/full-episodes/s18e07-grounded-vindaloop', + 'playlist_count': 4, + }]