refactor code

This commit is contained in:
hibiki
2021-07-30 21:21:51 +08:00
parent 2ad891aa1e
commit cc24822dca
165 changed files with 7815 additions and 8174 deletions
+24 -39
View File
@@ -1,14 +1,13 @@
from .data_source import get_anime
from nonebot import on_command
from nonebot.typing import T_State
from nonebot.adapters import Bot, Event
from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent
from utils.utils import get_message_imgs
from services.log import logger
from utils.utils import UserExistLimiter
__plugin_name__ = '识番'
__plugin_name__ = "识番"
__plugin_usage__ = r"""
以图识番
识番 [图片]
@@ -16,61 +15,47 @@ __plugin_usage__ = r"""
_ulmt = UserExistLimiter()
what_anime = on_command('识番', priority=5, block=True)
what_anime = on_command("识番", priority=5, block=True)
@what_anime.args_parser
async def _(bot: Bot, event: Event, state: T_State):
if str(event.get_message()) in ['取消', '算了']:
async def _(bot: Bot, event: MessageEvent, state: T_State):
if str(event.get_message()) in ["取消", "算了"]:
await what_anime.finish("已取消操作..", at_sender=True)
img_url = get_message_imgs(event.json())
if not img_url:
await what_anime.reject(prompt='图呢图呢图呢图呢GKD', at_sender=True)
state['img_url'] = img_url
await what_anime.reject(prompt="图呢图呢图呢图呢GKD", at_sender=True)
state["img_url"] = img_url
@what_anime.handle()
async def _(bot: Bot, event: Event, state: T_State):
if str(event.get_message()) in ['帮助']:
async def _(bot: Bot, event: MessageEvent, state: T_State):
if str(event.get_message()) in ["帮助"]:
await what_anime.finish(__plugin_usage__)
if _ulmt.check(event.user_id):
await what_anime.finish('您有识番任务正在进行,请稍等...', at_sender=True)
await what_anime.finish("您有识番任务正在进行,请稍等...", at_sender=True)
img_url = get_message_imgs(event.json())
if img_url:
state['img_url'] = img_url
state["img_url"] = img_url
@what_anime.got('img_url', prompt='虚空识番?来图来图GKD')
async def _(bot: Bot, event: Event, state: T_State):
img_url = state['img_url'][0]
@what_anime.got("img_url", prompt="虚空识番?来图来图GKD")
async def _(bot: Bot, event: MessageEvent, state: T_State):
img_url = state["img_url"][0]
_ulmt.set_True(event.user_id)
await what_anime.send('开始识别.....')
await what_anime.send("开始识别.....")
anime_data_report = await get_anime(img_url)
if anime_data_report:
await what_anime.send(anime_data_report, at_sender=True)
logger.info(f"USER {event.user_id} GROUP "f"{event.group_id if event.message_type != 'private' else 'private'}"
f" 识番 {img_url} --> {anime_data_report}")
logger.info(
f"USER {event.user_id} GROUP "
f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'}"
f" 识番 {img_url} --> {anime_data_report}"
)
else:
logger.info(f"USER {event.user_id} GROUP "
f"{event.group_id if event.message_type != 'private' else 'private'} 识番 {img_url} 未找到!!")
logger.info(
f"USER {event.user_id} GROUP "
f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'} 识番 {img_url} 未找到!!"
)
await what_anime.send(f"没有寻找到该番剧,果咩..", at_sender=True)
_ulmt.set_False(event.user_id)
# @whatanime.args_parser
# async def _(session: CommandSession):
# image_arg = session.current_arg_images
#
# if session.is_first_run:
# if image_arg:
# session.state['whatanime'] = image_arg[0]
# return
#
# if not image_arg:
# session.pause('没图说个J*,GKD!')
#
# session.state[session.current_key] = image_arg
#
# @on_natural_language(keywords={'whatanime', '识番', '識番'}, permission=get_bot().level)
# async def _(session: NLPSession):
# msg = session.msg
# return IntentCommand(90.0, 'whatanime', current_arg=msg or '')
+18 -15
View File
@@ -1,4 +1,3 @@
import time
from services.log import logger
from utils.langconv import *
@@ -8,43 +7,47 @@ from utils.user_agent import get_user_agent
async def get_anime(anime: str) -> str:
s_time = time.time()
url = 'https://api.trace.moe/search?anilistInfo&url={}'.format(anime)
url = "https://api.trace.moe/search?anilistInfo&url={}".format(anime)
logger.debug("[info]Now starting get the {}".format(url))
try:
async with aiohttp.ClientSession(headers=get_user_agent()) as session:
async with session.get(url, timeout=45) as response:
if response.status == 200:
anime_json = await response.json()
if not anime_json['error']:
if anime_json == 'Error reading imagenull':
if not anime_json["error"]:
if anime_json == "Error reading imagenull":
return "图像源错误,注意必须是静态图片哦"
repass = ""
# 拿到动漫 中文名
for anime in anime_json["result"][:5]:
synonyms = anime['anilist']['synonyms']
synonyms = anime["anilist"]["synonyms"]
for x in synonyms:
_count_ch = 0
for word in x:
if '\u4e00' <= word <= '\u9fff':
if "\u4e00" <= word <= "\u9fff":
_count_ch += 1
if _count_ch > 3:
anime_name = x
break
else:
anime_name = anime['anilist']['title']['native']
anime_name = anime["anilist"]["title"]["native"]
episode = anime["episode"]
from_ = int(anime["from"])
m, s = divmod(from_, 60)
similarity = anime["similarity"]
putline = "[ {} ][{}][{}:{}] 相似度:{:.2%}". \
format(Converter("zh-hans").convert(anime_name),
episode if episode else '?', m, s, similarity)
repass += putline + '\n'
return f'耗时 {int(time.time() - s_time)} 秒\n' + repass[:-1]
putline = "[ {} ][{}][{}:{}] 相似度:{:.2%}".format(
Converter("zh-hans").convert(anime_name),
episode if episode else "?",
m,
s,
similarity,
)
repass += putline + "\n"
return f"耗时 {int(time.time() - s_time)} 秒\n" + repass[:-1]
else:
return f'访问错误 error:{anime_json["error"]}'
else:
return f'访问失败,请再试一次吧, status: {response.status}'
return f"访问失败,请再试一次吧, status: {response.status}"
except Exception as e:
logger.error(f'识番发生错误 e:{e}')
return '发生了奇怪的错误,那就没办法了,再试一次?'
logger.error(f"识番发生错误 e:{e}")
return "发生了奇怪的错误,那就没办法了,再试一次?"