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

Merge remote-tracking branch 'origin/master'

pull/3568/head
Philipp Hagemeister 2014-08-22 17:38:11 +02:00
parent e330d59abb 394df6d7d0
commit 1a9ccac7c1
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
youtube_dl/extractor/nuvid.py
View File

@ -38,7 +38,7 @@ class NuvidIE(InfoExtractor):
webpage = self._download_webpage( webpage = self._download_webpage(
request, video_id, 'Downloading %s page' % format_id) request, video_id, 'Downloading %s page' % format_id)
video_url = self._html_search_regex( video_url = self._html_search_regex(
r'<a href="([^"]+)"\s*>Continue to watch video', webpage, '%s video URL' % format_id, fatal=False) r'<a\s+href="([^"]+)"\s+class="b_link">', webpage, '%s video URL' % format_id, fatal=False)
if not video_url: if not video_url:
continue continue
formats.append({ formats.append({
@ -49,19 +49,24 @@ class NuvidIE(InfoExtractor):
webpage = self._download_webpage( webpage = self._download_webpage(
'http://m.nuvid.com/video/%s' % video_id, video_id, 'Downloading video page') 'http://m.nuvid.com/video/%s' % video_id, video_id, 'Downloading video page')
title = self._html_search_regex( title = self._html_search_regex(
r'<div class="title">\s+<h2[^>]*>([^<]+)</h2>', webpage, 'title').strip() [r'<span title="([^"]+)">',
thumbnail = self._html_search_regex( r'<div class="thumb-holder video">\s*<h5[^>]*>([^<]+)</h5>'], webpage, 'title').strip()
r'href="(/thumbs/[^"]+)"[^>]*data-link_type="thumbs"', thumbnails = [
webpage, 'thumbnail URL', fatal=False) {
'url': thumb_url,
} for thumb_url in re.findall(r'<img src="([^"]+)" alt="" />', webpage)
]
thumbnail = thumbnails[0]['url'] if thumbnails else None
duration = parse_duration(self._html_search_regex( duration = parse_duration(self._html_search_regex(
r'Length:\s*<span>(\d{2}:\d{2})</span>',webpage, 'duration', fatal=False)) r'<i class="fa fa-clock-o"></i>\s*(\d{2}:\d{2})', webpage, 'duration', fatal=False))
upload_date = unified_strdate(self._html_search_regex( upload_date = unified_strdate(self._html_search_regex(
r'Added:\s*<span>(\d{4}-\d{2}-\d{2})</span>', webpage, 'upload date', fatal=False)) r'<i class="fa fa-user"></i>\s*(\d{4}-\d{2}-\d{2})', webpage, 'upload date', fatal=False))
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'thumbnail': 'http://m.nuvid.com%s' % thumbnail, 'thumbnails': thumbnails,
'thumbnail': thumbnail,
'duration': duration, 'duration': duration,
'upload_date': upload_date, 'upload_date': upload_date,
'age_limit': 18, 'age_limit': 18,