R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vine] Simplify

Browse Source
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-01-31 14:17:21 +01:00
parent bc4850908c
commit 5dc733f071
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
youtube_dl/extractor/vine.py
View File

@ -1,18 +1,21 @@
from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
class VineIE(InfoExtractor): class VineIE(InfoExtractor):
_VALID_URL = r'(?:https?://)?(?:www\.)?vine\.co/v/(?P<id>\w+)' _VALID_URL = r'https?://(?:www\.)?vine\.co/v/(?P<id>\w+)'
_TEST = { _TEST = {
u'url': u'https://vine.co/v/b9KOOWX7HUx', 'url': 'https://vine.co/v/b9KOOWX7HUx',
u'file': u'b9KOOWX7HUx.mp4', 'md5': '2f36fed6235b16da96ce9b4dc890940d',
u'md5': u'2f36fed6235b16da96ce9b4dc890940d', 'info_dict': {
u'info_dict': { 'id': 'b9KOOWX7HUx',
u"uploader": u"Jack Dorsey", 'ext': 'mp4',
u"title": u"Chicken." 'uploader': 'Jack Dorsey',
} 'title': 'Chicken.',
},
} }
def _real_extract(self, url): def _real_extract(self, url):
@ -24,17 +27,17 @@ class VineIE(InfoExtractor):
self.report_extraction(video_id) self.report_extraction(video_id)
video_url = self._html_search_regex(r'<meta property="twitter:player:stream" content="(.+?)"', video_url = self._html_search_meta('twitter:player:stream', webpage,
webpage, u'video URL') 'video URL')
uploader = self._html_search_regex(r'<p class="username">(.*?)</p>', uploader = self._html_search_regex(r'<p class="username">(.*?)</p>',
webpage, u'uploader', fatal=False, flags=re.DOTALL) webpage, 'uploader', fatal=False, flags=re.DOTALL)
return [{ return {
'id': video_id, 'id': video_id,
'url': video_url, 'url': video_url,
'ext': 'mp4', 'ext': 'mp4',
'title': self._og_search_title(webpage), 'title': self._og_search_title(webpage),
'thumbnail': self._og_search_thumbnail(webpage), 'thumbnail': self._og_search_thumbnail(webpage),
'uploader': uploader, 'uploader': uploader,
}] }