R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[soundcloud] refactor paged playlist processing

Browse Source
This commit is contained in:
Cory Hall 2019-02-01 18:44:20 -05:00
parent b947387844
commit 3fa0f5b241
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
youtube_dl/extractor/soundcloud.py
View File

@ -392,24 +392,20 @@ class SoundcloudPagedPlaylistBaseIE(SoundcloudPlaylistBaseIE):
if not collection:
break
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)
title = cand.get('title')
if permalink_url and permalink_url.startswith('http'):
return permalink_url, entry_id, title
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, entry_title = resolve_permalink_url(
(e, e.get('track'), e.get('playlist')))
if permalink_url:
entries.append(self.url_result(
permalink_url,
ie=SoundcloudIE.ie_key() if SoundcloudIE.suitable(permalink_url) else None,
video_id=entry_id, video_title=entry_title))
append_url_result(entries, e)
next_href = response.get('next_href')
if not next_href: