diff --git a/Dockerfile b/Dockerfile index 639552f..830863b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM debian:sid WORKDIR / RUN apt-get update && \ - apt-get install -y curl libopus0 tini liboggz2 xz-utils python3 \ - python3-pip ffmpeg python3-certifi python3-brotli python3-websockets python3-requests python3-mutagen && \ + apt-get install -y curl libopus0 tini liboggz2 xz-utils ffmpeg python3 \ + python3-pip python3-certifi python3-brotli python3-websockets python3-requests python3-mutagen && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* RUN pip3 install --break-system-packages --no-cache-dir curl_cffi @@ -10,16 +10,10 @@ RUN pip3 install --break-system-packages --no-cache-dir pycryptodome RUN curl -Lo dpp.deb https://dl.dpp.dev/ RUN dpkg -i dpp.deb RUN rm dpp.deb -# RUN curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/latest/download/ffmpeg-master-latest-linux64-gpl.tar.xz -# RUN tar -xf ffmpeg-master-latest-linux64-gpl.tar.xz -# RUN rm ffmpeg-master-latest-linux64-gpl.tar.xz -# RUN mv ffmpeg-master-latest-linux64-gpl ffmpeg RUN curl -LO https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp RUN chmod +x ./yt-dlp COPY ./build/BumbleCee /BumbleCee COPY ./streamOpus.sh /streamOpus.sh -# RUN curl -LO https://github.com/HappyTanuki/BumbleCee/releases/latest/download/BumbleCee -# RUN curl -LO https://github.com/HappyTanuki/BumbleCee/releases/latest/download/streamOpus.sh RUN chmod +x BumbleCee RUN chmod +x streamOpus.sh ENTRYPOINT ["/usr/bin/tini", "--", "./BumbleCee"] \ No newline at end of file diff --git a/README.md b/README.md index 2666fa7..72e939e 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ C++ Dpp 라이브러리를 이용해서 개발된 간단한 디스코드 음악
+[](https://www.codefactor.io/repository/github/happytanuki/bumblecee) # 어떻게 써요? 1. 실행파일 경로에 config.json 파일을 만들고 다음과 같이 입력하세요: diff --git a/include/Utils/VersionsCheckUtils.hpp b/include/Utils/VersionsCheckUtils.hpp index 567b765..c6bd973 100644 --- a/include/Utils/VersionsCheckUtils.hpp +++ b/include/Utils/VersionsCheckUtils.hpp @@ -36,8 +36,9 @@ public: system("curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/latest/download/ffmpeg-master-latest-linux64-gpl.tar.xz"); system("tar -xf ffmpeg-master-latest-linux64-gpl.tar.xz"); system("rm ffmpeg-master-latest-linux64-gpl.tar.xz"); - system("mv ffmpeg-master-latest-linux64-gpl ffmpeg"); - SettingsManager::setFFMPEG_CMD("./ffmpeg/bin/ffmpeg"); + system("mv ffmpeg-master-latest-linux64-gpl/bin/ffmpeg ."); + system("rm -rf ffmpeg-master-latest-linux64-gpl"); + SettingsManager::setFFMPEG_CMD("./ffmpeg"); } } diff --git a/src/Settings/SettingsManager.cpp b/src/Settings/SettingsManager.cpp index ac997d1..e26f936 100644 --- a/src/Settings/SettingsManager.cpp +++ b/src/Settings/SettingsManager.cpp @@ -8,7 +8,7 @@ namespace bumbleBee { std::string SettingsManager::TOKEN = ""; std::string SettingsManager::YTDLP_CMD = "./yt-dlp"; -std::string SettingsManager::FFMPEG_CMD = "./ffmpeg/bin/ffmpeg"; +std::string SettingsManager::FFMPEG_CMD = "./ffmpeg"; dpp::loglevel SettingsManager::LOGLEVEL = dpp::ll_debug; bool SettingsManager::REGISTER_COMMAND = false;