diff options
author | Philipp Hagemeister <[email protected]> | 2014-11-26 13:01:39 +0100 |
---|---|---|
committer | Philipp Hagemeister <[email protected]> | 2014-11-26 13:01:39 +0100 |
commit | 5c32110114a6083637802388463d59a42fe9242f (patch) | |
tree | 579153c1b711c6e096e71b60fa007b95caa36743 | |
parent | 24144e3b8d465cb1d142bb1ff0450669ecceb2a0 (diff) | |
download | youtube-dl-5c32110114a6083637802388463d59a42fe9242f.tar.gz youtube-dl-5c32110114a6083637802388463d59a42fe9242f.zip |
[videofyme] Modernize
-rw-r--r-- | youtube_dl/extractor/videofyme.py | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/youtube_dl/extractor/videofyme.py b/youtube_dl/extractor/videofyme.py index d764e60fb..94f9e9be9 100644 --- a/youtube_dl/extractor/videofyme.py +++ b/youtube_dl/extractor/videofyme.py @@ -1,32 +1,33 @@ -import re +from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( find_xpath_attr, - determine_ext, + int_or_none, ) class VideofyMeIE(InfoExtractor): - _VALID_URL = r'https?://(www\.videofy\.me/.+?|p\.videofy\.me/v)/(?P<id>\d+)(&|#|$)' - IE_NAME = u'videofy.me' + _VALID_URL = r'https?://(?:www\.videofy\.me/.+?|p\.videofy\.me/v)/(?P<id>\d+)(&|#|$)' + IE_NAME = 'videofy.me' _TEST = { - u'url': u'http://www.videofy.me/thisisvideofyme/1100701', - u'file': u'1100701.mp4', - u'md5': u'c77d700bdc16ae2e9f3c26019bd96143', - u'info_dict': { - u'title': u'This is VideofyMe', - u'description': None, - u'uploader': u'VideofyMe', - u'uploader_id': u'thisisvideofyme', + 'url': 'http://www.videofy.me/thisisvideofyme/1100701', + 'md5': 'c77d700bdc16ae2e9f3c26019bd96143', + 'info_dict': { + 'id': '1100701', + 'ext': 'mp4', + 'title': 'This is VideofyMe', + 'description': None, + 'uploader': 'VideofyMe', + 'uploader_id': 'thisisvideofyme', + 'view_count': int, }, } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') + video_id = self._match_id(url) config = self._download_xml('http://sunshine.videofy.me/?videoId=%s' % video_id, video_id) 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) for key in ['on', 'av', 'off']] if node is not None) 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, - 'title': video.find('title').text, - 'url': video_url, - 'ext': determine_ext(video_url), - 'thumbnail': video.find('thumb').text, - 'description': video.find('description').text, - 'uploader': config.find('blog/name').text, - 'uploader_id': video.find('identifier').text, - 'view_count': re.search(r'\d+', video.find('views').text).group(), - } + return { + 'id': video_id, + 'title': video.find('title').text, + 'url': video_url, + 'thumbnail': video.find('thumb').text, + 'description': video.find('description').text, + 'uploader': config.find('blog/name').text, + 'uploader_id': video.find('identifier').text, + 'view_count': view_count, + } |