From 07e4d812aee469395c60e2fdd80334125925f2f6 Mon Sep 17 00:00:00 2001 From: yzqzss Date: Thu, 27 Jul 2023 02:57:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD&?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B0=91=E6=95=B0=E5=8F=AA=E6=9C=89=20durl?= =?UTF-8?q?=20=E7=9A=84=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 如 BV1Qs411Z7yE --- biliarchiver/_biliarchiver_upload_bvid.py | 2 +- biliarchiver/archive_bvid.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/biliarchiver/_biliarchiver_upload_bvid.py b/biliarchiver/_biliarchiver_upload_bvid.py index 9c383ec..68fda75 100644 --- a/biliarchiver/_biliarchiver_upload_bvid.py +++ b/biliarchiver/_biliarchiver_upload_bvid.py @@ -90,7 +90,7 @@ def _upload_bvid(bvid: str, *, update_existing: bool = False, collection: str): continue filedict[filename] = file - assert f'{file_basename}.mp4' in filedict + assert (f'{file_basename}.mp4' in filedict) or (f'{file_basename}.flv' in filedict) # IA 去重 for file_in_item in item.files: diff --git a/biliarchiver/archive_bvid.py b/biliarchiver/archive_bvid.py index 01a91e6..99a743c 100644 --- a/biliarchiver/archive_bvid.py +++ b/biliarchiver/archive_bvid.py @@ -43,7 +43,7 @@ async def new_get_video_info(client: httpx.AsyncClient, url: str): 理由： - API 目前只支持一般的 AV/BV 视频，可以预防我们不小心下到了番剧/影视剧之类的版权内容 - 如果缺 url 对应的分P，bilix 那边会报 AssertionError(f"没有找到分P: p{selected_page_num}，请检查输入") - - 对于一些老视频， _get_video_info_from_html() 只会返回烦人且不稳定的 durl 资源。而 API 只会请求 dash 资源。 + - 对于一些老视频， _get_video_info_from_html() 经常返回烦人且不稳定的 durl 资源。而 API 会更多请求到 dash 资源（虽然仍有少数视频只有 durl 资源）。 """ # print("using api") return await api._get_video_info_from_api(client, url) @@ -183,7 +183,7 @@ async def archive_bvid(d: DownloaderBilibili, bvid: str, *, logined: bool=False, await asyncio.gather(cor4) - assert os.path.exists(video_basepath / f'{file_basename}.mp4') + assert os.path.exists(video_basepath / f'{file_basename}.mp4') or os.path.exists(video_basepath / f'{file_basename}.flv') # 还原为了自定义文件名而做的覆盖 video_info.pages[video_info.p].p_name = old_p_name