aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-06-22 03:35:32 -0700
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-06-22 03:35:32 -0700
commite296100005a47ec9f8c2bf0e9827430fc0e96fae (patch)
treeec4282f9fbd56a15a23d327fc90a23775c8ee9fd
parente704f4d3785b318d7f4d3a034424b54ce50beb88 (diff)
parent953dd93a481dc879033e92a8f1547782af04d6ff (diff)
Merge pull request #888 from rg3/youtube_playlists_fix_886
YoutubePlaylistIE: try to extract the url of the entries from the media$group dictionary (closes #886)
-rwxr-xr-xyoutube_dl/InfoExtractors.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index ed2beac78..15417f05a 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1609,9 +1609,10 @@ 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']))
if len(response['feed']['entry']) < self._MAX_RESULTS:
break