Browse Source

Fix playlists with size 50i ∀ i∉ℕ (Closes #782)

Philipp Hagemeister 12 years ago
parent
commit
feba604e92
1 changed files with 5 additions and 1 deletions
  1. 5 1
      youtube_dl/InfoExtractors.py

+ 5 - 1
youtube_dl/InfoExtractors.py

@@ -1778,9 +1778,13 @@ class YoutubePlaylistIE(InfoExtractor):
                 self._downloader.report_error(u'Invalid JSON in API response: ' + compat_str(err))
                 self._downloader.report_error(u'Invalid JSON in API response: ' + compat_str(err))
                 return
                 return
 
 
-            if not 'feed' in response or not 'entry' in response['feed']:
+            if 'feed' not in response:
                 self._downloader.report_error(u'Got a malformed response from YouTube API')
                 self._downloader.report_error(u'Got a malformed response from YouTube API')
                 return
                 return
+            if 'entry' not in response['feed']:
+                # Number of videos is a multiple of self._MAX_RESULTS
+                break
+
             videos += [ (entry['yt$position']['$t'], entry['content']['src'])
             videos += [ (entry['yt$position']['$t'], entry['content']['src'])
                         for entry in response['feed']['entry']
                         for entry in response['feed']['entry']
                         if 'content' in entry ]
                         if 'content' in entry ]