projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[nbcnews] Extend _VALID_URL
[youtube-dl]
/
youtube_dl
/
extractor
/
vine.py
diff --git
a/youtube_dl/extractor/vine.py
b/youtube_dl/extractor/vine.py
index 804adbdb080e15c02686626d147f25d1f5c718c8..c733a48fa26edce6b219d3bf2404267b8c346bf6 100644
(file)
--- a/
youtube_dl/extractor/vine.py
+++ b/
youtube_dl/extractor/vine.py
@@
-1,7
+1,6
@@
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
-import json
import itertools
from .common import InfoExtractor
import itertools
from .common import InfoExtractor
@@
-9,7
+8,7
@@
from ..utils import unified_strdate
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|oembed)
/(?P<id>\w+)'
_TESTS = [{
'url': 'https://vine.co/v/b9KOOWX7HUx',
'md5': '2f36fed6235b16da96ce9b4dc890940d',
_TESTS = [{
'url': 'https://vine.co/v/b9KOOWX7HUx',
'md5': '2f36fed6235b16da96ce9b4dc890940d',
@@
-49,15
+48,20
@@
class VineIE(InfoExtractor):
'uploader': 'Z3k3',
'uploader_id': '936470460173008896',
},
'uploader': 'Z3k3',
'uploader_id': '936470460173008896',
},
+ }, {
+ 'url': 'https://vine.co/oembed/MYxVapFvz2z.json',
+ 'only_matching': True,
}]
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage('https://vine.co/v/' + video_id, video_id)
}]
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage('https://vine.co/v/' + video_id, video_id)
- data = json.loads(self._html_search_regex(
- r'window\.POST_DATA = { %s: ({.+?}) };\s*</script>' % video_id,
- webpage, 'vine data'))
+ data = self._parse_json(
+ self._html_search_regex(
+ r'window\.POST_DATA = { %s: ({.+?}) };\s*</script>' % video_id,
+ webpage, 'vine data'),
+ video_id)
formats = [{
'format_id': '%(format)s-%(rate)s' % f,
formats = [{
'format_id': '%(format)s-%(rate)s' % f,
@@
-71,7
+75,7
@@
class VineIE(InfoExtractor):
return {
'id': video_id,
'title': self._og_search_title(webpage),
return {
'id': video_id,
'title': self._og_search_title(webpage),
- 'alt_title': self._og_search_description(webpage),
+ 'alt_title': self._og_search_description(webpage
, default=None
),
'description': data['description'],
'thumbnail': data['thumbnailUrl'],
'upload_date': unified_strdate(data['created']),
'description': data['description'],
'thumbnail': data['thumbnailUrl'],
'upload_date': unified_strdate(data['created']),