projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f59b01
)
[extractor/common] Fix playlist_from_matches
author
Sergey M․
<dstftw@gmail.com>
Sat, 15 Jul 2017 21:33:14 +0000
(
04:33
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 15 Jul 2017 21:33:14 +0000
(
04:33
+0700)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index daa10885fb27a583773e2f9b8421448309346ac7..748b4d59f0af276f375d9ba924273bc61d1d044d 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-730,12
+730,12
@@
class InfoExtractor(object):
video_info['title'] = video_title
return video_info
video_info['title'] = video_title
return video_info
- def playlist_from_matches(self, matches,
video_id, video_titl
e, getter=None, ie=None):
- url
r
s = orderedSet(
+ def playlist_from_matches(self, matches,
playlist_id=None, playlist_title=Non
e, getter=None, ie=None):
+ urls = orderedSet(
self.url_result(self._proto_relative_url(getter(m) if getter else m), ie)
for m in matches)
return self.playlist_result(
self.url_result(self._proto_relative_url(getter(m) if getter else m), ie)
for m in matches)
return self.playlist_result(
- url
rs, playlist_id=video_id, playlist_title=video
_title)
+ url
s, playlist_id=playlist_id, playlist_title=playlist
_title)
@staticmethod
def playlist_result(entries, playlist_id=None, playlist_title=None, playlist_description=None):
@staticmethod
def playlist_result(entries, playlist_id=None, playlist_title=None, playlist_description=None):