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