[nicknight] Add extractor

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index dea97920bc4a05f8592489c36db54403ff81eb87..913ffe29afc10adc0dd77181e89cea82b3c6df65 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -596,6 +596,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 57cf1ce8eafbd7244a4ba913e1dafe2f13ca3cf3..a96bb0ef512ff3523f4125f12dd26a59f304ff9c 100644 (file)
--- 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<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?(?:nick\.de|nickelodeon\.(?:nl|at))/(?:playlist|shows)/(?:[^/]+/)*(?P<id>[^/?#&]+)'
     _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,28 @@ 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<id>[^/?#&]+)'
+    _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 = self._search_regex(
+            r'mrss: (["\'])(?P<url>http.+?)\1', webpage, 'mrss url', group='url')
+
+        return self._get_videos_info_from_url(mrss_url, video_id)