Mirrors
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[vimeo] Use regexps to find description 

This fixes descriptions on 2.6 and makes the code simpler.
This commit is contained in:
Philipp Hagemeister 2014-09-29 04:58:29 +02:00
parent 35d3e63d24
commit 2593039522
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/vimeo.py
View File

@ -275,18 +275,9 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor):
_, video_thumbnail = sorted((int(width if width.isdigit() else 0), t_url) for (width, t_url) in video_thumbs.items())[-1] _, video_thumbnail = sorted((int(width if width.isdigit() else 0), t_url) for (width, t_url) in video_thumbs.items())[-1]
# Extract video description # Extract video description
video_description = None video_description = self._html_search_regex(
try: r'(?s)<div class="[^"]*description"[^>]*>(.*?)</div>',
video_description = get_element_by_attribute("class", "description_wrapper", webpage) webpage, 'description', fatal=False)
if video_description:
video_description = clean_html(video_description)
except AssertionError as err:
# On some pages like (http://player.vimeo.com/video/54469442) the
# html tags are not closed, python 2.6 cannot handle it
if err.args[0] == 'we should not get here!':
pass
else:
raise
# Extract video duration # Extract video duration
video_duration = int_or_none(config["video"].get("duration")) video_duration = int_or_none(config["video"].get("duration"))