X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/532a08904ffbacc5e5ccf99edb660c5f37ddb213..1f17a37b9b95db09a420a1f52cf18723ce4eb8b5:/youtube_dl/extractor/bilibili.py?ds=inline diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 1e3f255..beffcec 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -54,6 +54,22 @@ class BiliBiliIE(InfoExtractor): 'description': 'å¦æä½ æ¯ç¥æï¼å¹¶ä¸è½å¤è®©å¦æ³æ为ç°å®ãé£ä½ ä¼è¿è¡æä¹æ ·çå¦æ³ï¼æ¯æ·«é¡çä¸çï¼ç¬è£ç¤¾ä¼ï¼æ¯çæ§çå¶è£ï¼è¿æ¯â¦â¦2015å¹´ï¼æ¶©è°·ãä»6å¹´ååçç大ç¾å®³â涩谷å°éâä¹åå¤å ´äºçè¿ä¸ªè¡åºéæ°è®¾ç«çç§ç«é«ä¸...', }, 'skip': 'Geo-restricted to China', + }, { + # Title with double quotes + 'url': 'http://www.bilibili.com/video/av8903802/', + 'info_dict': { + 'id': '8903802', + 'ext': 'mp4', + 'title': 'é¿æ»´è±æï½è±ææå享#6 "Closer', + 'description': '滴妹ä»å¤©å±Closerçµ¦ä½ è½! æå²ä»¥æ¥ï¼è¢«æ¨æå¤æ¬¡ä¹æ¯æä¹ çææ²ï¼å ¶å®æè¯è·æåæ¬æ³åå·®è®å¤çï¼ä¸è¿è¿æ¯å¥½å¬ï¼ å¾®å@é¿æ»´è±æ', + 'uploader': 'é¿æ»´è±æ', + 'uploader_id': '65880958', + 'timestamp': 1488382620, + 'upload_date': '20170301', + }, + 'params': { + 'skip_download': True, # Test metadata only + }, }] _APP_KEY = '84956560bc028eb7' @@ -86,6 +102,7 @@ class BiliBiliIE(InfoExtractor): video_id, anime_id, compat_urlparse.urljoin(url, '//bangumi.bilibili.com/anime/%s' % anime_id))) headers = { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', + 'Referer': url } headers.update(self.geo_verification_headers()) @@ -100,10 +117,15 @@ class BiliBiliIE(InfoExtractor): payload = 'appkey=%s&cid=%s&otype=json&quality=2&type=mp4' % (self._APP_KEY, cid) sign = hashlib.md5((payload + self._BILIBILI_KEY).encode('utf-8')).hexdigest() + headers = { + 'Referer': url + } + headers.update(self.geo_verification_headers()) + video_info = self._download_json( 'http://interface.bilibili.com/playurl?%s&sign=%s' % (payload, sign), video_id, note='Downloading video info page', - headers=self.geo_verification_headers()) + headers=headers) if 'durl' not in video_info: self._report_error(video_info) @@ -135,7 +157,7 @@ class BiliBiliIE(InfoExtractor): 'formats': formats, }) - title = self._html_search_regex('