From a6051f702cd49eb109bc0edd370dca268ffa22f4 Mon Sep 17 00:00:00 2001 From: Shon Date: Sun, 29 Dec 2024 13:18:56 +0500 Subject: [PATCH 1/5] fix: ffmpeg with `libmp3lame` --- CHANGELOG.md | 7 +++++++ Dockerfile | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4195d4d..66e3a92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ и этот проект придерживается [Semantic Versioning]. ## [Unreleased] + +## [1.3.8] - 29-12-2024 + +### Changed +* Переконфигурирован ffmpeg для поддержки `libmp3lame` для решения проблемы с `soundcloud` + ## [1.3.7] - 24-10-2024 ### Added @@ -285,6 +291,7 @@ [unreleased]: https://github.com/AudioBridge-team/AudioBridge/compare/prod...dev +[1.3.8]: https://github.com/AudioBridge-team/AudioBridge/compare/v1.3.7...v1.3.8 [1.3.7]: https://github.com/AudioBridge-team/AudioBridge/compare/v1.3.6...v1.3.7 [1.3.6]: https://github.com/AudioBridge-team/AudioBridge/compare/v1.3.5...v1.3.6 [1.3.5]: https://github.com/AudioBridge-team/AudioBridge/compare/v1.3.4...v1.3.5 diff --git a/Dockerfile b/Dockerfile index 8e446a6..ee643ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,17 @@ FROM python:3.9.12-slim-buster -RUN apt-get update -RUN apt-get install -y libmagic1 ffmpeg -RUN apt-get install -y pandoc +RUN apt-get update && apt-get install -y \ + wget \ + xz-utils \ + pandoc \ + && rm -rf /var/lib/apt/lists/* + +RUN wget https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz -O /tmp/ffmpeg.tar.xz \ + && tar -xfv /tmp/ffmpeg.tar.xz -C /tmp + +RUN mv /tmp/ffmpeg-master-latest-linux64-gpl/bin/* /usr/local/bin/ +RUN rm -f /tmp/ffmpeg.tar.xz +RUN ffmpeg -version WORKDIR /AudioBridge/bin From 5994e528d3cb6066749dafea010216812ba809c9 Mon Sep 17 00:00:00 2001 From: Shon Date: Sun, 29 Dec 2024 13:22:19 +0500 Subject: [PATCH 2/5] fix: delete flag -v --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee643ed..9cb5bbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* RUN wget https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz -O /tmp/ffmpeg.tar.xz \ - && tar -xfv /tmp/ffmpeg.tar.xz -C /tmp + && tar -xf /tmp/ffmpeg.tar.xz -C /tmp RUN mv /tmp/ffmpeg-master-latest-linux64-gpl/bin/* /usr/local/bin/ RUN rm -f /tmp/ffmpeg.tar.xz From b9b49d4ec1a3ee64c2426f109c7b75be815712ad Mon Sep 17 00:00:00 2001 From: Shon Date: Sun, 29 Dec 2024 13:23:39 +0500 Subject: [PATCH 3/5] fix: udpate version --- bot_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot_settings.json b/bot_settings.json index a2c17e7..7efed61 100644 --- a/bot_settings.json +++ b/bot_settings.json @@ -1,5 +1,5 @@ { - "bot_version" : "v1.3.7", + "bot_version" : "v1.3.8", "sync_changelog" : true, "release_update" : true, "max_workers" : 6, From efde4880f5ca026e192b0ad2894f282c4c2341d1 Mon Sep 17 00:00:00 2001 From: Shon Qwezon Date: Thu, 23 Jan 2025 17:34:52 +0300 Subject: [PATCH 4/5] fix: check lines --- .vscode/launch.json | 2 +- audiobridge/bot/audioWorker.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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..8480974 100644 --- a/audiobridge/bot/audioWorker.py +++ b/audiobridge/bot/audioWorker.py @@ -104,6 +104,7 @@ 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]) if size: From dfe8e874a27f8a380b59cee1c0a6ab34313f54a0 Mon Sep 17 00:00:00 2001 From: Shon Qwezon Date: Thu, 23 Jan 2025 17:50:50 +0300 Subject: [PATCH 5/5] fix: update version + change size parsing --- audiobridge/bot/audioWorker.py | 6 +++++- requirements.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/audiobridge/bot/audioWorker.py b/audiobridge/bot/audioWorker.py index 8480974..1c7a757 100644 --- a/audiobridge/bot/audioWorker.py +++ b/audiobridge/bot/audioWorker.py @@ -106,7 +106,11 @@ def _downloadAudio(self, cmd: str): 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