[videofyme] Modernize

This commit is contained in:
Philipp Hagemeister 2014-11-26 13:01:39 +01:00
parent 24144e3b8d
commit 5c32110114

View File

@ -1,32 +1,33 @@
import re from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
find_xpath_attr, find_xpath_attr,
determine_ext, int_or_none,
) )
class VideofyMeIE(InfoExtractor): class VideofyMeIE(InfoExtractor):
_VALID_URL = r'https?://(www\.videofy\.me/.+?|p\.videofy\.me/v)/(?P<id>\d+)(&|#|$)' _VALID_URL = r'https?://(?:www\.videofy\.me/.+?|p\.videofy\.me/v)/(?P<id>\d+)(&|#|$)'
IE_NAME = u'videofy.me' IE_NAME = 'videofy.me'
_TEST = { _TEST = {
u'url': u'http://www.videofy.me/thisisvideofyme/1100701', 'url': 'http://www.videofy.me/thisisvideofyme/1100701',
u'file': u'1100701.mp4', 'md5': 'c77d700bdc16ae2e9f3c26019bd96143',
u'md5': u'c77d700bdc16ae2e9f3c26019bd96143', 'info_dict': {
u'info_dict': { 'id': '1100701',
u'title': u'This is VideofyMe', 'ext': 'mp4',
u'description': None, 'title': 'This is VideofyMe',
u'uploader': u'VideofyMe', 'description': None,
u'uploader_id': u'thisisvideofyme', 'uploader': 'VideofyMe',
'uploader_id': 'thisisvideofyme',
'view_count': int,
}, },
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) video_id = self._match_id(url)
video_id = mobj.group('id')
config = self._download_xml('http://sunshine.videofy.me/?videoId=%s' % video_id, config = self._download_xml('http://sunshine.videofy.me/?videoId=%s' % video_id,
video_id) video_id)
video = config.find('video') video = config.find('video')
@ -34,14 +35,16 @@ class VideofyMeIE(InfoExtractor):
url_node = next(node for node in [find_xpath_attr(sources, 'source', 'id', 'HQ %s' % key) url_node = next(node for node in [find_xpath_attr(sources, 'source', 'id', 'HQ %s' % key)
for key in ['on', 'av', 'off']] if node is not None) for key in ['on', 'av', 'off']] if node is not None)
video_url = url_node.find('url').text video_url = url_node.find('url').text
view_count = int_or_none(self._search_regex(
r'([0-9]+)', video.find('views').text, 'view count', fatal=False))
return {'id': video_id, return {
'title': video.find('title').text, 'id': video_id,
'url': video_url, 'title': video.find('title').text,
'ext': determine_ext(video_url), 'url': video_url,
'thumbnail': video.find('thumb').text, 'thumbnail': video.find('thumb').text,
'description': video.find('description').text, 'description': video.find('description').text,
'uploader': config.find('blog/name').text, 'uploader': config.find('blog/name').text,
'uploader_id': video.find('identifier').text, 'uploader_id': video.find('identifier').text,
'view_count': re.search(r'\d+', video.find('views').text).group(), 'view_count': view_count,
} }