From c24bffbff04a70a79171d91a91c901975f6e1dfe Mon Sep 17 00:00:00 2001 From: zwb Date: Sat, 16 May 2020 17:43:34 +0800 Subject: [PATCH 01/11] [BiliBili] support for multi part video --- youtube_dl/extractor/bilibili.py | 166 ++++++++++++++++++------------- 1 file changed, 96 insertions(+), 70 deletions(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 4dc597e16..eb463b35d 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -31,7 +31,8 @@ class BiliBiliIE(InfoExtractor): (?: (?: video/[aA][vV]| - anime/(?P\d+)/play\# + anime/(?P\d+)/play\#| + bangumi/media/md(?P\d+) )(?P\d+)| video/[bB][vV](?P[^/?#&]+) ) @@ -54,7 +55,7 @@ class BiliBiliIE(InfoExtractor): }, }, { # Tested in BiliBiliBangumiIE - 'url': 'http://bangumi.bilibili.com/anime/1869/play#40062', + 'url': 'http://bangumi.bilibili.com/anime/2338/play#40062', 'only_matching': True, }, { 'url': 'http://bangumi.bilibili.com/anime/5802/play#100643', @@ -119,24 +120,47 @@ class BiliBiliIE(InfoExtractor): raise ExtractorError('%s returns error %d' % (self.IE_NAME, result['code']), expected=True) else: raise ExtractorError('Can\'t extract Bangumi episode ID') - + def _aid_to_bid(self, aid): + ''' + convert bilibili avid to bid + ''' + api_url = 'http://api.bilibili.com/x/web-interface/view?aid=%s' %(aid, ) + js = self._download_json(api_url, aid, 'convert avid to bv id', 'convert failed') + return js['data']['bvid'] def _real_extract(self, url): url, smuggled_data = unsmuggle_url(url, {}) mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') or mobj.group('id_bv') - anime_id = mobj.group('anime_id') + # save the origin video id + original_video_id = video_id + anime_id = mobj.group('anime_id') or mobj.group('anime_id_2') webpage = self._download_webpage(url, video_id) - - if 'anime/' not in url: - cid = self._search_regex( - r'\bcid(?:["\']:|=)(\d+)', webpage, 'cid', - default=None - ) or compat_parse_qs(self._search_regex( - [r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)', - r'EmbedPlayer\([^)]+,\s*\\"([^"]+)\\"\)', - r']+src="https://secure\.bilibili\.com/secure,([^"]+)"'], - webpage, 'player parameters'))['cid'][0] + title = self._html_search_regex( + (']+\btitle=(["\'])(?P(?:(?!\1).)+)\1', + '(?s)<h1[^>]*>(?P<title>.+?)</h1>'), webpage, 'title', + group='title') + part_list = [] + if anime_id is None or len(anime_id) == 0: + if re.match(r'^\d+$', video_id) is not None: + video_id = self._aid_to_bid(video_id) + self.to_screen("%s: convert to bvid %s"%(original_video_id, video_id)) + list_api_url = 'https://api.bilibili.com/x/web-interface/view/detail?bvid=%s'%(video_id, ) + js = self._download_json(list_api_url, original_video_id, 'downloading video list', 'downloding video list failed', fatal=False) + if True or js is None or js is False: + # old method + cid = self._search_regex( + r'\bcid(?:["\']:|=)(\d+)', webpage, 'cid', + default=None + ) or compat_parse_qs(self._search_regex( + [r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)', + r'EmbedPlayer\([^)]+,\s*\\"([^"]+)\\"\)', + r'<iframe[^>]+src="https://secure\.bilibili\.com/secure,([^"]+)"'], + webpage, 'player parameters'))['cid'][0] + part_list = [{'cid':cid, 'title': title}] + video_list = js['data']['View']['pages'] + self.to_screen("%s: video count: %d"%(original_video_id, len(video_list))) + part_list = [{'cid': x['cid'], 'title': x['part']} for x in video_list] else: if 'no_bangumi_tip' not in smuggled_data: self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dl with %s' % ( @@ -153,7 +177,8 @@ class BiliBiliIE(InfoExtractor): headers=headers) if 'result' not in js: self._report_error(js) - cid = js['result']['cid'] + #TODO: set title + part_list = [{'cid': js['result']['cid'], 'title':''}] headers = { 'Referer': url @@ -163,53 +188,55 @@ class BiliBiliIE(InfoExtractor): entries = [] RENDITIONS = ('qn=80&quality=80&type=', 'quality=2&type=mp4') - for num, rendition in enumerate(RENDITIONS, start=1): - payload = 'appkey=%s&cid=%s&otype=json&%s' % (self._APP_KEY, cid, rendition) - sign = hashlib.md5((payload + self._BILIBILI_KEY).encode('utf-8')).hexdigest() + for part_info in part_list: + # try to get video playback url, use + for num, rendition in enumerate(RENDITIONS, start=1): + payload = 'appkey=%s&cid=%s&otype=json&%s' % (self._APP_KEY, part_info['cid'], rendition) + sign = hashlib.md5((payload + self._BILIBILI_KEY).encode('utf-8')).hexdigest() - video_info = self._download_json( - 'http://interface.bilibili.com/v2/playurl?%s&sign=%s' % (payload, sign), - video_id, note='Downloading video info page', - headers=headers, fatal=num == len(RENDITIONS)) + video_info = self._download_json( + 'http://interface.bilibili.com/v2/playurl?%s&sign=%s' % (payload, sign), + original_video_id, note='Downloading video info for cid: %s'%(part_info['cid'], ), + headers=headers, fatal=num == len(RENDITIONS)) - if not video_info: - continue - - if 'durl' not in video_info: - if num < len(RENDITIONS): + if not video_info: continue - self._report_error(video_info) - for idx, durl in enumerate(video_info['durl']): - formats = [{ - 'url': durl['url'], - 'filesize': int_or_none(durl['size']), - }] - for backup_url in durl.get('backup_url', []): - formats.append({ - 'url': backup_url, - # backup URLs have lower priorities - 'preference': -2 if 'hd.mp4' in backup_url else -3, + if 'durl' not in video_info: + if num < len(RENDITIONS): + continue + self._report_error(video_info) + part_title = part_info['title'] + if len(part_list) == 1: + # if video only got one part, use video title instead of part title + part_title = title + for idx, durl in enumerate(video_info['durl']): + # some video is splited to many fragments, here is this fragments + formats = [{ + 'url': durl['url'], + 'filesize': int_or_none(durl['size']), + }] + for backup_url in durl.get('backup_url', []): + formats.append({ + 'url': backup_url, + # backup URLs have lower priorities + 'preference': -2 if 'hd.mp4' in backup_url else -3, + }) + + for a_format in formats: + a_format.setdefault('http_headers', {}).update({ + 'Referer': url, + }) + + self._sort_formats(formats) + + entries.append({ + 'id': '%s_%s_%s' % (original_video_id,part_info['cid'],idx), + 'duration': float_or_none(durl.get('length'), 1000), + 'formats': formats, + 'title': part_title }) - - for a_format in formats: - a_format.setdefault('http_headers', {}).update({ - 'Referer': url, - }) - - self._sort_formats(formats) - - entries.append({ - 'id': '%s_part%s' % (video_id, idx), - 'duration': float_or_none(durl.get('length'), 1000), - 'formats': formats, - }) - break - - title = self._html_search_regex( - ('<h1[^>]+\btitle=(["\'])(?P<title>(?:(?!\1).)+)\1', - '(?s)<h1[^>]*>(?P<title>.+?)</h1>'), webpage, 'title', - group='title') + break description = self._html_search_meta('description', webpage) timestamp = unified_timestamp(self._html_search_regex( r'<time[^>]+datetime="([^"]+)"', webpage, 'upload time', @@ -218,14 +245,7 @@ class BiliBiliIE(InfoExtractor): thumbnail = self._html_search_meta(['og:image', 'thumbnailUrl'], webpage) # TODO 'view_count' requires deobfuscating Javascript - info = { - 'id': video_id, - 'title': title, - 'description': description, - 'timestamp': timestamp, - 'thumbnail': thumbnail, - 'duration': float_or_none(video_info.get('timelength'), scale=1000), - } + info = {} uploader_mobj = re.search( r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/(?P<id>\d+)"[^>]*>(?P<name>[^<]+)', @@ -243,16 +263,22 @@ class BiliBiliIE(InfoExtractor): entry.update(info) if len(entries) == 1: - return entries[0] + entry = entries[0] + # video only got one part + entry['id'] = original_video_id + entry['title'] = title + entry['description'] = description + entry['timestamp'] = timestamp + entry['thumbnail'] = thumbnail + return entry else: - for idx, entry in enumerate(entries): - entry['id'] = '%s_part%d' % (video_id, (idx + 1)) - return { '_type': 'multi_video', - 'id': video_id, + 'id': original_video_id, 'title': title, 'description': description, + 'thumbnail': thumbnail, + 'timestamp' : timestamp, 'entries': entries, } From bf2023ca326fe920cc1be7374e547325369f9fae Mon Sep 17 00:00:00 2001 From: ywwzwb <ywwzwb@gmail.com> Date: Sun, 17 May 2020 13:44:24 +0800 Subject: [PATCH 02/11] [Bilibili] fill test --- youtube_dl/extractor/bilibili.py | 143 +++++++++++++++++++------------ 1 file changed, 86 insertions(+), 57 deletions(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index eb463b35d..50ec9c486 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import hashlib import re +from datetime import datetime from .common import InfoExtractor from ..compat import ( @@ -47,7 +48,7 @@ class BiliBiliIE(InfoExtractor): 'title': '【金坷垃】金泡沫', 'description': 'md5:ce18c2a2d2193f0df2917d270f2e5923', 'duration': 308.067, - 'timestamp': 1398012678, + 'timestamp': 1397983878, 'upload_date': '20140420', 'thumbnail': r're:^https?://.+\.jpg', 'uploader': '菊子桑', @@ -74,31 +75,26 @@ class BiliBiliIE(InfoExtractor): 'id': '8903802', 'title': '阿滴英文｜英文歌分享#6 "Closer', 'description': '滴妹今天唱Closer給你聽! 有史以来，被推最多次也是最久的歌曲，其实歌词跟我原本想像差蛮多的，不过还是好听！ 微博@阿滴英文', + 'uploader': '阿滴英文', + 'uploader_id': '65880958', + 'upload_date': '20170301', + 'timestamp': 1488353834, }, 'playlist': [{ 'info_dict': { - 'id': '8903802_part1', + 'id': '8903802_14694589_1', 'ext': 'flv', 'title': '阿滴英文｜英文歌分享#6 "Closer', - 'description': 'md5:3b1b9e25b78da4ef87e9b548b88ee76a', - 'uploader': '阿滴英文', - 'uploader_id': '65880958', - 'timestamp': 1488382634, - 'upload_date': '20170301', + }, 'params': { 'skip_download': True, # Test metadata only }, }, { 'info_dict': { - 'id': '8903802_part2', + 'id': '8903802_14694589_2', 'ext': 'flv', 'title': '阿滴英文｜英文歌分享#6 "Closer', - 'description': 'md5:3b1b9e25b78da4ef87e9b548b88ee76a', - 'uploader': '阿滴英文', - 'uploader_id': '65880958', - 'timestamp': 1488382634, - 'upload_date': '20170301', }, 'params': { 'skip_download': True, # Test metadata only @@ -136,19 +132,23 @@ class BiliBiliIE(InfoExtractor): original_video_id = video_id anime_id = mobj.group('anime_id') or mobj.group('anime_id_2') webpage = self._download_webpage(url, video_id) - title = self._html_search_regex( - ('<h1[^>]+\btitle=(["\'])(?P<title>(?:(?!\1).)+)\1', - '(?s)<h1[^>]*>(?P<title>.+?)</h1>'), webpage, 'title', - group='title') + title = '' + timestamp = 0 + thumbnail = '' + description = '' + uploader_id = '' + uploader_name = '' + view_count = 0 part_list = [] - if anime_id is None or len(anime_id) == 0: + if not anime_id: + # normal video if re.match(r'^\d+$', video_id) is not None: video_id = self._aid_to_bid(video_id) self.to_screen("%s: convert to bvid %s"%(original_video_id, video_id)) list_api_url = 'https://api.bilibili.com/x/web-interface/view/detail?bvid=%s'%(video_id, ) js = self._download_json(list_api_url, original_video_id, 'downloading video list', 'downloding video list failed', fatal=False) - if True or js is None or js is False: - # old method + if not js: + # try old method cid = self._search_regex( r'\bcid(?:["\']:|=)(\d+)', webpage, 'cid', default=None @@ -157,10 +157,18 @@ class BiliBiliIE(InfoExtractor): r'EmbedPlayer\([^)]+,\s*\\"([^"]+)\\"\)', r'<iframe[^>]+src="https://secure\.bilibili\.com/secure,([^"]+)"'], webpage, 'player parameters'))['cid'][0] - part_list = [{'cid':cid, 'title': title}] - video_list = js['data']['View']['pages'] - self.to_screen("%s: video count: %d"%(original_video_id, len(video_list))) - part_list = [{'cid': x['cid'], 'title': x['part']} for x in video_list] + part_list = [{'cid': cid, 'title': title}] + else: + # new method, get value from json + video_list = js['data']['View']['pages'] + title = js['data']['View']['title'] + thumbnail = js['data']['View']['pic'] + description = js['data']['View']['desc'] + uploader_id = js['data']['Card']['card']['mid'] + uploader_name = js['data']['Card']['card']['name'] + view_count = js['data']['View']['stat']['view'] + self.to_screen("%s: video count: %d"%(original_video_id, len(video_list))) + part_list = [{'cid': x['cid'], 'title': x['part']} for x in video_list] else: if 'no_bangumi_tip' not in smuggled_data: self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dl with %s' % ( @@ -179,7 +187,6 @@ class BiliBiliIE(InfoExtractor): self._report_error(js) #TODO: set title part_list = [{'cid': js['result']['cid'], 'title':''}] - headers = { 'Referer': url } @@ -231,56 +238,78 @@ class BiliBiliIE(InfoExtractor): self._sort_formats(formats) entries.append({ - 'id': '%s_%s_%s' % (original_video_id,part_info['cid'],idx), + 'id': '%s_%s_%s' % (original_video_id,part_info['cid'],idx + 1), 'duration': float_or_none(durl.get('length'), 1000), 'formats': formats, 'title': part_title }) break - description = self._html_search_meta('description', webpage) - timestamp = unified_timestamp(self._html_search_regex( - r'<time[^>]+datetime="([^"]+)"', webpage, 'upload time', - default=None) or self._html_search_meta( - 'uploadDate', webpage, 'timestamp', default=None)) - thumbnail = self._html_search_meta(['og:image', 'thumbnailUrl'], webpage) + + + # timestamp = unified_timestamp(self._html_search_regex( + # r'<time[^>]+datetime="([^"]+)"', webpage, 'upload time', + # default=None) or self._html_search_meta( + # 'uploadDate', webpage, 'timestamp', default=None)) + # upload_date = + - # TODO 'view_count' requires deobfuscating Javascript - info = {} - - uploader_mobj = re.search( - r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/(?P<id>\d+)"[^>]*>(?P<name>[^<]+)', - webpage) - if uploader_mobj: - info.update({ - 'uploader': uploader_mobj.group('name'), - 'uploader_id': uploader_mobj.group('id'), - }) - if not info.get('uploader'): - info['uploader'] = self._html_search_meta( + if not title: + title = self._html_search_regex( + ('<h1[^>]+\btitle=(["\'])(?P<title>(?:(?!\1).)+)\1', + '(?s)<h1[^>]*>(?P<title>.+?)</h1>'), webpage, 'title', + group='title') + if not timestamp: + timestamp = self._html_search_regex( + ('"pubdate":(?P<timestamp>\d+),'), webpage, 'title', + group='timestamp') + if not uploader_id or not uploader_name: + uploader_mobj = re.search( + r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/(?P<id>\d+)"[^>]*>(?P<name>[^<]+)', + webpage) + if uploader_mobj: + uploader_id = uploader_mobj.group('id') + uploader_name = uploader_mobj.group('name') + if not uploader_id or not uploader_name: + # try agagin + uploader_name = self._html_search_meta( 'author', webpage, 'uploader', default=None) + if not thumbnail: + thumbnail = self._html_search_meta(['og:image', 'thumbnailUrl'], webpage) + if not description: + description = self._html_search_meta('description', webpage) + timestamp = int(timestamp) + upload_date = datetime.fromtimestamp(timestamp).strftime('%Y%m%d') + view_count = int(view_count) + - for entry in entries: - entry.update(info) + if len(entries) == 1: entry = entries[0] - # video only got one part + entry['uploader'] = uploader_name + entry['uploader_id'] = uploader_id entry['id'] = original_video_id entry['title'] = title entry['description'] = description entry['timestamp'] = timestamp entry['thumbnail'] = thumbnail + entry['upload_date'] = upload_date + entry['view_count'] = view_count return entry else: - return { - '_type': 'multi_video', - 'id': original_video_id, - 'title': title, - 'description': description, - 'thumbnail': thumbnail, - 'timestamp' : timestamp, - 'entries': entries, - } + return { + '_type': 'multi_video', + 'uploader': uploader_name, + 'uploader_id': uploader_id, + 'id': original_video_id, + 'title': title, + 'description': description, + 'thumbnail': thumbnail, + 'timestamp': timestamp, + 'upload_date': upload_date, + 'view_count' : view_count, + 'entries': entries, + } class BiliBiliBangumiIE(InfoExtractor): From e3ee347bcc18ac44cc09df4e9880463535bb0b0b Mon Sep 17 00:00:00 2001 From: ywwzwb <ywwzwb@gmail.com> Date: Sun, 17 May 2020 14:57:43 +0800 Subject: [PATCH 03/11] [Bilibili] remove support(will add later) and add some test, fix match regex --- youtube_dl/extractor/bilibili.py | 145 +++++++++++++++---------------- 1 file changed, 71 insertions(+), 74 deletions(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 50ec9c486..62386d436 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -27,16 +27,8 @@ from ..utils import ( class BiliBiliIE(InfoExtractor): _VALID_URL = r'''(?x) https?:// - (?:(?:www|bangumi)\.)? - bilibili\.(?:tv|com)/ - (?: - (?: - video/[aA][vV]| - anime/(?P<anime_id>\d+)/play\#| - bangumi/media/md(?P<anime_id_2>\d+) - )(?P<id_bv>\d+)| - video/[bB][vV](?P<id>[^/?#&]+) - ) + (?:www\.)bilibili.(?:com|net) + /video/[aAbB][vV](?P<id>[^/?#&]+) ''' _TESTS = [{ @@ -54,20 +46,6 @@ class BiliBiliIE(InfoExtractor): 'uploader': '菊子桑', 'uploader_id': '156160', }, - }, { - # Tested in BiliBiliBangumiIE - 'url': 'http://bangumi.bilibili.com/anime/2338/play#40062', - 'only_matching': True, - }, { - 'url': 'http://bangumi.bilibili.com/anime/5802/play#100643', - 'md5': '3f721ad1e75030cc06faf73587cfec57', - 'info_dict': { - 'id': '100643', - 'ext': 'mp4', - 'title': 'CHAOS;CHILD', - 'description': '如果你是神明，并且能够让妄想成为现实。那你会进行怎么样的妄想？是淫靡的世界？独裁社会？毁灭性的制裁？还是……2015年，涩谷。从6年前发生的大灾害“涩谷地震”之后复兴了的这个街区里新设立的私立高中...', - }, - 'skip': 'Geo-restricted to China', }, { # Title with double quotes 'url': 'http://www.bilibili.com/video/av8903802/', @@ -80,6 +58,9 @@ class BiliBiliIE(InfoExtractor): 'upload_date': '20170301', 'timestamp': 1488353834, }, + 'params': { + 'skip_download': True, # Test metadata only + }, 'playlist': [{ 'info_dict': { 'id': '8903802_14694589_1', @@ -104,7 +85,43 @@ class BiliBiliIE(InfoExtractor): # new BV video id format 'url': 'https://www.bilibili.com/video/BV1JE411F741', 'only_matching': True, - }] + }, { + # multiple part video + 'url': 'https://www.bilibili.com/video/BV1FJ411k7q9', + 'info_dict': { + 'id': '1FJ411k7q9', + 'title': '【原始技术】用草木灰代替粘土（Minecraft真人版第五十一弹）', + 'description': '【Primitive Technology@Youtube】\n看着上一集烧砖产生的大量草木灰，小哥有了新想法：草木灰也许可以作为粘土的又一种替代品，用来做罐子、砖块都行，不怕浸水，还不需要烧制。这是小哥第51个视频，完整合集见av2920827。更多细节见: https://youtu.be/rG6nzrksbPQ，想帮小哥制作更好的视频可以上Patreon给小哥充电：https://www.patreon.com/user?u=2945881', + 'uploader': '昨梦电羊', + 'uploader_id': '1388774', + 'upload_date': '20191215', + 'timestamp': 1576376056, + }, + 'params': { + 'skip_download': True, # Test metadata only + }, + 'playlist': [{ + 'info_dict': { + 'id': '1FJ411k7q9_135730700_1', + 'ext': 'flv', + 'title': '字幕版1080p', + + }, + 'params': { + 'skip_download': True, # Test metadata only + }, + }, { + 'info_dict': { + 'id': '1FJ411k7q9_135730766_1', + 'ext': 'flv', + 'title': '无字幕版', + }, + 'params': { + 'skip_download': True, # Test metadata only + }, + }] + } + ] _APP_KEY = 'iVGUTjsxvpLeuDCf' _BILIBILI_KEY = 'aHRmhWMLkdeMuILqORnYZocwMBpMEOdt' @@ -127,10 +144,9 @@ class BiliBiliIE(InfoExtractor): url, smuggled_data = unsmuggle_url(url, {}) mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') or mobj.group('id_bv') + video_id = mobj.group('id') # save the origin video id original_video_id = video_id - anime_id = mobj.group('anime_id') or mobj.group('anime_id_2') webpage = self._download_webpage(url, video_id) title = '' timestamp = 0 @@ -140,53 +156,34 @@ class BiliBiliIE(InfoExtractor): uploader_name = '' view_count = 0 part_list = [] - if not anime_id: - # normal video - if re.match(r'^\d+$', video_id) is not None: - video_id = self._aid_to_bid(video_id) - self.to_screen("%s: convert to bvid %s"%(original_video_id, video_id)) - list_api_url = 'https://api.bilibili.com/x/web-interface/view/detail?bvid=%s'%(video_id, ) - js = self._download_json(list_api_url, original_video_id, 'downloading video list', 'downloding video list failed', fatal=False) - if not js: - # try old method - cid = self._search_regex( - r'\bcid(?:["\']:|=)(\d+)', webpage, 'cid', - default=None - ) or compat_parse_qs(self._search_regex( - [r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)', - r'EmbedPlayer\([^)]+,\s*\\"([^"]+)\\"\)', - r'<iframe[^>]+src="https://secure\.bilibili\.com/secure,([^"]+)"'], - webpage, 'player parameters'))['cid'][0] - part_list = [{'cid': cid, 'title': title}] - else: - # new method, get value from json - video_list = js['data']['View']['pages'] - title = js['data']['View']['title'] - thumbnail = js['data']['View']['pic'] - description = js['data']['View']['desc'] - uploader_id = js['data']['Card']['card']['mid'] - uploader_name = js['data']['Card']['card']['name'] - view_count = js['data']['View']['stat']['view'] - self.to_screen("%s: video count: %d"%(original_video_id, len(video_list))) - part_list = [{'cid': x['cid'], 'title': x['part']} for x in video_list] + # normal video + if re.match(r'^\d+$', video_id): + video_id = self._aid_to_bid(video_id) + self.to_screen("%s: convert to bvid %s"%(original_video_id, video_id)) + list_api_url = 'https://api.bilibili.com/x/web-interface/view/detail?bvid=%s'%(video_id, ) + js = self._download_json(list_api_url, original_video_id, 'downloading video list', 'downloding video list failed', fatal=False) + if not js: + # try old method + cid = self._search_regex( + r'\bcid(?:["\']:|=)(\d+)', webpage, 'cid', + default=None + ) or compat_parse_qs(self._search_regex( + [r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)', + r'EmbedPlayer\([^)]+,\s*\\"([^"]+)\\"\)', + r'<iframe[^>]+src="https://secure\.bilibili\.com/secure,([^"]+)"'], + webpage, 'player parameters'))['cid'][0] + part_list = [{'cid': cid, 'title': title}] else: - if 'no_bangumi_tip' not in smuggled_data: - self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dl with %s' % ( - 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()) - - js = self._download_json( - 'http://bangumi.bilibili.com/web_api/get_source', video_id, - data=urlencode_postdata({'episode_id': video_id}), - headers=headers) - if 'result' not in js: - self._report_error(js) - #TODO: set title - part_list = [{'cid': js['result']['cid'], 'title':''}] + # new method, get value from json + video_list = js['data']['View']['pages'] + title = js['data']['View']['title'] + thumbnail = js['data']['View']['pic'] + description = js['data']['View']['desc'] + uploader_id = js['data']['Card']['card']['mid'] + uploader_name = js['data']['Card']['card']['name'] + view_count = js['data']['View']['stat']['view'] + self.to_screen("%s: video count: %d"%(original_video_id, len(video_list))) + part_list = [{'cid': x['cid'], 'title': x['part']} for x in video_list] headers = { 'Referer': url } @@ -260,7 +257,7 @@ class BiliBiliIE(InfoExtractor): group='title') if not timestamp: timestamp = self._html_search_regex( - ('"pubdate":(?P<timestamp>\d+),'), webpage, 'title', + (r'"pubdate":(?P<timestamp>\d+),'), webpage, 'title', group='timestamp') if not uploader_id or not uploader_name: uploader_mobj = re.search( From 74a06c62dd5e8c4ca3583c1e411a3afe614828b2 Mon Sep 17 00:00:00 2001 From: ywwzwb <ywwzwb@gmail.com> Date: Sun, 17 May 2020 15:01:41 +0800 Subject: [PATCH 04/11] [BiliBili] fix tv domain support --- youtube_dl/extractor/bilibili.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 62386d436..188905df3 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -27,7 +27,7 @@ from ..utils import ( class BiliBiliIE(InfoExtractor): _VALID_URL = r'''(?x) https?:// - (?:www\.)bilibili.(?:com|net) + (?:www\.)bilibili.(?:com|tv) /video/[aAbB][vV](?P<id>[^/?#&]+) ''' From 977857a4231070569b68fc7a14056daf346ae589 Mon Sep 17 00:00:00 2001 From: ywwzwb <ywwzwb@gmail.com> Date: Sun, 17 May 2020 17:48:02 +0800 Subject: [PATCH 05/11] [BiliBili] add suport for bangumi --- youtube_dl/extractor/bilibili.py | 121 +++++++++++++++++++++++-------- 1 file changed, 89 insertions(+), 32 deletions(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 188905df3..6a80eda20 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -214,7 +214,7 @@ class BiliBiliIE(InfoExtractor): if len(part_list) == 1: # if video only got one part, use video title instead of part title part_title = title - for idx, durl in enumerate(video_info['durl']): + for idx, durl in enumerate(video_info['durl'], start = 1): # some video is splited to many fragments, here is this fragments formats = [{ 'url': durl['url'], @@ -235,7 +235,7 @@ class BiliBiliIE(InfoExtractor): self._sort_formats(formats) entries.append({ - 'id': '%s_%s_%s' % (original_video_id,part_info['cid'],idx + 1), + 'id': '%s_%s_%s' % (original_video_id,part_info['cid'],idx), 'duration': float_or_none(durl.get('length'), 1000), 'formats': formats, 'title': part_title @@ -310,19 +310,56 @@ class BiliBiliIE(InfoExtractor): class BiliBiliBangumiIE(InfoExtractor): - _VALID_URL = r'https?://bangumi\.bilibili\.com/anime/(?P<id>\d+)' + _VALID_URL = r'https?://(?:www\.)bilibili.com/bangumi/media/[mD][dD](?P<id>\d+)' IE_NAME = 'bangumi.bilibili.com' IE_DESC = 'BiliBili番剧' _TESTS = [{ - 'url': 'http://bangumi.bilibili.com/anime/1869', + 'url': 'https://www.bilibili.com/bangumi/media/md3814', 'info_dict': { - 'id': '1869', - 'title': '混沌武士', - 'description': 'md5:6a9622b911565794c11f25f81d6a97d2', + 'id': '3814', + 'title': '魔动王 最后的魔法大战', + 'description': 'md5:9634eb0d85d515f6930fa1c833ccee63', }, - 'playlist_count': 26, + 'playlist': [{ + 'info_dict': { + 'id': '3814_1_1', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + },{ + 'info_dict': { + 'id': '3814_1_2', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + },{ + 'info_dict': { + 'id': '3814_1_3', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + },{ + 'info_dict': { + 'id': '3814_1_4', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + },{ + 'info_dict': { + 'id': '3814_1_5', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + }, { + 'info_dict': { + 'id': '3814_2_1', + 'ext': 'flv', + 'title' : '最后的魔法大战 后篇' + }, + } + ] }, { 'url': 'http://bangumi.bilibili.com/anime/1869', 'info_dict': { @@ -348,34 +385,54 @@ class BiliBiliBangumiIE(InfoExtractor): }, }] - @classmethod - def suitable(cls, url): - return False if BiliBiliIE.suitable(url) else super(BiliBiliBangumiIE, cls).suitable(url) - def _real_extract(self, url): + headers = { + 'Referer': url + } bangumi_id = self._match_id(url) + bangumi_info = self._download_json( + 'https://api.bilibili.com/pgc/view/web/season?season_id=%s' % (bangumi_id,), + bangumi_id, + 'Downloading bangumi info', + 'Downloading bangumi failed')['result'] + title = bangumi_info['season_title'] + description = bangumi_info['evaluate'] + view_count = bangumi_info['stat']['views'] + episodes = bangumi_info['episodes'] + self.to_screen('%s: episode count: %d' % (bangumi_id, len(episodes))) + entries = [] + for idx, episode in enumerate(episodes, start=1): + play_back_info = self._download_json( + 'http://api.bilibili.com/x/player/playurl?bvid=%s&cid=%s&qn=80' % (episode['bvid'], episode['cid']), + bangumi_id, + 'downloding playback info for ep: %d' % (idx, ), + headers=headers)['data'] + for fragment_idx, durl in enumerate(play_back_info['durl'], start=1): + # some video is splited to many fragments, here is this fragments + formats = [{ + 'url': durl['url'], + 'filesize': int_or_none(durl['size']), + }] + for backup_url in durl.get('backup_url', []): + formats.append({ + 'url': backup_url, + # backup URLs have lower priorities + 'preference': -2 if 'hd.mp4' in backup_url else -3, + }) - # Sometimes this API returns a JSONP response - season_info = self._download_json( - 'http://bangumi.bilibili.com/jsonp/seasoninfo/%s.ver' % bangumi_id, - bangumi_id, transform_source=strip_jsonp)['result'] - - entries = [{ - '_type': 'url_transparent', - 'url': smuggle_url(episode['webplay_url'], {'no_bangumi_tip': 1}), - 'ie_key': BiliBiliIE.ie_key(), - 'timestamp': parse_iso8601(episode.get('update_time'), delimiter=' '), - 'episode': episode.get('index_title'), - 'episode_number': int_or_none(episode.get('index')), - } for episode in season_info['episodes']] - - entries = sorted(entries, key=lambda entry: entry.get('episode_number')) - - return self.playlist_result( - entries, bangumi_id, - season_info.get('bangumi_title'), season_info.get('evaluate')) - + for a_format in formats: + a_format.setdefault('http_headers', {}).update({ + 'Referer': url, + }) + self._sort_formats(formats) + entries.append({ + 'id': '%s_%d_%d' % (bangumi_id,idx, fragment_idx), + 'duration': float_or_none(durl.get('length'), 1000), + 'formats': formats, + 'title': episode['long_title'] + }) + return self.playlist_result(entries, bangumi_id, title, description) class BilibiliAudioBaseIE(InfoExtractor): def _call_api(self, path, sid, query=None): if not query: From 9c1580ed8ac08faec90ad97ac48e78418f9ce39c Mon Sep 17 00:00:00 2001 From: ywwzwb <ywwzwb@gmail.com> Date: Sun, 17 May 2020 18:08:43 +0800 Subject: [PATCH 06/11] [BiliBili] add support for bangumi episode --- youtube_dl/extractor/bilibili.py | 81 +++++++++++++++++++++--------- youtube_dl/extractor/extractors.py | 1 + 2 files changed, 59 insertions(+), 23 deletions(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 6a80eda20..cf7551044 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -360,29 +360,6 @@ class BiliBiliBangumiIE(InfoExtractor): }, } ] - }, { - 'url': 'http://bangumi.bilibili.com/anime/1869', - 'info_dict': { - 'id': '1869', - 'title': '混沌武士', - 'description': 'md5:6a9622b911565794c11f25f81d6a97d2', - }, - 'playlist': [{ - 'md5': '91da8621454dd58316851c27c68b0c13', - 'info_dict': { - 'id': '40062', - 'ext': 'mp4', - 'title': '混沌武士', - 'description': '故事发生在日本的江户时代。风是一个小酒馆的打工女。一日，酒馆里来了一群恶霸，虽然他们的举动令风十分不满，但是毕竟风只是一届女流，无法对他们采取什么行动，只能在心里嘟哝。这时，酒家里又进来了个“不良份子...', - 'timestamp': 1414538739, - 'upload_date': '20141028', - 'episode': '疾风怒涛 Tempestuous Temperaments', - 'episode_number': 1, - }, - }], - 'params': { - 'playlist_items': '1', - }, }] def _real_extract(self, url): @@ -433,6 +410,64 @@ class BiliBiliBangumiIE(InfoExtractor): 'title': episode['long_title'] }) return self.playlist_result(entries, bangumi_id, title, description) +class BiliBiliBangumiEpisodeIE(InfoExtractor): + _VALID_URL = r'https?://(?:www\.)bilibili.com/bangumi/play/[eE][pP](?P<id>\d+)' + + IE_NAME = 'bangumi.bilibili.com' + IE_DESC = 'BiliBili番剧' + _TESTS = [{ + 'url': 'https://www.bilibili.com/bangumi/play/ep86635', + 'info_dict': { + 'id': '3814', + 'title': '魔动王 最后的魔法大战', + 'description': 'md5:9634eb0d85d515f6930fa1c833ccee63', + }, + 'playlist': [{ + 'info_dict': { + 'id': '3814_1_1', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + },{ + 'info_dict': { + 'id': '3814_1_2', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + },{ + 'info_dict': { + 'id': '3814_1_3', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + },{ + 'info_dict': { + 'id': '3814_1_4', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + },{ + 'info_dict': { + 'id': '3814_1_5', + 'ext': 'flv', + 'title' : '最后的魔法大战 前篇' + }, + }, { + 'info_dict': { + 'id': '3814_2_1', + 'ext': 'flv', + 'title' : '最后的魔法大战 后篇' + }, + } + ] + }] + + def _real_extract(self, url): + ep_id = self._match_id(url) + bangumi_id = self._download_json('https://api.bilibili.com/pgc/view/web/season?ep_id=%s'%(ep_id, ), ep_id, 'Downloading bangumi info')['result']['media_id'] + return self.url_result( + 'https://www.bilibili.com/bangumi/media/md%s' % bangumi_id, + ie=BiliBiliBangumiIE.ie_key(), video_id=ep_id) class BilibiliAudioBaseIE(InfoExtractor): def _call_api(self, path, sid, query=None): if not query: diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 4b3092028..6e563e9d5 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -103,6 +103,7 @@ from .bild import BildIE from .bilibili import ( BiliBiliIE, BiliBiliBangumiIE, + BiliBiliBangumiEpisodeIE, BilibiliAudioIE, BilibiliAudioAlbumIE, BiliBiliPlayerIE, From 69f4e8db16fec009891030f2cfd5f31479067cee Mon Sep 17 00:00:00 2001 From: ywwzwb <ywwzwb@gmail.com> Date: Sun, 17 May 2020 18:18:00 +0800 Subject: [PATCH 07/11] [BiliBili] fix test error --- youtube_dl/extractor/bilibili.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index cf7551044..5afc0d582 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -550,7 +550,7 @@ class BilibiliAudioAlbumIE(BilibiliAudioBaseIE): 'title': '每日新曲推荐（每日11:00更新）', 'description': '每天11:00更新，为你推送最新音乐', }, - 'playlist_count': 19, + 'playlist_count': 20, } def _real_extract(self, url): From c35bdd1b8e5e31e53573ef8ed2205170e9fc4860 Mon Sep 17 00:00:00 2001 From: ywwzwb <ywwzwb@gmail.com> Date: Sun, 17 May 2020 23:50:01 +0800 Subject: [PATCH 08/11] [BiliBili] change some dict key operation to get method --- youtube_dl/extractor/bilibili.py | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 5afc0d582..e9acf7963 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -176,12 +176,12 @@ class BiliBiliIE(InfoExtractor): else: # new method, get value from json video_list = js['data']['View']['pages'] - title = js['data']['View']['title'] + title = js.get('data').get('View').get('title') thumbnail = js['data']['View']['pic'] - description = js['data']['View']['desc'] - uploader_id = js['data']['Card']['card']['mid'] - uploader_name = js['data']['Card']['card']['name'] - view_count = js['data']['View']['stat']['view'] + uploader_id = js.get('data').get('Card').get('card').get('mid') + description = js.get('data').get('View').get('desc') + uploader_name = js.get('data').get('Card').get('card').get('name') + view_count = js.get('data').get('View').get('stat').get('view') self.to_screen("%s: video count: %d"%(original_video_id, len(video_list))) part_list = [{'cid': x['cid'], 'title': x['part']} for x in video_list] headers = { @@ -294,19 +294,14 @@ class BiliBiliIE(InfoExtractor): entry['view_count'] = view_count return entry else: - return { - '_type': 'multi_video', - 'uploader': uploader_name, - 'uploader_id': uploader_id, - 'id': original_video_id, - 'title': title, - 'description': description, - 'thumbnail': thumbnail, - 'timestamp': timestamp, - 'upload_date': upload_date, - 'view_count' : view_count, - 'entries': entries, - } + playlist_entry = self.playlist_result(entries, id, title, description) + playlist_entry['uploader'] = uploader_name + playlist_entry['uploader_id'] = uploader_id + playlist_entry['timestamp'] = timestamp + playlist_entry['thumbnail'] = thumbnail + playlist_entry['upload_date'] = upload_date + playlist_entry['view_count'] = view_count + return playlist_entry class BiliBiliBangumiIE(InfoExtractor): From 4f8d365d88fc1f017281939485aafdbf5a1856d5 Mon Sep 17 00:00:00 2001 From: zwb <zengwenbin@skyguard.com.cn> Date: Mon, 18 May 2020 11:05:49 +0800 Subject: [PATCH 09/11] [BiliBili] fit all test --- youtube_dl/extractor/bilibili.py | 178 +++++++++++++------------------ 1 file changed, 73 insertions(+), 105 deletions(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index e9acf7963..25967ed99 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -6,21 +6,11 @@ import re from datetime import datetime from .common import InfoExtractor -from ..compat import ( - compat_parse_qs, - compat_urlparse, -) from ..utils import ( ExtractorError, int_or_none, float_or_none, - parse_iso8601, - smuggle_url, str_or_none, - strip_jsonp, - unified_timestamp, - unsmuggle_url, - urlencode_postdata, ) @@ -133,19 +123,19 @@ class BiliBiliIE(InfoExtractor): raise ExtractorError('%s returns error %d' % (self.IE_NAME, result['code']), expected=True) else: raise ExtractorError('Can\'t extract Bangumi episode ID') + def _aid_to_bid(self, aid): ''' convert bilibili avid to bid ''' - api_url = 'http://api.bilibili.com/x/web-interface/view?aid=%s' %(aid, ) + + api_url = 'http://api.bilibili.com/x/web-interface/view?aid=%s' % (aid, ) js = self._download_json(api_url, aid, 'convert avid to bv id', 'convert failed') return js['data']['bvid'] - def _real_extract(self, url): - url, smuggled_data = unsmuggle_url(url, {}) - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - # save the origin video id + def _real_extract(self, url): + video_id = self._match_id(url) + # save the origin video id original_video_id = video_id webpage = self._download_webpage(url, video_id) title = '' @@ -156,34 +146,22 @@ class BiliBiliIE(InfoExtractor): uploader_name = '' view_count = 0 part_list = [] + upload_date = '' # normal video if re.match(r'^\d+$', video_id): video_id = self._aid_to_bid(video_id) - self.to_screen("%s: convert to bvid %s"%(original_video_id, video_id)) - list_api_url = 'https://api.bilibili.com/x/web-interface/view/detail?bvid=%s'%(video_id, ) - js = self._download_json(list_api_url, original_video_id, 'downloading video list', 'downloding video list failed', fatal=False) - if not js: - # try old method - cid = self._search_regex( - r'\bcid(?:["\']:|=)(\d+)', webpage, 'cid', - default=None - ) or compat_parse_qs(self._search_regex( - [r'EmbedPlayer\([^)]+,\s*"([^"]+)"\)', - r'EmbedPlayer\([^)]+,\s*\\"([^"]+)\\"\)', - r'<iframe[^>]+src="https://secure\.bilibili\.com/secure,([^"]+)"'], - webpage, 'player parameters'))['cid'][0] - part_list = [{'cid': cid, 'title': title}] - else: - # new method, get value from json - video_list = js['data']['View']['pages'] - title = js.get('data').get('View').get('title') - thumbnail = js['data']['View']['pic'] - uploader_id = js.get('data').get('Card').get('card').get('mid') - description = js.get('data').get('View').get('desc') - uploader_name = js.get('data').get('Card').get('card').get('name') - view_count = js.get('data').get('View').get('stat').get('view') - self.to_screen("%s: video count: %d"%(original_video_id, len(video_list))) - part_list = [{'cid': x['cid'], 'title': x['part']} for x in video_list] + self.to_screen("%s: convert to bvid %s" % (original_video_id, video_id)) + list_api_url = 'https://api.bilibili.com/x/web-interface/view/detail?bvid=%s' % (video_id, ) + js = self._download_json(list_api_url, original_video_id, 'downloading video list', 'downloding video list failed', fatal=False)['data'] + video_list = js['View']['pages'] + title = js['View']['title'] + thumbnail = js.get('View', {}).get('pic') + description = js.get('View', {}).get('desc') + view_count = js.get('View', {}).get('stat', {}).get('view') + uploader_id = js.get('Card', {}).get('card', {}).get('mid') + uploader_name = js.get('Card', {}).get('card', {}).get('name') + self.to_screen("%s: video count: %d" % (original_video_id, len(video_list))) + part_list = [{'cid': x['cid'], 'title': x['part']} for x in video_list] headers = { 'Referer': url } @@ -193,14 +171,14 @@ class BiliBiliIE(InfoExtractor): RENDITIONS = ('qn=80&quality=80&type=', 'quality=2&type=mp4') for part_info in part_list: - # try to get video playback url, use + # try to get video playback url, use for num, rendition in enumerate(RENDITIONS, start=1): payload = 'appkey=%s&cid=%s&otype=json&%s' % (self._APP_KEY, part_info['cid'], rendition) sign = hashlib.md5((payload + self._BILIBILI_KEY).encode('utf-8')).hexdigest() video_info = self._download_json( 'http://interface.bilibili.com/v2/playurl?%s&sign=%s' % (payload, sign), - original_video_id, note='Downloading video info for cid: %s'%(part_info['cid'], ), + original_video_id, note='Downloading video info for cid: %s' % (part_info['cid'], ), headers=headers, fatal=num == len(RENDITIONS)) if not video_info: @@ -214,7 +192,7 @@ class BiliBiliIE(InfoExtractor): if len(part_list) == 1: # if video only got one part, use video title instead of part title part_title = title - for idx, durl in enumerate(video_info['durl'], start = 1): + for idx, durl in enumerate(video_info['durl'], start=1): # some video is splited to many fragments, here is this fragments formats = [{ 'url': durl['url'], @@ -233,54 +211,41 @@ class BiliBiliIE(InfoExtractor): }) self._sort_formats(formats) - + entries.append({ - 'id': '%s_%s_%s' % (original_video_id,part_info['cid'],idx), + 'id': '%s_%s_%s' % (original_video_id, part_info['cid'], idx), 'duration': float_or_none(durl.get('length'), 1000), 'formats': formats, 'title': part_title }) break - - - # timestamp = unified_timestamp(self._html_search_regex( - # r'<time[^>]+datetime="([^"]+)"', webpage, 'upload time', - # default=None) or self._html_search_meta( - # 'uploadDate', webpage, 'timestamp', default=None)) - # upload_date = - - if not title: title = self._html_search_regex( ('<h1[^>]+\btitle=(["\'])(?P<title>(?:(?!\1).)+)\1', '(?s)<h1[^>]*>(?P<title>.+?)</h1>'), webpage, 'title', - group='title') + group='title', fatal=False) if not timestamp: timestamp = self._html_search_regex( - (r'"pubdate":(?P<timestamp>\d+),'), webpage, 'title', - group='timestamp') + (r'"pubdate":(?P<timestamp>\d+),'), webpage, 'timestamp', + group='timestamp', fatal=False) if not uploader_id or not uploader_name: - uploader_mobj = re.search( - r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/(?P<id>\d+)"[^>]*>(?P<name>[^<]+)', - webpage) - if uploader_mobj: - uploader_id = uploader_mobj.group('id') - uploader_name = uploader_mobj.group('name') - if not uploader_id or not uploader_name: - # try agagin - uploader_name = self._html_search_meta( - 'author', webpage, 'uploader', default=None) + uploader_id = self._html_search_regex( + r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/\d+"[^>]*>(?P<name>[^<]+)', + webpage, 'id', + group='id', fatal=False) + uploader_name = self._html_search_regex( + r'<a[^>]+href="(?:https?:)?//space\.bilibili\.com/(?P<id>\d+)"', + webpage, 'name', + group='name', fatal=False) if not thumbnail: - thumbnail = self._html_search_meta(['og:image', 'thumbnailUrl'], webpage) + thumbnail = self._html_search_meta(['og:image', 'thumbnailUrl'], webpage, fatal=False) if not description: - description = self._html_search_meta('description', webpage) - timestamp = int(timestamp) - upload_date = datetime.fromtimestamp(timestamp).strftime('%Y%m%d') - view_count = int(view_count) - - - - + description = self._html_search_meta('description', webpage, fatal=False) + if timestamp: + timestamp = int_or_none(timestamp) + upload_date = datetime.fromtimestamp(timestamp).strftime('%Y%m%d') + if view_count: + view_count = int_or_none(view_count) if len(entries) == 1: entry = entries[0] entry['uploader'] = uploader_name @@ -321,37 +286,37 @@ class BiliBiliBangumiIE(InfoExtractor): 'info_dict': { 'id': '3814_1_1', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, - },{ + }, { 'info_dict': { 'id': '3814_1_2', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, - },{ + }, { 'info_dict': { 'id': '3814_1_3', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, - },{ + }, { 'info_dict': { 'id': '3814_1_4', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, - },{ + }, { 'info_dict': { 'id': '3814_1_5', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, }, { 'info_dict': { 'id': '3814_2_1', 'ext': 'flv', - 'title' : '最后的魔法大战 后篇' + 'title': '最后的魔法大战 后篇' }, } ] @@ -360,7 +325,7 @@ class BiliBiliBangumiIE(InfoExtractor): def _real_extract(self, url): headers = { 'Referer': url - } + } bangumi_id = self._match_id(url) bangumi_info = self._download_json( 'https://api.bilibili.com/pgc/view/web/season?season_id=%s' % (bangumi_id,), @@ -368,9 +333,8 @@ class BiliBiliBangumiIE(InfoExtractor): 'Downloading bangumi info', 'Downloading bangumi failed')['result'] title = bangumi_info['season_title'] - description = bangumi_info['evaluate'] - view_count = bangumi_info['stat']['views'] - episodes = bangumi_info['episodes'] + description = bangumi_info.get('evaluate') + episodes = bangumi_info.get('episodes') self.to_screen('%s: episode count: %d' % (bangumi_id, len(episodes))) entries = [] for idx, episode in enumerate(episodes, start=1): @@ -383,7 +347,7 @@ class BiliBiliBangumiIE(InfoExtractor): # some video is splited to many fragments, here is this fragments formats = [{ 'url': durl['url'], - 'filesize': int_or_none(durl['size']), + 'filesize': int_or_none(durl.get('size')), }] for backup_url in durl.get('backup_url', []): formats.append({ @@ -399,12 +363,14 @@ class BiliBiliBangumiIE(InfoExtractor): self._sort_formats(formats) entries.append({ - 'id': '%s_%d_%d' % (bangumi_id,idx, fragment_idx), + 'id': '%s_%d_%d' % (bangumi_id, idx, fragment_idx), 'duration': float_or_none(durl.get('length'), 1000), 'formats': formats, - 'title': episode['long_title'] + 'title': episode.get('long_title', '') }) return self.playlist_result(entries, bangumi_id, title, description) + + class BiliBiliBangumiEpisodeIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)bilibili.com/bangumi/play/[eE][pP](?P<id>\d+)' @@ -421,37 +387,37 @@ class BiliBiliBangumiEpisodeIE(InfoExtractor): 'info_dict': { 'id': '3814_1_1', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, - },{ + }, { 'info_dict': { 'id': '3814_1_2', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, - },{ + }, { 'info_dict': { 'id': '3814_1_3', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, - },{ + }, { 'info_dict': { 'id': '3814_1_4', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, - },{ + }, { 'info_dict': { 'id': '3814_1_5', 'ext': 'flv', - 'title' : '最后的魔法大战 前篇' + 'title': '最后的魔法大战 前篇' }, }, { 'info_dict': { 'id': '3814_2_1', 'ext': 'flv', - 'title' : '最后的魔法大战 后篇' + 'title': '最后的魔法大战 后篇' }, } ] @@ -459,10 +425,12 @@ class BiliBiliBangumiEpisodeIE(InfoExtractor): def _real_extract(self, url): ep_id = self._match_id(url) - bangumi_id = self._download_json('https://api.bilibili.com/pgc/view/web/season?ep_id=%s'%(ep_id, ), ep_id, 'Downloading bangumi info')['result']['media_id'] + bangumi_id = self._download_json('https://api.bilibili.com/pgc/view/web/season?ep_id=%s' % (ep_id, ), ep_id, 'Downloading bangumi info')['result']['media_id'] return self.url_result( 'https://www.bilibili.com/bangumi/media/md%s' % bangumi_id, ie=BiliBiliBangumiIE.ie_key(), video_id=ep_id) + + class BilibiliAudioBaseIE(InfoExtractor): def _call_api(self, path, sid, query=None): if not query: From 8894313d60fd5f665f8a90efb550e16666de8731 Mon Sep 17 00:00:00 2001 From: zwb <zengwenbin@skyguard.com.cn> Date: Mon, 18 May 2020 11:32:35 +0800 Subject: [PATCH 10/11] [BiliBili] fix duplicated ie name --- youtube_dl/extractor/bilibili.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 25967ed99..67403e012 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -373,9 +373,6 @@ class BiliBiliBangumiIE(InfoExtractor): class BiliBiliBangumiEpisodeIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)bilibili.com/bangumi/play/[eE][pP](?P<id>\d+)' - - IE_NAME = 'bangumi.bilibili.com' - IE_DESC = 'BiliBili番剧' _TESTS = [{ 'url': 'https://www.bilibili.com/bangumi/play/ep86635', 'info_dict': { From b734153d6654f493e0e53e10446ac8e580e9eb20 Mon Sep 17 00:00:00 2001 From: zwb <zengwenbin@skyguard.com.cn> Date: Wed, 2 Sep 2020 18:34:25 +0800 Subject: [PATCH 11/11] [Bilibili] add video title as part of file name --- youtube_dl/extractor/bilibili.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dl/extractor/bilibili.py index 67403e012..57433b12d 100644 --- a/youtube_dl/extractor/bilibili.py +++ b/youtube_dl/extractor/bilibili.py @@ -189,9 +189,12 @@ class BiliBiliIE(InfoExtractor): continue self._report_error(video_info) part_title = part_info['title'] - if len(part_list) == 1: + if len(part_list) == 1 or len(part_title) == 0: # if video only got one part, use video title instead of part title part_title = title + else: + # some video not name part title properly, so add video title in front + part_title = title + "_" + part_title for idx, durl in enumerate(video_info['durl'], start=1): # some video is splited to many fragments, here is this fragments formats = [{