[vimeo:channel] Extract videos' titles for playlist entries

This commit is contained in:
ha shao 2017-01-21 15:47:39 +08:00 committed by Sergey M․
parent 12afdc2ad6
commit 04a3d4d234
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -730,12 +730,12 @@ def _title_and_entries(self, list_id, base_url):
# Try extracting href first since not all videos are available via
# short https://vimeo.com/id URL (e.g. https://vimeo.com/channels/tributes/6213729)
clips = re.findall(
r'id="clip_(\d+)"[^>]*>\s*<a[^>]+href="(/(?:[^/]+/)*\1)', webpage)
r'id="clip_(\d+)"[^>]*>\s*<a[^>]+href="(/(?:[^/]+/)*\1)(?:[^>]+\btitle="([^"]+)")?', webpage)
if clips:
for video_id, video_url in clips:
for video_id, video_url, video_title in clips:
yield self.url_result(
compat_urlparse.urljoin(base_url, video_url),
VimeoIE.ie_key(), video_id=video_id)
VimeoIE.ie_key(), video_id=video_id, video_title=video_title)
# More relaxed fallback
else:
for video_id in re.findall(r'id=["\']clip_(\d+)', webpage):