From: Jaime Marquínez Ferrándiz Date: Fri, 14 Jun 2013 12:14:02 +0000 (+0200) Subject: YoutubePlaylistIE: try to extract the url of the entries from the media$group dictionary X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=31eead52e764569fc95ffaf56b25850fa260988b;p=youtube-dl YoutubePlaylistIE: try to extract the url of the entries from the media$group dictionary Extracting it from content can return rtsp urls. --- diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index d9c555643..418c23f74 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -1606,9 +1606,15 @@ class YoutubePlaylistIE(InfoExtractor): # Number of videos is a multiple of self._MAX_RESULTS break - videos += [ (entry['yt$position']['$t'], entry['content']['src']) - for entry in response['feed']['entry'] - if 'content' in entry ] + for entry in response['feed']['entry']: + index = entry['yt$position']['$t'] + if 'media$group' in entry and 'media$player' in entry['media$group']: + videos.append((index, entry['media$group']['media$player']['url'])) + # Using this field can cause problems: + # https://github.com/rg3/youtube-dl/issues/886 + elif 'content' in entry: + videos.append((index, entry['content']['src'])) + if len(response['feed']['entry']) < self._MAX_RESULTS: break