projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vevo sig changed again, please update for us! Thanks very much! (fixes #1375)
[youtube-dl]
/
youtube_dl
/
extractor
/
vine.py
diff --git
a/youtube_dl/extractor/vine.py
b/youtube_dl/extractor/vine.py
index b44b1cb024f607e78ba1b977be42220ea7090e81..c4ec1f06ffe3ccce17598aeb319047f0890f9a02 100644
(file)
--- a/
youtube_dl/extractor/vine.py
+++ b/
youtube_dl/extractor/vine.py
@@
-5,6
+5,15
@@
from .common import InfoExtractor
class VineIE(InfoExtractor):
_VALID_URL = r'(?:https?://)?(?:www\.)?vine\.co/v/(?P<id>\w+)'
class VineIE(InfoExtractor):
_VALID_URL = r'(?:https?://)?(?:www\.)?vine\.co/v/(?P<id>\w+)'
+ _TEST = {
+ u'url': u'https://vine.co/v/b9KOOWX7HUx',
+ u'file': u'b9KOOWX7HUx.mp4',
+ u'md5': u'2f36fed6235b16da96ce9b4dc890940d',
+ u'info_dict': {
+ u"uploader": u"Jack Dorsey",
+ u"title": u"Chicken."
+ }
+ }
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@
-18,12
+27,6
@@
class VineIE(InfoExtractor):
video_url = self._html_search_regex(r'<meta property="twitter:player:stream" content="(.+?)"',
webpage, u'video URL')
video_url = self._html_search_regex(r'<meta property="twitter:player:stream" content="(.+?)"',
webpage, u'video URL')
- video_title = self._html_search_regex(r'<meta property="og:title" content="(.+?)"',
- webpage, u'title')
-
- thumbnail = self._html_search_regex(r'<meta property="og:image" content="(.+?)(\?.*?)?"',
- webpage, u'thumbnail', fatal=False)
-
uploader = self._html_search_regex(r'<div class="user">.*?<h2>(.+?)</h2>',
webpage, u'uploader', fatal=False, flags=re.DOTALL)
uploader = self._html_search_regex(r'<div class="user">.*?<h2>(.+?)</h2>',
webpage, u'uploader', fatal=False, flags=re.DOTALL)
@@
-31,7
+34,7
@@
class VineIE(InfoExtractor):
'id': video_id,
'url': video_url,
'ext': 'mp4',
'id': video_id,
'url': video_url,
'ext': 'mp4',
- 'title':
video_title
,
- 'thumbnail':
thumbnail
,
+ 'title':
self._og_search_title(webpage)
,
+ 'thumbnail':
self._og_search_thumbnail(webpage)
,
'uploader': uploader,
}]
'uploader': uploader,
}]