debian/patches: Remove unneeded patches.

[youtubedl] / youtube_dl / extractor / nick.py

diff --git a/youtube_dl/extractor/nick.py b/youtube_dl/extractor/nick.py
index b62819ae529f2731e29d91d1071077af4fd03815..9c54846e14a86634d3e6b20deb8e1adb5e46de55 100644 (file)
--- a/youtube_dl/extractor/nick.py
+++ b/youtube_dl/extractor/nick.py
@@ -2,12 +2,14 @@
 from __future__ import unicode_literals
 
 from .mtv import MTVServicesInfoExtractor
 from __future__ import unicode_literals
 
 from .mtv import MTVServicesInfoExtractor

-from ..compat import compat_urllib_parse
+from ..compat import compat_urllib_parse_urlencode
+from ..utils import update_url_query

 
 
 class NickIE(MTVServicesInfoExtractor):
 
 
 class NickIE(MTVServicesInfoExtractor):

+    # None of videos on the website are still alive?

     IE_NAME = 'nick.com'
     IE_NAME = 'nick.com'

-    _VALID_URL = r'https?://(?:www\.)?nick\.com/videos/clip/(?P<id>[^/?#.]+)'
+    _VALID_URL = r'https?://(?:www\.)?nick(?:jr)?\.com/(?:videos/clip|[^/]+/videos)/(?P<id>[^/?#.]+)'

     _FEED_URL = 'http://udat.mtvnservices.com/service1/dispatch.htm'
     _TESTS = [{
         'url': 'http://www.nick.com/videos/clip/alvinnn-and-the-chipmunks-112-full-episode.html',
     _FEED_URL = 'http://udat.mtvnservices.com/service1/dispatch.htm'
     _TESTS = [{
         'url': 'http://www.nick.com/videos/clip/alvinnn-and-the-chipmunks-112-full-episode.html',


@@ -51,13 +53,39 @@ class NickIE(MTVServicesInfoExtractor):
                 }
             },
         ],
                 }
             },
         ],

+    }, {
+        'url': 'http://www.nickjr.com/paw-patrol/videos/pups-save-a-goldrush-s3-ep302-full-episode/',
+        'only_matching': True,

     }]
 
     def _get_feed_query(self, uri):
     }]
 
     def _get_feed_query(self, uri):

-        return compat_urllib_parse.urlencode({
+        return compat_urllib_parse_urlencode({

             'feed': 'nick_arc_player_prime',
             'mgid': uri,
         })
 
     def _extract_mgid(self, webpage):
         return self._search_regex(r'data-contenturi="([^"]+)', webpage, 'mgid')
             'feed': 'nick_arc_player_prime',
             'mgid': uri,
         })
 
     def _extract_mgid(self, webpage):
         return self._search_regex(r'data-contenturi="([^"]+)', webpage, 'mgid')

+
+
+class NickDeIE(MTVServicesInfoExtractor):
+    IE_NAME = 'nick.de'
+    _VALID_URL = r'https?://(?:www\.)?nick\.de/(?: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,
+    }, {
+        'url': 'http://www.nick.de/shows/342-icarly',
+        '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'data-mrss=(["\'])(?P<url>http.+?)\1', webpage, 'mrss url', group='url'),
+            {'siteKey': 'nick.de'})
+
+        return self._get_videos_info_from_url(mrss_url, video_id)