Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,36 @@ async def _init_db() -> None:

def _init_logger() -> None:
"""初始化日志记录器。"""
logging.basicConfig(
format="%(levelname)s [%(asctime)s] %(name)s - %(message)s",
handler = logging.StreamHandler() # 输出到终端
formatter = logging.Formatter(
fmt="%(levelname)s [%(asctime)s] %(name)s - %(message)s",
datefmt="%Y-%m-%d %H:%M:%S",
level=config.log_level,
filename="default.log",
)
handler.setFormatter(formatter)

# 添加流处理器
logger.addHandler(handler)

# 设置日志级别
logger.setLevel(config.log_level)

# 如果你需要将日志写入文件,可以继续保持原有的文件配置:
file_handler = logging.FileHandler("default.log")
file_handler.setFormatter(formatter)
logger.addHandler(file_handler)


def _init_tz() -> None:
"""初始化时区设置。"""
if config.timezone:
try:
timezone = pytz.timezone(config.timezone)
now = datetime.now(timezone).strftime('%Y-%m-%d %H:%M:%S')
now = datetime.now(timezone).strftime("%Y-%m-%d %H:%M:%S")
logger.info(f"时区已设置为: {config.timezone},当前时间: {now}")
except pytz.UnknownTimeZoneError:
logger.error(f"无效的时区配置: {config.timezone},请检查 config.timezone 设置。")
logger.error(
f"无效的时区配置: {config.timezone},请检查 config.timezone 设置。"
)


async def setup_bot() -> BotClient:
Expand Down Expand Up @@ -94,7 +108,7 @@ async def main() -> None:
_init_logger()
_init_tz()

now = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
logger.info(f"程序启动时间: {now}")

await _init_db()
Expand Down
2 changes: 1 addition & 1 deletion bot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"get_user_telegram_id",
"parse_iso8601_to_normal_date",
"parse_timestamp_to_normal_date",
]
]
17 changes: 7 additions & 10 deletions bot/bot_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@

class BotClient:
def __init__(
self,
api_id: str,
api_hash: str,
bot_token: str,
name="emby_bot",
self,
api_id: str,
api_hash: str,
bot_token: str,
name="emby_bot",
):
self.client = Client(
name=name,
api_id=api_id,
api_hash=api_hash,
bot_token=bot_token
name=name, api_id=api_id, api_hash=api_hash, bot_token=bot_token
)
logger.info(f"Bot client initialized with name: {name}")

Expand All @@ -41,4 +38,4 @@ async def idle():

def stop(self):
logger.info("Stopping bot client")
return self.client.stop()
return self.client.stop()
Loading
Loading