From 729a5f817689b7ddeb1eefb370d723866ad8dc74 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Mon, 26 Sep 2016 22:45:02 +0200 Subject: [PATCH 1/2] [nick] add support for nick austria and nicknight --- youtube_dl/extractor/extractors.py | 1 + youtube_dl/extractor/nick.py | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index a693f8c56..6b173b446 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -592,6 +592,7 @@ from .nhl import ( from .nick import ( NickIE, NickDeIE, + NickNightAtIE, ) from .niconico import NiconicoIE, NiconicoPlaylistIE from .ninecninemedia import ( diff --git a/youtube_dl/extractor/nick.py b/youtube_dl/extractor/nick.py index 57cf1ce8e..a9f4186c9 100644 --- a/youtube_dl/extractor/nick.py +++ b/youtube_dl/extractor/nick.py @@ -69,7 +69,7 @@ class NickIE(MTVServicesInfoExtractor): class NickDeIE(MTVServicesInfoExtractor): IE_NAME = 'nick.de' - _VALID_URL = r'https?://(?:www\.)?(?:nick\.de|nickelodeon\.nl)/(?:playlist|shows)/(?:[^/]+/)*(?P[^/?#&]+)' + _VALID_URL = r'https?://(?:www\.)?(?:nick\.de|nickelodeon\.(?:nl|at))/(?:playlist|shows)/(?:[^/]+/)*(?P[^/?#&]+)' _TESTS = [{ 'url': 'http://www.nick.de/playlist/3773-top-videos/videos/episode/17306-zu-wasser-und-zu-land-rauchende-erdnusse', 'only_matching': True, @@ -91,3 +91,29 @@ class NickDeIE(MTVServicesInfoExtractor): {'siteKey': 'nick.de'}) return self._get_videos_info_from_url(mrss_url, video_id) + + +class NickNightAtIE(MTVServicesInfoExtractor): + IE_NAME = 'nicknight.de' + _VALID_URL = r'https?://(?:www\.)nicknight\.(?:de|at|tv)/(?:playlist|shows)/(?:[^/]+/)*(?P[^/?#&]+)' + _TESTS = [{ + 'url': 'http://www.nicknight.at/shows/977-awkward/videos/85987-nimmer-beste-freunde', + 'only_matching': True, + }, { + 'url': 'http://www.nicknight.at/shows/977-awkward', + 'only_matching': True, + }, { + 'url': 'http://www.nicknight.at/shows/1900-faking-it', + 'only_matching': True, + }] + + def _real_extract(self, url): + video_id = self._match_id(url) + + webpage = self._download_webpage(url, video_id) + + mrss_url = update_url_query(self._search_regex( + r'mrss: (["\'])(?Phttp.+?)\1', webpage, 'mrss url', group='url'), + {'siteKey': 'nicknight.de'}) + + return self._get_videos_info_from_url(mrss_url, video_id) From bfda02d7a6d0d66bfb86c5e3582a792038501aca Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Tue, 27 Sep 2016 22:56:03 +0200 Subject: [PATCH 2/2] [nick] remove unnecessary update_url_query call --- youtube_dl/extractor/nick.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/nick.py b/youtube_dl/extractor/nick.py index a9f4186c9..a96bb0ef5 100644 --- a/youtube_dl/extractor/nick.py +++ b/youtube_dl/extractor/nick.py @@ -112,8 +112,7 @@ class NickNightAtIE(MTVServicesInfoExtractor): webpage = self._download_webpage(url, video_id) - mrss_url = update_url_query(self._search_regex( - r'mrss: (["\'])(?Phttp.+?)\1', webpage, 'mrss url', group='url'), - {'siteKey': 'nicknight.de'}) + mrss_url = self._search_regex( + r'mrss: (["\'])(?Phttp.+?)\1', webpage, 'mrss url', group='url') return self._get_videos_info_from_url(mrss_url, video_id)