mirror of
https://github.com/ClovertaTheTrilobita/SanYeCao-Nonebot.git
synced 2026-04-01 22:04:51 +00:00
Merge pull request #9 from Miyokiss/master
fix(jm_comic): 修复压缩文件路径和二维码下载链接
This commit is contained in:
commit
c3b8ea8160
2 changed files with 4 additions and 5 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -35,3 +35,4 @@ Elysia
|
||||||
runtime
|
runtime
|
||||||
/src/configs/tts
|
/src/configs/tts
|
||||||
bot.pid
|
bot.pid
|
||||||
|
.vscode
|
||||||
|
|
|
||||||
|
|
@ -45,9 +45,9 @@ async def jm_qr(album_id: str| None):
|
||||||
album_detail,downloader = await download_jm(album_id = album_id,file_name = file_name,receiver_email = None)
|
album_detail,downloader = await download_jm(album_id = album_id,file_name = file_name,receiver_email = None)
|
||||||
# 创建变量
|
# 创建变量
|
||||||
folder_path = f"{jm_path}{file_name}"
|
folder_path = f"{jm_path}{file_name}"
|
||||||
zip_path = f"{jm_path}{file_name}{album_detail.title}.zip"
|
zip_path = f"{folder_path}{album_detail.title}.zip"
|
||||||
# 压缩文件
|
# 压缩文件
|
||||||
zip_status = await folder_zip(file_name,zip_path)
|
zip_status = await folder_zip(folder_path,zip_path)
|
||||||
if not zip_status:
|
if not zip_status:
|
||||||
await delete_folder(folder_path)
|
await delete_folder(folder_path)
|
||||||
return "压缩文件失败"
|
return "压缩文件失败"
|
||||||
|
|
@ -58,14 +58,12 @@ async def jm_qr(album_id: str| None):
|
||||||
file_code=send_status["code"]
|
file_code=send_status["code"]
|
||||||
# 删除文件
|
# 删除文件
|
||||||
await delete_folder(folder_path)
|
await delete_folder(folder_path)
|
||||||
await delete_file(zip_path)
|
|
||||||
return {
|
return {
|
||||||
"msg":"获取成功~!码上下载!~",
|
"msg":"获取成功~!码上下载!~",
|
||||||
"qr_code": f"{qrserver_url}?size={qrserver_size}&data={anonfile_download_url}{file_code}"
|
"qr_code": f"{qrserver_url}?size={qrserver_size}&data={anonfile_download_url}{file_code}"
|
||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
await delete_folder(folder_path)
|
await delete_folder(folder_path)
|
||||||
await delete_file(zip_path)
|
|
||||||
return {
|
return {
|
||||||
"msg":"发送失败,请重试!"
|
"msg":"发送失败,请重试!"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue