🐛 修复一些细节小问题

This commit is contained in:
2024-10-20 20:59:30 +08:00
parent ef5866343d
commit 13b95c2732
14 changed files with 148 additions and 124 deletions

View File

@ -6,7 +6,6 @@ __NAME__ = "LiteyukiBot"
__VERSION__ = "6.3.2" # 60201
from src.utils.base.config import load_from_yaml, config
from src.utils.base.log import init_log
from git import Repo
major, minor, patch = map(int, __VERSION__.split("."))
@ -20,7 +19,6 @@ def init():
"""
# 检测python版本是否高于3.10
init_log()
if sys.version_info < (3, 10):
nonebot.logger.error("Requires Python3.10+ to run, please upgrade your Python Environment.")
exit(1)

View File

@ -1,79 +1,79 @@
import sys
import loguru
from typing import TYPE_CHECKING
from .config import load_from_yaml
from .language import Language, get_default_lang_code
logger = loguru.logger
if TYPE_CHECKING:
# avoid sphinx autodoc resolve annotation failed
# because loguru module do not have `Logger` class actually
from loguru import Record
def default_filter(record: "Record"):
"""默认的日志过滤器,根据 `config.log_level` 配置改变日志等级。"""
log_level = record["extra"].get("nonebot_log_level", "INFO")
levelno = logger.level(log_level).no if isinstance(log_level, str) else log_level
return record["level"].no >= levelno
# DEBUG日志格式
debug_format: str = (
"<c>{time:YYYY-MM-DD HH:mm:ss}</c> "
"<lvl>[{level.icon}]</lvl> "
"<c><{name}.{module}.{function}:{line}></c> "
"{message}"
)
# 默认日志格式
default_format: str = (
"<c>{time:MM-DD HH:mm:ss}</c> "
"<lvl>[{level.icon}]</lvl> "
"<c><{name}></c> "
"{message}"
)
def get_format(level: str) -> str:
if level == "DEBUG":
return debug_format
else:
return default_format
logger = loguru.logger.bind()
def init_log():
"""
在语言加载完成后执行
Returns:
"""
global logger
config = load_from_yaml("config.yml")
logger.remove()
logger.add(
sys.stdout,
level=0,
diagnose=False,
filter=default_filter,
format=get_format(config.get("log_level", "INFO")),
)
show_icon = config.get("log_icon", True)
lang = Language(get_default_lang_code())
debug = lang.get("log.debug", default="==DEBUG")
info = lang.get("log.info", default="===INFO")
success = lang.get("log.success", default="SUCCESS")
warning = lang.get("log.warning", default="WARNING")
error = lang.get("log.error", default="==ERROR")
logger.level("DEBUG", color="<blue>", icon=f"{'🐛' if show_icon else ''}{debug}")
logger.level("INFO", color="<normal>", icon=f"{'' if show_icon else ''}{info}")
logger.level("SUCCESS", color="<green>", icon=f"{'' if show_icon else ''}{success}")
logger.level("WARNING", color="<yellow>", icon=f"{'⚠️' if show_icon else ''}{warning}")
logger.level("ERROR", color="<red>", icon=f"{'' if show_icon else ''}{error}")
# import sys
# import loguru
# from typing import TYPE_CHECKING
# from .config import load_from_yaml
# from .language import Language, get_default_lang_code
#
# logger = loguru.logger
# if TYPE_CHECKING:
# # avoid sphinx autodoc resolve annotation failed
# # because loguru module do not have `Logger` class actually
# from loguru import Record
#
#
# def default_filter(record: "Record"):
# """默认的日志过滤器,根据 `config.log_level` 配置改变日志等级。"""
# log_level = record["extra"].get("nonebot_log_level", "INFO")
# levelno = logger.level(log_level).no if isinstance(log_level, str) else log_level
# return record["level"].no >= levelno
#
#
# # DEBUG日志格式
# debug_format: str = (
# "<c>{time:YYYY-MM-DD HH:mm:ss}</c> "
# "<lvl>[{level.icon}]</lvl> "
# "<c><{name}.{module}.{function}:{line}></c> "
# "{message}"
# )
#
# # 默认日志格式
# default_format: str = (
# "<c>{time:MM-DD HH:mm:ss}</c> "
# "<lvl>[{level.icon}]</lvl> "
# "<c><{name}></c> "
# "{message}"
# )
#
#
# def get_format(level: str) -> str:
# if level == "DEBUG":
# return debug_format
# else:
# return default_format
#
#
# logger = loguru.logger.bind()
#
#
# def init_log():
# """
# 在语言加载完成后执行
# Returns:
#
# """
# global logger
#
# config = load_from_yaml("config.yml")
#
# logger.remove()
# logger.add(
# sys.stdout,
# level=0,
# diagnose=False,
# filter=default_filter,
# format=get_format(config.get("log_level", "INFO")),
# )
# show_icon = config.get("log_icon", True)
# lang = Language(get_default_lang_code())
#
# debug = lang.get("log.debug", default="==DEBUG")
# info = lang.get("log.info", default="===INFO")
# success = lang.get("log.success", default="SUCCESS")
# warning = lang.get("log.warning", default="WARNING")
# error = lang.get("log.error", default="==ERROR")
#
# logger.level("DEBUG", color="<blue>", icon=f"{'🐛' if show_icon else ''}{debug}")
# logger.level("INFO", color="<normal>", icon=f"{'' if show_icon else ''}{info}")
# logger.level("SUCCESS", color="<green>", icon=f"{'✅' if show_icon else ''}{success}")
# logger.level("WARNING", color="<yellow>", icon=f"{'⚠️' if show_icon else ''}{warning}")
# logger.level("ERROR", color="<red>", icon=f"{'⭕' if show_icon else ''}{error}")