X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fviki.py;h=9bdbdc3e468cec6ae0fb1e36e33332a494e4230d;hb=8da0e0e94682faa0463f33d991df70a2402b5a86;hp=4d185c0e6177801152fcc413f4eab7828cb0bb65;hpb=0d7f03642976e7859e290b06db41d20a4bfd3a38;p=youtube-dl

diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py
index 4d185c0e6..9bdbdc3e4 100644
--- a/youtube_dl/extractor/viki.py
+++ b/youtube_dl/extractor/viki.py
@@ -93,7 +93,7 @@ class VikiIE(InfoExtractor):
                     'Video %s is blocked from your location.' % video_id,
                     expected=True)
             else:
-                raise ExtractorError('Viki said: ' + err_msg)
+                raise ExtractorError('Viki said: %s %s' % (err_msg, url))
         mobj = re.search(
             r'<source[^>]+type="(?P<mime_type>[^"]+)"[^>]+src="(?P<url>[^"]+)"', info_webpage)
         if not mobj:
@@ -147,8 +147,8 @@ class VikiIE(InfoExtractor):
         return res
 
 
-class VikiShowIE(InfoExtractor):
-    IE_NAME = 'viki:show'
+class VikiChannelIE(InfoExtractor):
+    IE_NAME = 'viki:channel'
     _VALID_URL = r'^https?://(?:www\.)?viki\.com/tv/(?P<id>[0-9]+c)'
     _TESTS = [{
         'url': 'http://www.viki.com/tv/50c-boys-over-flowers',
@@ -157,8 +157,17 @@ class VikiShowIE(InfoExtractor):
             'title': 'Boys Over Flowers',
             'description': 'md5:ecd3cff47967fe193cff37c0bec52790',
         },
-        'playlist_count': 25,
+        'playlist_count': 70,
+    }, {
+        'url': 'http://www.viki.com/tv/1354c-poor-nastya-complete',
+        'info_dict': {
+            'id': '1354c',
+            'title': 'Poor Nastya [COMPLETE]',
+            'description': 'md5:05bf5471385aa8b21c18ad450e350525',
+        },
+        'playlist_count': 127,
     }]
+    _PER_PAGE = 25
 
     def _real_extract(self, url):
         show_id = self._match_id(url)
@@ -167,14 +176,18 @@ class VikiShowIE(InfoExtractor):
         title = self._og_search_title(show_page)
         description = self._og_search_description(show_page)
 
-        show_json = self._download_json(
-            'http://api.viki.io/v4/containers/%s/episodes.json?app=100000a&per_page=999&sort=number&direction=asc' % show_id,
-            show_id, note='Retrieve show json', errnote='Unable to get show json'
-        )
         entries = []
-        for video in show_json['response']:
-            video_id = video['id']
-            entries.append(self.url_result(
-                'http://www.viki.com/videos/%s' % video_id, 'Viki', video_id))
+        for video_type in ['episodes', 'clips']:
+            json_url = 'http://api.viki.io/v4/containers/%s/%s.json?app=100000a&per_page=%d&sort=number&direction=asc&with_paging=true&page=1' % (show_id, video_type, self._PER_PAGE)
+            while json_url is not None:
+                show_json = self._download_json(
+                    json_url, show_id,
+                    note='Downloading %s json page #%s' %
+                         (video_type, re.search(r'[?&]page=([0-9]+)', json_url).group(1)))
+                for video in show_json['response']:
+                    video_id = video['id']
+                    entries.append(self.url_result(
+                        'http://www.viki.com/videos/%s' % video_id, 'Viki', video_id))
+                json_url = show_json['pagination']['next']
 
         return self.playlist_result(entries, show_id, title, description)