diff --git a/.vscode/launch.json b/.vscode/launch.json index b6b8d0d..8994436 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "configurations": [ { "name": "Python: Module", - "type": "python", + "type": "debugpy", "request": "launch", "module": "audiobridge", "justMyCode": true diff --git a/audiobridge/bot/audioWorker.py b/audiobridge/bot/audioWorker.py index 09a8162..1c7a757 100644 --- a/audiobridge/bot/audioWorker.py +++ b/audiobridge/bot/audioWorker.py @@ -104,8 +104,13 @@ def _downloadAudio(self, cmd: str): if "size=" in line.lower(): # Обновление сообщения с процессом загрузки по интервалы (необходимо для предотвращения непреднамеренного спама) if round(time.time() - last_msg_time) >= bot_cfg.settings.msg_period: + logger.info(line) size = line[6:].strip() - size = int(size[:size.find(' ')-2]) + size = size[:size.find(' ')] + if "kib" in size.lower(): + size = int(size[:-3]) + else: + size = int(size[:-2]) if size: vars.api.bot.messages.edit(peer_id = self.user_id, message = f"Загружено {int(round(size * 1024 / self.file_size, 2) * 100)}% ({round(size / 1024, 2)} / {round(self.file_size / 1024**2, 2)} Мб)" + pl_suffix, message_id = self.progress_msg_id) last_msg_time = time.time() diff --git a/requirements.txt b/requirements.txt index fc85e58..d2d1c1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ vk_api pydub psycopg2-binary environs -yt_dlp==2024.10.22 +yt_dlp==2025.01.15