Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[soundcloud:pagedplaylist] Improve (closes #19086)

Browse Source
This commit is contained in:
Sergey M․ 2019-02-02 23:40:06 +07:00
parent 6cc6e0c34d
commit 7c5307f4c4
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
youtube_dl/extractor/soundcloud.py
View File

@ -18,6 +18,7 @@ from ..utils import (
int_or_none, int_or_none,
unified_strdate, unified_strdate,
update_url_query, update_url_query,
url_or_none,
) )
@ -395,20 +396,23 @@ class SoundcloudPagedPlaylistBaseIE(SoundcloudPlaylistBaseIE):
# Empty collection may be returned, in this case we proceed # Empty collection may be returned, in this case we proceed
# straight to next_href # straight to next_href
def append_url_result(entries, item): def resolve_entry(candidates):
for cand in (item, item.get('track'), item.get('playlist')): for cand in candidates:
if isinstance(cand, dict): if not isinstance(cand, dict):
permalink_url = cand.get('permalink_url') continue
if permalink_url and permalink_url.startswith('http'): permalink_url = url_or_none(cand.get('permalink_url'))
return entries.append( if not permalink_url:
self.url_result( continue
permalink_url, return self.url_result(
ie=SoundcloudIE.ie_key() if SoundcloudIE.suitable(permalink_url) else None, permalink_url,
video_id=self._extract_id(cand), ie=SoundcloudIE.ie_key() if SoundcloudIE.suitable(permalink_url) else None,
video_title=cand.get('title'))) video_id=self._extract_id(cand),
video_title=cand.get('title'))
for e in collection: for e in collection:
append_url_result(entries, e) entry = resolve_entry((e, e.get('track'), e.get('playlist')))
if entry:
entries.append(entry)
next_href = response.get('next_href') next_href = response.get('next_href')
if not next_href: if not next_href: