From 1b6c9725f58700eb321c0e055297074738cb8c99 Mon Sep 17 00:00:00 2001 From: Whyverum Date: Mon, 23 Dec 2024 22:09:16 +0700 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B1=D0=B0=D0=B3=D0=B8=20=D1=81=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=D1=8E=20=D0=B2=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BotLibrary/analitics/message_to_file.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/BotLibrary/analitics/message_to_file.py b/BotLibrary/analitics/message_to_file.py index 4b3a516..a9110bc 100644 --- a/BotLibrary/analitics/message_to_file.py +++ b/BotLibrary/analitics/message_to_file.py @@ -5,9 +5,10 @@ import os from loguru import logger from datetime import datetime -from config import BotVariables -from .type_messages import * -from .find_ids import find_chat_id +from ..configs import * +from ..library.time import TimeVariable +from .types_msg import types_message, types_chat +from .find_ids import find_imp_id # Настройка экспорта модулей и логирования __all__ = ("write_message_to_file",) @@ -19,12 +20,12 @@ async def write_message_to_file(message): try: # Создание переменных с информацией message_type = types_message(message) - chat_id = find_chat_id(message) + chat_id = find_imp_id(message.from_user.id) file_path = types_chat(message) # Переменные для логов сообщений - date = datetime.now().strftime(BotVariables.time_format) - username = message.from_user.username if message.from_user.username else "No username" + date = datetime.now().strftime(TimeVariable.format) + username = message.from_user.username if message.from_user.username else "Нет @username" log_shablon = f"{date} | @{username} ({message.from_user.id}) |" # Проверка и создание директорий @@ -32,17 +33,14 @@ async def write_message_to_file(message): os.makedirs(os.path.dirname(file_path)) # Запись информации в файл - with open(file_path, "a", encoding=BotVariables.encoding) as file: + with open(file_path, "a", encoding=default_encod) as file: # Проверка на наличие текста if message.text is None: file.write(f"{log_shablon} Тип: {message_type}\n\n") else: file.write(f"{log_shablon} ChatID: {chat_id} | Текст: {message.text}\n\n") - return f"Сообщение пользователя успешно записано в файл." - # Проверка на ошибку и ее логирование except Exception as e: text_error = f"Ошибка в сохранении сообщения в файл: {str(e)}" logger.bind(custom_variable=log_type, user_var=f"@{message.from_user.username}").error(text_error) - return text_error