projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12afdc2
)
[vimeo:channel] Extract videos' titles for playlist entries
author
ha shao
<mozbugbox@yahoo.com.au>
Sat, 21 Jan 2017 07:47:39 +0000
(15:47 +0800)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 21 Jan 2017 16:37:44 +0000
(23:37 +0700)
youtube_dl/extractor/vimeo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vimeo.py
b/youtube_dl/extractor/vimeo.py
index add7536350d4a0f6b3309be7d649e0597cbdbc9f..a6bbd4c052b2af2245d82c818702f2f1d9ed8de3 100644
(file)
--- a/
youtube_dl/extractor/vimeo.py
+++ b/
youtube_dl/extractor/vimeo.py
@@
-730,12
+730,12
@@
class VimeoChannelIE(VimeoBaseInfoExtractor):
# 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(
# 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:
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),
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):
# More relaxed fallback
else:
for video_id in re.findall(r'id=["\']clip_(\d+)', webpage):