X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvine.py;h=c733a48fa26edce6b219d3bf2404267b8c346bf6;hb=c84683c88bbcb3cfd8d27af54a418035f431371d;hp=a4d5af14748a91a9ede4c5b586a4d49568ad6416;hpb=64f1aba8f1a6dba88e0dd0edc799fee978c7ce76;p=youtube-dl diff --git a/youtube_dl/extractor/vine.py b/youtube_dl/extractor/vine.py index a4d5af147..c733a48fa 100644 --- a/youtube_dl/extractor/vine.py +++ b/youtube_dl/extractor/vine.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals import re -import json import itertools from .common import InfoExtractor @@ -58,9 +57,11 @@ class VineIE(InfoExtractor): 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*' % video_id, - webpage, 'vine data')) + data = self._parse_json( + self._html_search_regex( + r'window\.POST_DATA = { %s: ({.+?}) };\s*' % video_id, + webpage, 'vine data'), + video_id) formats = [{ 'format_id': '%(format)s-%(rate)s' % f, @@ -74,7 +75,7 @@ class VineIE(InfoExtractor): 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']),