X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fbilibili.py;h=8baff2041bb380d0204895cbbc6c64b16be94993;hb=339fe7228ae149db9fc163c94bef168f65a0a775;hp=b5aaa41e7df6a8ae20cf0b5ffb7cbdd195780fc8;hpb=76ab842d9b1308e4c3409cfdfcd925fcdb92e14f;p=youtube-dl.git diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index b5aaa41e7..8baff2041 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -2,13 +2,9 @@ from __future__ import unicode_literals import re -import json from .common import InfoExtractor -from ..compat import ( - compat_etree_fromstring, - compat_str, -) +from ..compat import compat_str from ..utils import ( int_or_none, unescapeHTML, @@ -18,7 +14,7 @@ from ..utils import ( class BiliBiliIE(InfoExtractor): - _VALID_URL = r'http://www\.bilibili\.(?:tv|com)/video/av(?P\d+)(?:/index_(?P\d+).html)?' + _VALID_URL = r'https?://www\.bilibili\.(?:tv|com)/video/av(?P\d+)(?:/index_(?P\d+).html)?' _TESTS = [{ 'url': 'http://www.bilibili.tv/video/av1074402/', @@ -98,7 +94,7 @@ class BiliBiliIE(InfoExtractor): 'thumbnail': view_data.get('pic'), 'uploader': view_data.get('author'), 'timestamp': int_or_none(view_data.get('created')), - 'view_count': view_data.get('play'), + 'view_count': int_or_none(view_data.get('play')), 'duration': int_or_none(xpath_text(doc, './timelength')), }