mirror of
https://github.com/ClovertaTheTrilobita/SanYeCao-Nonebot.git
synced 2026-04-01 22:04:51 +00:00
fix(cloud_music): 修复创建全局二维码对象导致第二次及其之后生成错误的二维码
1. 增加unikey缓存机制避免频繁生成二维码 2. 优化登录状态检查流程
This commit is contained in:
SlyAimer
parent
79293219bc
commit
e22bb909d5
2 changed files with 56 additions and 48 deletions
|
|
@ -62,7 +62,7 @@ def get_music(id):
|
|||
"""
|
||||
save_path = os.getcwd()+'/src/clover_music/netease_music'
|
||||
os.makedirs(save_path, exist_ok=True)
|
||||
qrcode_path = os.getcwd()+'/src/clover_music'
|
||||
qrcode_path = os.getcwd()+'/src/clover_music/'
|
||||
|
||||
|
||||
# 判断cookie是否有效
|
||||
|
|
@ -112,8 +112,6 @@ async def get_qr_key(session):
|
|||
else:
|
||||
return None
|
||||
|
||||
# 创建 QRCode 对象
|
||||
qr = qrcode.QRCode( version=1, error_correction=qrcode.constants.ERROR_CORRECT_L, box_size=10, border=4, )
|
||||
# 生成二维码
|
||||
async def create_qr_code(unikey):
|
||||
"""
|
||||
|
|
@ -124,14 +122,12 @@ async def create_qr_code(unikey):
|
|||
Returns:
|
||||
|
||||
"""
|
||||
# 添加数据
|
||||
png_url = f"http://music.163.com/login?codekey={unikey}"
|
||||
qr.add_data(png_url)
|
||||
img = qr.make_image()
|
||||
a = BytesIO()
|
||||
img.save(a, 'png')
|
||||
img.save(os.path.join(qrcode_path, 'qrcode.png'))
|
||||
return qrcode_path + '/qrcode.png'
|
||||
qr = qrcode.QRCode(version=1,error_correction=qrcode.constants.ERROR_CORRECT_L,box_size=10,border=4)
|
||||
qr.add_data(f"https://music.163.com/login?codekey={unikey}")
|
||||
#保存二维码
|
||||
img_path = os.path.join(qrcode_path, 'qrcode.png')
|
||||
qr.make_image().save(img_path)
|
||||
return img_path
|
||||
|
||||
# 检查二维码状态是否被扫描
|
||||
async def check_qr_code(unikey,session):
|
||||
|
|
|
|||
|
|
@ -8,15 +8,18 @@ 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
|
||||
|
||||
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()
|
||||
if not os.path.exists('cloud_music_cookies.cookie'):
|
||||
with open('cloud_music_cookies.cookie', 'wb') as f:
|
||||
|
|
@ -26,47 +29,56 @@ async def handle_function(msg: MessageEvent):
|
|||
session, status,user_id = await netease_cloud_music_is_login(session)
|
||||
if not status:
|
||||
await music.send("登录失效，请联系管理员进行登录")
|
||||
unikey = await get_qr_key(session)
|
||||
path = await create_qr_code(unikey)
|
||||
|
||||
"""是否要发送到QQ上面登录 """
|
||||
# await clover_music.send(MessageSegment.file_image(Path(path)))
|
||||
"""是否要发送到QQ上面登录 """
|
||||
while True:
|
||||
code = await check_qr_code(unikey, session)
|
||||
if '801' in str(code):
|
||||
print('二维码未失效，请扫码！')
|
||||
elif '802' in str(code):
|
||||
print('已扫码，请确认！')
|
||||
elif '803' in str(code):
|
||||
print('已确认，登入成功！')
|
||||
break
|
||||
else:
|
||||
break
|
||||
await asyncio.sleep(2)
|
||||
current_time = time.time()
|
||||
# 检查缓存是否有效（二维码有效期5分钟)
|
||||
if unikey_cache['unikey'] and current_time < unikey_cache['expires']:
|
||||
unikey = unikey_cache['unikey']
|
||||
else:
|
||||
# 获取新 unikey 并设置过期时间
|
||||
unikey = await get_qr_key(session)
|
||||
unikey_cache.update({
|
||||
'unikey': unikey,
|
||||
'expires': current_time + 300 # 大约是5分钟有效期 失效时间会有几秒误差
|
||||
})
|
||||
qr_path = await create_qr_code(unikey)
|
||||
"""是否要发送到QQ上面登录 """
|
||||
# await clover_music.send(MessageSegment.file_image(Path(path)))
|
||||
"""是否要发送到QQ上面登录 """
|
||||
while True:
|
||||
code = await check_qr_code(unikey, session)
|
||||
if '801' in str(code):
|
||||
print('二维码未失效，请扫码！')
|
||||
elif '802' in str(code):
|
||||
print('已扫码，请确认！')
|
||||
elif '803' in str(code):
|
||||
print('已确认，登入成功！')
|
||||
break
|
||||
else:
|
||||
print('二维码失效，请重获取！')
|
||||
break
|
||||
await asyncio.sleep(5)
|
||||
with open('cloud_music_cookies.cookie', 'wb') as f:
|
||||
pickle.dump(session.cookies, f)
|
||||
|
||||
#搜索歌曲
|
||||
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这绝对不是我的错，绝对不是！")
|
||||
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("歌曲音频获取失败了Σヽ(ﾟД ﾟ; )ﾉ，请重试。")
|
||||
#搜索歌曲
|
||||
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这绝对不是我的错，绝对不是！")
|
||||
else:
|
||||
await music.send(MessageSegment.file_audio(Path(output_silk_path)))
|
||||
await music.send(MessageSegment.text(f" 来源：网易云音乐\n歌曲：{song_name} - {singer}\n请稍等喔🎵"))
|
||||
#返回转换后的歌曲路径
|
||||
output_silk_path = await netease_music_download(song_id, song_name, singer,session)
|
||||
|
||||
#删除临时文件
|
||||
await delete_file(output_silk_path)
|
||||
await music.finish()
|
||||
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()
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue