|
@@ -395,18 +395,20 @@ class SoundcloudPagedPlaylistBaseIE(SoundcloudPlaylistBaseIE):
|
|
|
# Empty collection may be returned, in this case we proceed
|
|
|
# straight to next_href
|
|
|
|
|
|
- def resolve_permalink_url(candidates):
|
|
|
- for cand in candidates:
|
|
|
+ def append_url_result(entries, item):
|
|
|
+ for cand in (item, item.get('track'), item.get('playlist')):
|
|
|
if isinstance(cand, dict):
|
|
|
permalink_url = cand.get('permalink_url')
|
|
|
- entry_id = self._extract_id(cand)
|
|
|
if permalink_url and permalink_url.startswith('http'):
|
|
|
- return permalink_url, entry_id
|
|
|
+ return entries.append(
|
|
|
+ self.url_result(
|
|
|
+ permalink_url,
|
|
|
+ ie=SoundcloudIE.ie_key() if SoundcloudIE.suitable(permalink_url) else None,
|
|
|
+ video_id=self._extract_id(cand),
|
|
|
+ video_title=cand.get('title')))
|
|
|
|
|
|
for e in collection:
|
|
|
- permalink_url, entry_id = resolve_permalink_url((e, e.get('track'), e.get('playlist')))
|
|
|
- if permalink_url:
|
|
|
- entries.append(self.url_result(permalink_url, video_id=entry_id))
|
|
|
+ append_url_result(entries, e)
|
|
|
|
|
|
next_href = response.get('next_href')
|
|
|
if not next_href:
|