projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc74684
)
[generic] Allow embedded YoutubePlaylists (Fixes #3821)
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 24 Sep 2014 09:05:14 +0000
(11:05 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 24 Sep 2014 09:05:14 +0000
(11:05 +0200)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 40eeaad16d42acf089d1d426a055d4e5ce5624cf..a3bfeb174dbb48c8b19621a68db41d4b4783d3dd 100644
(file)
--- 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):
# 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)
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(
\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(
# Look for embedded Dailymotion player
matches = re.findall(