diff --git a/src/plugins/ncm/data_source.py b/src/plugins/ncm/data_source.py index 5377a50..cf611ce 100644 --- a/src/plugins/ncm/data_source.py +++ b/src/plugins/ncm/data_source.py @@ -327,11 +327,9 @@ async def download(self, ids: list, check=False, lid=0, is_zip=False): # 下载 music.update(config, Q["id"] == nid) else: music.insert(config) - async with httpx.AsyncClient() as client: # 下载歌曲 - async with client.stream("GET", url=url) as r: - async with async_open(file, "wb") as out_file: - async for chunk in r.aiter_bytes(): - await out_file.write(chunk) + async with httpx.AsyncClient() as client, client.stream("GET", url=url) as r, async_open(file, "wb") as out_file: + async for chunk in r.aiter_bytes(): + await out_file.write(chunk) logger.debug(f"Download:{filename}") if is_zip: await self.get_zip(lid=lid, filenames=filenames) diff --git a/src/plugins/nonebot_plugin_charpic/data_source.py b/src/plugins/nonebot_plugin_charpic/data_source.py index 2e9a097..3420bca 100644 --- a/src/plugins/nonebot_plugin_charpic/data_source.py +++ b/src/plugins/nonebot_plugin_charpic/data_source.py @@ -82,7 +82,6 @@ async def get_char_frame(text: str, w: int, h: int, font_): async def get_img(img_url: str): if not img_url: return - async with aiohttp.ClientSession() as session: - async with session.get(img_url) as resp: - result = await resp.read() + async with aiohttp.ClientSession() as session, session.get(img_url) as resp: + result = await resp.read() return Image.open(io.BytesIO(result)) if result else None diff --git a/src/plugins/nonebot_plugin_githubcard/data_source.py b/src/plugins/nonebot_plugin_githubcard/data_source.py index 0783a15..1890add 100644 --- a/src/plugins/nonebot_plugin_githubcard/data_source.py +++ b/src/plugins/nonebot_plugin_githubcard/data_source.py @@ -24,10 +24,9 @@ async def get_github_reposity_information(url: str) -> str: UserName, RepoName = url.replace("https://github.com/", "").split("/") except Exception: UserName, RepoName = url.replace("github.com/", "").split("/") - async with aiohttp.ClientSession() as session: - async with session.get(f"https://api.github.com/users/{UserName}", - headers=headers, - timeout=5) as response: - RawData = await response.json() - AvatarUrl = RawData["avatar_url"] - return f"https://image.thum.io/get/width/1280/crop/640/viewportWidth/1280/png/noanimate/https://socialify.git.ci/{UserName}/{RepoName}/image?description=1&font=Source%20Code%20Pro&forks=1&issues=1&language=1&name=1&owner=1&pattern=Charlie%20Brown&pulls=1&stargazers=1&theme=Dark&logo={AvatarUrl}" + async with aiohttp.ClientSession() as session, session.get(f"https://api.github.com/users/{UserName}", + headers=headers, + timeout=5) as response: + RawData = await response.json() + AvatarUrl = RawData["avatar_url"] + return f"https://image.thum.io/get/width/1280/crop/640/viewportWidth/1280/png/noanimate/https://socialify.git.ci/{UserName}/{RepoName}/image?description=1&font=Source%20Code%20Pro&forks=1&issues=1&language=1&name=1&owner=1&pattern=Charlie%20Brown&pulls=1&stargazers=1&theme=Dark&logo={AvatarUrl}"