aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-09-24 11:05:14 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-09-24 11:05:14 +0200
commit3b2f933b01c30a8b3a6bd7fb8418b44167ca30c5 (patch)
tree25987601ba023965704dbc78441f669af05f0835 /youtube_dl/extractor/generic.py
parentcc746841e76a0ab6a1bb65400ca496a105f65821 (diff)
[generic] Allow embedded YoutubePlaylists (Fixes #3821)
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 40eeaad16..a3bfeb174 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -584,7 +584,9 @@ class GenericIE(InfoExtractor):
# Helper method
def _playlist_from_matches(matches, getter, ie=None):
- urlrs = orderedSet(self.url_result(getter(m), ie) for m in matches)
+ urlrs = orderedSet(
+ self.url_result(self._proto_relative_url(getter(m)), ie)
+ for m in matches)
return self.playlist_result(
urlrs, playlist_id=video_id, playlist_title=video_title)
@@ -633,7 +635,7 @@ class GenericIE(InfoExtractor):
\1''', webpage)
if matches:
return _playlist_from_matches(
- matches, lambda m: unescapeHTML(m[1]), ie='Youtube')
+ matches, lambda m: unescapeHTML(m[1]))
# Look for embedded Dailymotion player
matches = re.findall(