From 4e3c76a644fe66eba7428eaf6f93db4799e7a968 Mon Sep 17 00:00:00 2001 From: SlyAimer <2289782085@qq.com> Date: Wed, 9 Apr 2025 11:25:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor(cloud=5Fmusic):=20=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/cloud_music.py | 116 +++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/src/plugins/cloud_music.py b/src/plugins/cloud_music.py index 385483c..9841c1d 100644 --- a/src/plugins/cloud_music.py +++ b/src/plugins/cloud_music.py @@ -4,75 +4,77 @@ import time from pathlib import Path from nonebot import on_command from nonebot.rule import to_me -from nonebot.adapters.qq import MessageSegment,MessageEvent +from nonebot.adapters.qq import MessageSegment,MessageEvent from src.clover_music.cloud_music.cloud_music import * from src.clover_image.delete_file import delete_file +from nonebot import logger unikey_cache = {'unikey': None, 'expires': 0} -music = on_command("点歌", rule=to_me(), priority=10,block=False) -@music.handle() -async def handle_function(msg: MessageEvent): - qr_path = "" - keyword = msg.get_plaintext().replace("/点歌", "").strip(" ") - - if keyword == "": - await music.finish("\n请输入“/点歌+歌曲名”喔🎶") - - #获取登录信息 - session = requests.session() +music = on_command("点歌", rule=to_me(), priority=10, block=False) +async def login(session): + """处理登录逻辑""" if not os.path.exists('cloud_music_cookies.cookie'): with open('cloud_music_cookies.cookie', 'wb') as f: pickle.dump(session.cookies, f) - # 读取 cookie session.cookies = pickle.load(open('cloud_music_cookies.cookie', 'rb')) - session, status,user_id = await netease_cloud_music_is_login(session) - if not status: - await music.send("登录失效，请联系管理员进行登录") - # 检查缓存是否有效（二维码有效期5分钟) - if unikey_cache['unikey'] and time.time() < unikey_cache['expires']: - unikey = unikey_cache['unikey'] - else: - # 获取新 unikey 并设置过期时间 - unikey = await get_qr_key(session) - unikey_cache.update({ - 'unikey': unikey, - 'expires': time.time() + 300 # 大约是5分钟有效期 失效时间会有几秒误差 - }) - qr_path = await create_qr_code(unikey) - """是否要发送到QQ上面登录 """ - # await clover_music.send(MessageSegment.file_image(Path(path))) - """是否要发送到QQ上面登录 """ - for _ in range(60): # 限制最大等待时间5分钟（300秒/5秒间隔） - code = await check_qr_code(unikey, session) - if code in (803,): break # 成功状态 - if code not in (801, 802): - print('二维码失效' if code == 800 else f'异常状态码：{code}') - break - await asyncio.sleep(5) - with open('cloud_music_cookies.cookie', 'wb') as f: - pickle.dump(session.cookies, f) + session, status, user_id = await netease_cloud_music_is_login(session) + return session, status, user_id + +async def handle_qr_login(session): + """处理二维码登录逻辑""" + if unikey_cache['unikey'] and time.time() < unikey_cache['expires']: + unikey = unikey_cache['unikey'] else: - #搜索歌曲 - song_id,song_name,singer,song_url = await netease_music_search(keyword,session) + unikey = await get_qr_key(session) + unikey_cache.update({ + 'unikey': unikey, + 'expires': time.time() + 300 + }) + qr_path = await create_qr_code(unikey) + """是否要发送到QQ上面登录 """ + # await clover_music.send(MessageSegment.file_image(Path(qr_path))) + """是否要发送到QQ上面登录 """ + for _ in range(60): + code = await check_qr_code(unikey, session) + if code in (803,): break + if code not in (801, 802): + logger.error('二维码失效' if code == 800 else f'异常状态码：{code}') + break + await asyncio.sleep(5) + with open('cloud_music_cookies.cookie', 'wb') as f: + pickle.dump(session.cookies, f) + +@music.handle() +async def handle_function(msg: MessageEvent): + try: + keyword = msg.get_plaintext().replace("/点歌", "").strip(" ") + if keyword == "": + await music.finish("\n请输入“/点歌+歌曲名”喔🎶") + + session = requests.session() + session, status, user_id = await login(session) + if not status: + await music.send("登录失效，请联系管理员进行登录") + await handle_qr_login(session) + + song_id, song_name, singer, song_url = await netease_music_search(keyword, session) song_name = str(song_name).replace(".", "·").replace("/", "、") if song_id is None: await music.finish("\n没有找到歌曲，或检索到的歌曲均为付费喔qwq\n这绝对不是我的错，绝对不是！") + + await music.send(MessageSegment.text(f" 来源：网易云音乐\n歌曲：{song_name} - {singer}\n请稍等喔🎵")) + output_silk_path = await netease_music_download(song_id, song_name, singer, session) + + if output_silk_path == -1: + await music.send("歌曲音频获取失败：登录信息失效。") + elif output_silk_path is None: + await music.send("歌曲音频获取失败了Σヽ(ﾟД ﾟ; )ﾉ，请重试。") else: - await music.send(MessageSegment.text(f" 来源：网易云音乐\n歌曲：{song_name} - {singer}\n请稍等喔🎵")) - #返回转换后的歌曲路径 - output_silk_path = await netease_music_download(song_id, song_name, singer,session) - - if output_silk_path == -1: - await music.send("歌曲音频获取失败：登录信息失效。") - elif output_silk_path is None: - await music.send("歌曲音频获取失败了Σヽ(ﾟД ﾟ; )ﾉ，请重试。") - else: - await music.send(MessageSegment.file_audio(Path(output_silk_path))) - #删除临时文件 - await delete_file(output_silk_path) - await music.finish() - - - + await music.send(MessageSegment.file_audio(Path(output_silk_path))) + await delete_file(output_silk_path) + await music.finish() + except Exception as e: + logger.error(f"处理点歌请求时发生错误: {e}") + await music.finish("处理点歌请求时发生错误，请稍后重试。这绝对不是我的错，绝对不是！") \ No newline at end of file