Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-11-20 21:36:03 +08:00
Code Issues Releases Wiki Activity

[veoh] Simplify

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-01-05 05:48:12 +01:00
parent 4ddba33f78
commit f46f4a995b
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
youtube_dl/extractor/veoh.py
View File

@ -1,22 +1,22 @@
from __future__ import unicode_literals
import re import re
import json import json
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import (
determine_ext,
)
class VeohIE(InfoExtractor): class VeohIE(InfoExtractor):
_VALID_URL = r'http://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/v(?P<id>\d*)' _VALID_URL = r'http://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/v(?P<id>\d*)'
_TEST = { _TEST = {
u'url': u'http://www.veoh.com/watch/v56314296nk7Zdmz3', 'url': 'http://www.veoh.com/watch/v56314296nk7Zdmz3',
u'file': u'56314296.mp4', 'file': '56314296.mp4',
u'md5': u'620e68e6a3cff80086df3348426c9ca3', 'md5': '620e68e6a3cff80086df3348426c9ca3',
u'info_dict': { 'info_dict': {
u'title': u'Straight Backs Are Stronger', 'title': 'Straight Backs Are Stronger',
u'uploader': u'LUMOback', 'uploader': 'LUMOback',
u'description': u'At LUMOback, we believe straight backs are stronger. The LUMOback Posture & Movement Sensor: It gently vibrates when you slouch, inspiring improved posture and mobility. Use the app to track your data and improve your posture over time. ', 'description': 'At LUMOback, we believe straight backs are stronger. The LUMOback Posture & Movement Sensor: It gently vibrates when you slouch, inspiring improved posture and mobility. Use the app to track your data and improve your posture over time. ',
} }
} }
@ -28,20 +28,20 @@ class VeohIE(InfoExtractor):
m_youtube = re.search(r'http://www\.youtube\.com/v/(.*?)(\&|")', webpage) m_youtube = re.search(r'http://www\.youtube\.com/v/(.*?)(\&|")', webpage)
if m_youtube is not None: if m_youtube is not None:
youtube_id = m_youtube.group(1) youtube_id = m_youtube.group(1)
self.to_screen(u'%s: detected Youtube video.' % video_id) self.to_screen('%s: detected Youtube video.' % video_id)
return self.url_result(youtube_id, 'Youtube') return self.url_result(youtube_id, 'Youtube')
self.report_extraction(video_id) self.report_extraction(video_id)
info = self._search_regex(r'videoDetailsJSON = \'({.*?})\';', webpage, 'info') info = self._search_regex(r'videoDetailsJSON = \'({.*?})\';', webpage, 'info')
info = json.loads(info) info = json.loads(info)
video_url = info.get('fullPreviewHashHighPath') or info.get('fullPreviewHashLowPath') video_url = info.get('fullPreviewHashHighPath') or info.get('fullPreviewHashLowPath')
return {'id': info['videoId'], return {
'title': info['title'], 'id': info['videoId'],
'ext': determine_ext(video_url), 'title': info['title'],
'url': video_url, 'url': video_url,
'uploader': info['username'], 'uploader': info['username'],
'thumbnail': info.get('highResImage') or info.get('medResImage'), 'thumbnail': info.get('highResImage') or info.get('medResImage'),
'description': info['description'], 'description': info['description'],
'view_count': info['views'], 'view_count': info['views'],
} }