diff --git a/bot/helper/telegram_helper/message_utils.py b/bot/helper/telegram_helper/message_utils.py index 9cbb40d..968fefc 100644 --- a/bot/helper/telegram_helper/message_utils.py +++ b/bot/helper/telegram_helper/message_utils.py @@ -67,10 +67,13 @@ def delete_all_messages(): def update_all_messages(): + total, used, free = shutil.disk_usage('.') + used = get_readable_file_size(used) + free = get_readable_file_size(free) msg = get_readable_message() - msg += f"CPU: {psutil.cpu_percent()}%\n" \ - f"RAM: {psutil.virtual_memory().percent}%\n" \ - f"DISK: {psutil.disk_usage('/').percent}%\n" + msg += f"CPU: {psutil.cpu_percent()}%" \ + f" RAM: {psutil.virtual_memory().percent}%" \ + f" DISK: {psutil.disk_usage('/').percent}%" with download_dict_lock: dlspeed_bytes = 0 uldl_bytes = 0 @@ -88,7 +91,7 @@ def update_all_messages(): uldl_bytes += float(speedy.split('M')[0]) * 1048576 dlspeed = get_readable_file_size(dlspeed_bytes) ulspeed = get_readable_file_size(uldl_bytes) - msg += f"\nDL: {dlspeed}ps 🔻| UL: {ulspeed}ps 🔺\n" + msg += f"\nUSED: {used} | FREE: {free}\nDL: {dlspeed}ps 🔻 | UL: {ulspeed}ps 🔺\n" with status_reply_dict_lock: for chat_id in list(status_reply_dict.keys()): if status_reply_dict[chat_id] and msg != status_reply_dict[chat_id].text: @@ -102,10 +105,13 @@ def update_all_messages(): def sendStatusMessage(msg, bot): + total, used, free = shutil.disk_usage('.') + used = get_readable_file_size(used) + free = get_readable_file_size(free) progress = get_readable_message() - progress += f"CPU: {psutil.cpu_percent()}%\n" \ - f"RAM: {psutil.virtual_memory().percent}%\n" \ - f"DISK: {psutil.disk_usage('/').percent}%\n" + progress += f"CPU: {psutil.cpu_percent()}%" \ + f" RAM: {psutil.virtual_memory().percent}%" \ + f" DISK: {psutil.disk_usage('/').percent}%" with download_dict_lock: dlspeed_bytes = 0 uldl_bytes = 0 @@ -123,7 +129,7 @@ def sendStatusMessage(msg, bot): uldl_bytes += float(speedy.split('M')[0]) * 1048576 dlspeed = get_readable_file_size(dlspeed_bytes) ulspeed = get_readable_file_size(uldl_bytes) - progress += f"\nDL: {dlspeed}ps 🔻| UL: {ulspeed}ps 🔺\n" + progress += f"\nUSED: {used} | FREE: {free}\nDL: {dlspeed}ps 🔻 | UL: {ulspeed}ps 🔺\n" with status_reply_dict_lock: if msg.message.chat.id in list(status_reply_dict.keys()): try: