aboutsummaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/extractor/veoh.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <[email protected]>2014-01-05 05:48:12 +0100
committerPhilipp Hagemeister <[email protected]>2014-01-05 05:48:12 +0100
commitf46f4a995b65dbe35d352c572ff0b4de15abc292 (patch)
tree3fb8c1b267c644ca522ef30e3dc97d75b96d4a6b /youtube_dl/extractor/veoh.py
parent4ddba33f78a11e100653771d10038a7d8e90ec9f (diff)
downloadyoutube-dl-f46f4a995b65dbe35d352c572ff0b4de15abc292.tar.gz
youtube-dl-f46f4a995b65dbe35d352c572ff0b4de15abc292.zip
[veoh] Simplify
Diffstat (limited to 'youtube_dl/extractor/veoh.py')
-rw-r--r--youtube_dl/extractor/veoh.py44
1 files changed, 22 insertions, 22 deletions
diff --git a/youtube_dl/extractor/veoh.py b/youtube_dl/extractor/veoh.py
index 9534f2725..baa57f343 100644
--- a/youtube_dl/extractor/veoh.py
+++ b/youtube_dl/extractor/veoh.py
@@ -1,22 +1,22 @@
+from __future__ import unicode_literals
+
import re
import json
from .common import InfoExtractor
-from ..utils import (
- determine_ext,
-)
+
class VeohIE(InfoExtractor):
_VALID_URL = r'http://(?:www\.)?veoh\.com/(?:watch|iphone/#_Watch)/v(?P<id>\d*)'
_TEST = {
- u'url': u'http://www.veoh.com/watch/v56314296nk7Zdmz3',
- u'file': u'56314296.mp4',
- u'md5': u'620e68e6a3cff80086df3348426c9ca3',
- u'info_dict': {
- u'title': u'Straight Backs Are Stronger',
- u'uploader': u'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. ',
+ 'url': 'http://www.veoh.com/watch/v56314296nk7Zdmz3',
+ 'file': '56314296.mp4',
+ 'md5': '620e68e6a3cff80086df3348426c9ca3',
+ 'info_dict': {
+ 'title': 'Straight Backs Are Stronger',
+ 'uploader': 'LUMOback',
+ '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)
if m_youtube is not None:
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')
self.report_extraction(video_id)
info = self._search_regex(r'videoDetailsJSON = \'({.*?})\';', webpage, 'info')
info = json.loads(info)
- video_url = info.get('fullPreviewHashHighPath') or info.get('fullPreviewHashLowPath')
-
- return {'id': info['videoId'],
- 'title': info['title'],
- 'ext': determine_ext(video_url),
- 'url': video_url,
- 'uploader': info['username'],
- 'thumbnail': info.get('highResImage') or info.get('medResImage'),
- 'description': info['description'],
- 'view_count': info['views'],
- }
+ video_url = info.get('fullPreviewHashHighPath') or info.get('fullPreviewHashLowPath')
+
+ return {
+ 'id': info['videoId'],
+ 'title': info['title'],
+ 'url': video_url,
+ 'uploader': info['username'],
+ 'thumbnail': info.get('highResImage') or info.get('medResImage'),
+ 'description': info['description'],
+ 'view_count': info['views'],
+ }