R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change string format method

Browse Source
This commit is contained in:
lifegpc 2020-08-04 18:27:25 +08:00
parent fa547cfda8
commit 96cb93d771
1 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
youtube_dl/extractor/bilibili.py
View File

@ -151,7 +151,7 @@ class BiliBiliIE(InfoExtractor):
video_count = video_data['videos'] video_count = video_data['videos']
tags_info = self._download_json( tags_info = self._download_json(
f"https://api.bilibili.com/x/web-interface/view/detail/tag?aid={aid}", video_id, "https://api.bilibili.com/x/web-interface/view/detail/tag?aid=%s" % (aid), video_id,
'Geting video tags.', 'Unable to get Login/User Information.') 'Geting video tags.', 'Unable to get Login/User Information.')
if tags_info['code'] != 0: if tags_info['code'] != 0:
self._report_error(tags_info) self._report_error(tags_info)
@ -181,7 +181,7 @@ class BiliBiliIE(InfoExtractor):
'uploader': uploader_data['name'], 'uploader': uploader_data['name'],
'uploader_id': uploader_data['mid'], 'uploader_id': uploader_data['mid'],
'duration': video_data['duration'], 'duration': video_data['duration'],
'webpage_url': f'https://www.bilibili.com/video/av{aid}', 'webpage_url': 'https://www.bilibili.com/video/av%s' % (aid),
'categories': [video_data['tname']], 'categories': [video_data['tname']],
'view_count': video_data['stat']['viewseo'], 'view_count': video_data['stat']['viewseo'],
'comment_count': video_data['stat']['reply'], 'comment_count': video_data['stat']['reply'],
@ -198,11 +198,11 @@ class BiliBiliIE(InfoExtractor):
for part_info in video_data['pages']: for part_info in video_data['pages']:
if part is not None and part_info["page"] != part: if part is not None and part_info["page"] != part:
continue continue
uri = f'https://www.bilibili.com/video/av{aid}?p={part_info["page"]}' uri = 'https://www.bilibili.com/video/av%s?p=%s' % (aid, part_info["page"])
if first: if first:
first = False first = False
else: else:
webpage = self._download_webpage(uri, f"{video_id} Part{part_info['page']}") webpage = self._download_webpage(uri, "%s Part%s" % (video_id, part_info['page']))
headers = {'referer': uri} headers = {'referer': uri}
if new_api: if new_api:
play_info = re.search(r"window\.__playinfo__=([^<]+)", webpage, re.I) # Get video links from webpage. play_info = re.search(r"window\.__playinfo__=([^<]+)", webpage, re.I) # Get video links from webpage.
@ -214,8 +214,8 @@ class BiliBiliIE(InfoExtractor):
else: else:
new_api = False new_api = False
play_info = self._download_json( play_info = self._download_json(
f"https://api.bilibili.com/x/player/playurl?cid={part_info['cid']}&qn=120&otype=json&bvid={bvid}&fnver=0&fnval=16", "https://api.bilibili.com/x/player/playurl?cid=%s&qn=120&otype=json&bvid=%s&fnver=0&fnval=16" % (part_info['cid'], bvid),
f"{video_id} Part{part_info['page']}", "%s Part%s" % (video_id, part_info['page']),
"Geting video links.", "Geting video links.",
"Unable to get video links.") "Unable to get video links.")
if play_info['code'] != 0: if play_info['code'] != 0:
@ -223,8 +223,8 @@ class BiliBiliIE(InfoExtractor):
play_info = play_info['data'] play_info = play_info['data']
else: else:
play_info = self._download_json( play_info = self._download_json(
f"https://api.bilibili.com/x/player/playurl?cid={part_info['cid']}&qn=120&otype=json&bvid={bvid}&fnver=0&fnval=16", "https://api.bilibili.com/x/player/playurl?cid=%s&qn=120&otype=json&bvid=%s&fnver=0&fnval=16" % (part_info['cid'], bvid),
f"{video_id} Part{part_info['page']}", "%s Part%s" % (video_id, part_info['page']),
"Geting video links.", "Geting video links.",
"Unable to get video links.") "Unable to get video links.")
if play_info['code'] != 0: if play_info['code'] != 0:
@ -233,14 +233,14 @@ class BiliBiliIE(InfoExtractor):
if 'durl' in play_info: # Stream for flv player if 'durl' in play_info: # Stream for flv player
if video_count > 1 and len(play_info['durl']) > 1 and part is None: if video_count > 1 and len(play_info['durl']) > 1 and part is None:
self.report_warning( self.report_warning(
f"There are multiply FLV files in this part. Please input \"{uri}\" to extract it.", "There are multiply FLV files in this part. Please input \"%s\" to extract it." % (uri),
f"{video_id} Part{part_info['page']}") "%s Part%s" % (video_id, part_info['page']))
continue continue
is_durl = True is_durl = True
if video_count > 1: if video_count > 1:
info.update({ info.update({
'title': f"{info['title']} - {part_info['part']}", 'title': "%s - %s" % (info['title'], part_info['part']),
'id': f"{video_id} P{part_info['page']}" 'id': "%s P%s" % (video_id, part_info['page'])
}) })
video_quality = play_info['quality'] video_quality = play_info['quality']
accept_video_quality_desc = play_info['accept_description'] accept_video_quality_desc = play_info['accept_description']
@ -256,11 +256,11 @@ class BiliBiliIE(InfoExtractor):
for video_q in accept_video_quality: for video_q in accept_video_quality:
if video_q not in video_formats: if video_q not in video_formats:
if new_api: if new_api:
self._set_cookie(domain=".bilibili.com", name="CURRENT_QUALITY", value=f"{video_q}") self._set_cookie(domain=".bilibili.com", name="CURRENT_QUALITY", value=str(video_q))
webpage = self._download_webpage(uri, webpage = self._download_webpage(uri,
f"{video_id} Part{part_info['page']}", "%s Part%s" % (video_id, part_info['page']),
f"Geting video links for format id : {video_q}.", "Geting video links for format id : %s." % (video_q),
f"Unable to get video links for format id : {video_q}.") "Unable to get video links for format id : %s." % (video_q))
play_info = re.search(r"window\.__playinfo__=([^<]+)", webpage, re.I) # Get video links from webpage. play_info = re.search(r"window\.__playinfo__=([^<]+)", webpage, re.I) # Get video links from webpage.
if play_info is not None: if play_info is not None:
play_info = json.loads(play_info.groups()[0]) play_info = json.loads(play_info.groups()[0])
@ -270,17 +270,19 @@ class BiliBiliIE(InfoExtractor):
else: else:
new_api = False new_api = False
play_info = self._download_json( play_info = self._download_json(
f"https://api.bilibili.com/x/player/playurl?cid={part_info['cid']}&qn={video_q}&otype=json&bvid={bvid}&fnver=0&fnval=16", f"{video_id} Part{part_info['page']}", "https://api.bilibili.com/x/player/playurl?cid=%s&qn=%s&otype=json&bvid=%s&fnver=0&fnval=16" % (part_info['cid'], video_q, bvid),
f"Geting video links for format id : {video_q}.", "%s Part%s" % (video_id, part_info['page']),
f"Unable to get video links for format id : {video_q}.") "Geting video links for format id : %s." % (video_q),
"Unable to get video links for format id : %s." % (video_q))
if play_info['code'] != 0: if play_info['code'] != 0:
self._report_error(play_info) self._report_error(play_info)
play_info = play_info['data'] play_info = play_info['data']
else: else:
play_info = self._download_json( play_info = self._download_json(
f"https://api.bilibili.com/x/player/playurl?cid={part_info['cid']}&qn={video_q}&otype=json&bvid={bvid}&fnver=0&fnval=16", f"{video_id} Part{part_info['page']}", "https://api.bilibili.com/x/player/playurl?cid=%s&qn=%s&otype=json&bvid=%s&fnver=0&fnval=16" % (part_info['cid'], video_q, bvid),
f"Geting video links for format id : {video_q}.", "%s Part%s" % (video_id, part_info['page']),
f"Unable to get video links for format id : {video_q}.") "Geting video links for format id : %s." % (video_q),
"Unable to get video links for format id : %s." % (video_q))
if play_info['code'] != 0: if play_info['code'] != 0:
self._report_error(play_info) self._report_error(play_info)
play_info = play_info['data'] play_info = play_info['data']
@ -291,7 +293,7 @@ class BiliBiliIE(InfoExtractor):
for i in range(max(durl_length)): for i in range(max(durl_length)):
entry = {} entry = {}
entry.update(info) entry.update(info)
entry.update({'id': f"{info['id']} Part{i+1}"}) entry.update({'id': "%s Part%s" % (info['id'], i + 1)})
formats_output = [] formats_output = []
for video_q in accept_video_quality: for video_q in accept_video_quality:
durl = video_formats[video_q] durl = video_formats[video_q]
@ -299,7 +301,7 @@ class BiliBiliIE(InfoExtractor):
video_format = durl[i] video_format = durl[i]
formats_output.append({ formats_output.append({
"url": video_format['url'], "url": video_format['url'],
"format_id": f"{video_q}", "format_id": str(video_q),
"ext": "flv", "ext": "flv",
"http_headers": headers, "http_headers": headers,
"filesize": video_format['size'] "filesize": video_format['size']
@ -338,11 +340,11 @@ class BiliBiliIE(InfoExtractor):
elif is_vip > 0: elif is_vip > 0:
bs = True bs = True
if new_api: if new_api:
self._set_cookie(domain=".bilibili.com", name="CURRENT_QUALITY", value=f"{video_q}") self._set_cookie(domain=".bilibili.com", name="CURRENT_QUALITY", value=str(video_q))
webpage = self._download_webpage(uri, webpage = self._download_webpage(uri,
f"{video_id} Part{part_info['page']}", "%s Part%s" % (video_id, part_info['page']),
f"Geting video links for format id : {video_q}.", "Geting video links for format id : %s." % (video_q),
f"Unable to get video links for format id : {video_q}.") "Unable to get video links for format id : %s." % (video_q))
play_info = re.search(r"window\.__playinfo__=([^<]+)", webpage, re.I) # Get video links from webpage. play_info = re.search(r"window\.__playinfo__=([^<]+)", webpage, re.I) # Get video links from webpage.
if play_info is not None: if play_info is not None:
play_info = json.loads(play_info.groups()[0]) play_info = json.loads(play_info.groups()[0])
@ -352,18 +354,19 @@ class BiliBiliIE(InfoExtractor):
else: else:
new_api = False new_api = False
play_info = self._download_json( play_info = self._download_json(
f"https://api.bilibili.com/x/player/playurl?cid={part_info['cid']}&qn={video_q}&otype=json&bvid={bvid}&fnver=0&fnval=16", f"{video_id} Part{part_info['page']}", "https://api.bilibili.com/x/player/playurl?cid=%s&qn=%s&otype=json&bvid=%s&fnver=0&fnval=16" % (part_info['cid'], video_q, bvid),
f"Geting video links for format id : {video_q}.", "%s Part%s" % (video_id, part_info['page']),
f"Unable to get video links for format id : {video_q}.") "Geting video links for format id : %s." % (video_q),
"Unable to get video links for format id : %s." % (video_q))
if play_info['code'] != 0: if play_info['code'] != 0:
self._report_error(play_info) self._report_error(play_info)
play_info = play_info['data'] play_info = play_info['data']
else: else:
play_info = self._download_json( play_info = self._download_json(
f"https://api.bilibili.com/x/player/playurl?cid={part_info['cid']}&qn={video_q}&otype=json&bvid={bvid}&fnver=0&fnval=16", "https://api.bilibili.com/x/player/playurl?cid=%s&qn=%s&otype=json&bvid=%s&fnver=0&fnval=16" % (part_info['cid'], video_q, bvid),
f"{video_id} Part{part_info['page']}", "%s Part%s" % (video_id, part_info['page']),
f"Geting video links for format id : {video_q}.", "Geting video links for format id : %s." % (video_q),
f"Unable to get video links for format id : {video_q}.") "Unable to get video links for format id : %s." % (video_q))
if play_info['code'] != 0: if play_info['code'] != 0:
self._report_error(play_info) self._report_error(play_info)
play_info = play_info['data'] play_info = play_info['data']
@ -388,7 +391,7 @@ class BiliBiliIE(InfoExtractor):
{"url": video_format['base_url'], {"url": video_format['base_url'],
"ext": "mp4", "ext": "mp4",
"format_note": video_desc_dict[video_format['id']], "format_note": video_desc_dict[video_format['id']],
"format_id": f"{i}", "format_id": str(i),
"vcodec": video_format['codecs'], "vcodec": video_format['codecs'],
"fps": self._getfps(video_format['frame_rate']), "fps": self._getfps(video_format['frame_rate']),
"width": video_format['width'], "width": video_format['width'],
@ -404,15 +407,15 @@ class BiliBiliIE(InfoExtractor):
audio_format = video_formats[audio_quality] audio_format = video_formats[audio_quality]
formats_output.append({ formats_output.append({
"url": audio_format["base_url"], "url": audio_format["base_url"],
"format_id": f"{audio_format['id']}", "format_id": str(audio_format['id']),
"ext": "mp4", "ext": "mp4",
"acodec": audio_format['codecs'], "acodec": audio_format['codecs'],
"http_headers": headers "http_headers": headers
}) })
entry.update({"formats": formats_output}) entry.update({"formats": formats_output})
if video_count > 1: if video_count > 1:
entry.update({"title": f"{info['title']} - {part_info['part']}"}) entry.update({"title": "%s - %s" % (info['title'], part_info['part'])})
entry.update({"id": f"{video_id} P{part_info['page']}"}) entry.update({"id": "%s P%s" % (video_id, part_info['page'])})
entries.append(entry) entries.append(entry)
if video_count > 1: if video_count > 1: