diff --git a/workflow/bilibili.py b/workflow/bilibili.py index 758efee..ea946f0 100644 --- a/workflow/bilibili.py +++ b/workflow/bilibili.py @@ -69,15 +69,12 @@ class Bilibili: if not isinstance(parts, list): parts = [parts] - def log_status(video_part, chunks_index: int, chunks_num: int): - LOGGER.debug("Uploading >{}< @ {:.2f}%".format(video_part.path, 100.0 * chunks_index / chunks_num)) - IS_UPLOADING.set() for part in parts: if isinstance(part, str): part = VideoPart(part) LOGGER.info("Start Uploading >{}<".format(part.path)) - status = core.upload_video_part(self.access_token, self.session_id, self.user_id, part, max_retry, cb=log_status) + status = core.upload_video_part(self.access_token, self.session_id, self.user_id, part, max_retry) if status: # 上传完毕 LOGGER.info("Upload >{}< Finished;【{}】".format(part.path, part.server_file_name)) diff --git a/workflow/bilibiliupload/core.py b/workflow/bilibiliupload/core.py index 3e78f53..4633b6f 100644 --- a/workflow/bilibiliupload/core.py +++ b/workflow/bilibiliupload/core.py @@ -248,7 +248,7 @@ def upload_chunk(upload_url, server_file_name, local_file_name, chunk_data, chun return False -def upload_video_part(access_token, sid, mid, video_part: VideoPart, max_retry=5, cb=None): +def upload_video_part(access_token, sid, mid, video_part: VideoPart, max_retry=5): """ upload a video file. Args: @@ -297,7 +297,6 @@ def upload_video_part(access_token, sid, mid, video_part: VideoPart, max_retry=5 with open(local_file_name, 'rb') as f: for chunk_id in range(0, chunk_total_num): chunk_data = f.read(CHUNK_SIZE) - cb(video_part, chunk_id, chunk_total_num) status = Retry(max_retry=max_retry, success_return_value=True).run( upload_chunk, upload_url,