Update emoji_manager.py
This commit is contained in:
@@ -444,7 +444,6 @@ class EmojiManager:
|
||||
Optional[Tuple[str, str]]: (表情包完整文件路径, 表情包描述),如果没有找到则返回None
|
||||
"""
|
||||
try:
|
||||
self.()
|
||||
_time_start = time.time()
|
||||
|
||||
# 获取所有表情包 (从内存缓存中获取)
|
||||
@@ -691,22 +690,21 @@ class EmojiManager:
|
||||
"""
|
||||
try:
|
||||
with get_db_session() as session:
|
||||
self.()
|
||||
|
||||
if emoji_hash:
|
||||
query = session.execute(select(Emoji).where(Emoji.emoji_hash == emoji_hash)).scalars().all()
|
||||
else:
|
||||
logger.warning(
|
||||
"[查询] 未提供 hash,将尝试加载所有表情包,建议使用 get_all_emoji_from_db 更新管理器状态。"
|
||||
)
|
||||
query = session.execute(select(Emoji)).scalars().all()
|
||||
if emoji_hash:
|
||||
query = session.execute(select(Emoji).where(Emoji.emoji_hash == emoji_hash)).scalars().all()
|
||||
else:
|
||||
logger.warning(
|
||||
"[查询] 未提供 hash,将尝试加载所有表情包,建议使用 get_all_emoji_from_db 更新管理器状态。"
|
||||
)
|
||||
query = session.execute(select(Emoji)).scalars().all()
|
||||
|
||||
emoji_instances = query
|
||||
emoji_objects, load_errors = _to_emoji_objects(emoji_instances)
|
||||
emoji_instances = query
|
||||
emoji_objects, load_errors = _to_emoji_objects(emoji_instances)
|
||||
|
||||
if load_errors > 0:
|
||||
logger.warning(f"[查询] 加载过程中出现 {load_errors} 个错误。")
|
||||
return emoji_objects
|
||||
if load_errors > 0:
|
||||
logger.warning(f"[查询] 加载过程中出现 {load_errors} 个错误。")
|
||||
return emoji_objects
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"[错误] 从数据库获取表情包对象失败: {str(e)}")
|
||||
@@ -744,7 +742,6 @@ class EmojiManager:
|
||||
return emoji.description
|
||||
|
||||
# 如果内存中没有,从数据库查找
|
||||
self.()
|
||||
try:
|
||||
with get_db_session() as session:
|
||||
emoji_record = session.execute(select(Emoji).where(Emoji.emoji_hash == emoji_hash)).scalar_one_or_none()
|
||||
@@ -771,7 +768,6 @@ class EmojiManager:
|
||||
bool: 是否成功删除
|
||||
"""
|
||||
try:
|
||||
self.()
|
||||
|
||||
# 从emoji_objects中查找表情包对象
|
||||
emoji = await self.get_emoji_from_manager(emoji_hash)
|
||||
@@ -811,7 +807,6 @@ class EmojiManager:
|
||||
bool: 是否成功替换表情包
|
||||
"""
|
||||
try:
|
||||
self.()
|
||||
|
||||
# 获取所有表情包对象
|
||||
emoji_objects = self.emoji_objects
|
||||
|
||||
Reference in New Issue
Block a user