From e10dc0e1f0f6b33b60a601bf7855e76e7813ecde Mon Sep 17 00:00:00 2001 From: rrooij Date: Tue, 5 May 2015 08:59:09 +0200 Subject: [PATCH 1/3] [southparknl] Add extractor for southpark.nl --- youtube_dl/extractor/__init__.py | 1 + youtube_dl/extractor/southpark.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 1c3a46dd8d..b042e9215c 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -485,6 +485,7 @@ SouthParkIE, SouthParkEsIE, 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 e3b73295c1..ebcd2ed044 100644 --- a/youtube_dl/extractor/southpark.py +++ b/youtube_dl/extractor/southpark.py @@ -46,3 +46,18 @@ 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\.)?(?Psouthpark\.nl/(?:clips|full-episodes)/(?P.+?)(\?|#|$))' + _FEED_URL = 'http://www.southpark.nl/feeds/video-player/mrss/' + + _TESTS = [{ + 'url': 'http://www.southpark.nl/full-episodes/s18e06-freemium-isnt-free', + 'info_dict': { + 'id': 'c56b9a1f-0e42-4942-89e0-8e721d814c5c', + 'ext': 'mp4', + 'title': 'South Park 1806: Freemium Isn\'t Free - Act 3', + }, + }] From 3408f6e64a7438dbc1bcc087a00e8540ef660eb3 Mon Sep 17 00:00:00 2001 From: rrooij Date: Tue, 5 May 2015 09:01:07 +0200 Subject: [PATCH 2/3] [southparkde] Fix naming inconsistency The class was first called 'SouthparkDe'. It is now changed to 'SouthParkDe' to match the name of the other extractors. --- youtube_dl/extractor/__init__.py | 2 +- youtube_dl/extractor/southpark.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index b042e9215c..5dfa781f88 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -484,7 +484,7 @@ from .southpark import ( SouthParkIE, SouthParkEsIE, - SouthparkDeIE, + SouthParkDeIE, SouthParkNlIE ) from .space import SpaceIE diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py index ebcd2ed044..2b12f2ad30 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\.)?(?Psouthpark\.de/(?:clips|alle-episoden)/(?P.+?)(\?|#|$))' _FEED_URL = 'http://www.southpark.de/feeds/video-player/mrss/' From dcf807790673ef8adb22ed6ff93f6232903d75f6 Mon Sep 17 00:00:00 2001 From: rrooij Date: Tue, 5 May 2015 09:17:21 +0200 Subject: [PATCH 3/3] [southparknl] Fix test to match playlist tests --- youtube_dl/extractor/southpark.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/youtube_dl/extractor/southpark.py b/youtube_dl/extractor/southpark.py index 2b12f2ad30..59e31198cd 100644 --- a/youtube_dl/extractor/southpark.py +++ b/youtube_dl/extractor/southpark.py @@ -55,9 +55,5 @@ class SouthParkNlIE(SouthParkIE): _TESTS = [{ 'url': 'http://www.southpark.nl/full-episodes/s18e06-freemium-isnt-free', - 'info_dict': { - 'id': 'c56b9a1f-0e42-4942-89e0-8e721d814c5c', - 'ext': 'mp4', - 'title': 'South Park 1806: Freemium Isn\'t Free - Act 3', - }, + 'playlist_count': 4, }]