mirror of
https://github.com/HappyTanuki/BumbleCee.git
synced 2025-10-26 01:45:15 +00:00
Compare commits
41 Commits
stable
...
125fbcc49c
| Author | SHA1 | Date | |
|---|---|---|---|
| 125fbcc49c | |||
| 4915a5c3b8 | |||
| 4435337f40 | |||
| 77d16c1cdb | |||
| 5760f1afdc | |||
| bb6cd89f51 | |||
| 2a238f804d | |||
| ea7d42638e | |||
| 30f97e3dfb | |||
| 17236f32b5 | |||
| 00134ee7b1 | |||
| 52146c1f6a | |||
| bf0268c1e9 | |||
| 2f5185e0c3 | |||
| 96a4096971 | |||
| ec65b550e6 | |||
| 14db2a31e8 | |||
| 1af829c711 | |||
| 46c59d40de | |||
| b08641f87e | |||
| 1ca928c4df | |||
| 2935a844a0 | |||
| 0cb7ea8225 | |||
| 7e43900f22 | |||
| c2cb16c6d7 | |||
| 3186561818 | |||
| 30569f4472 | |||
| b4476c68d7 | |||
| c276065a65 | |||
| 68b6105ac3 | |||
| 0633855374 | |||
| b9ab9ac60f | |||
| 8607c4a8a5 | |||
| 51f9b25bd8 | |||
| 3f1edbbf16 | |||
| ba56fe015f | |||
| 5c99d42fe3 | |||
| e0e4b17675 | |||
| e62a862e42 | |||
| 75a34d12b6 | |||
| 4e4856e961 |
14
.gitignore
vendored
14
.gitignore
vendored
@@ -1,7 +1,7 @@
|
||||
build/
|
||||
out/
|
||||
.vs/
|
||||
.vscode/
|
||||
.idea/
|
||||
tmp/
|
||||
config.json
|
||||
build/*
|
||||
Temp/
|
||||
Music
|
||||
*.json
|
||||
yt-dlp
|
||||
ffmpeg
|
||||
password
|
||||
10
.idea/.gitignore
generated
vendored
Normal file
10
.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,10 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Environment-dependent path to Maven home directory
|
||||
/mavenHomeManager.xml
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
9
.idea/BumbleCee.iml
generated
Normal file
9
.idea/BumbleCee.iml
generated
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
6
.idea/misc.xml
generated
Normal file
6
.idea/misc.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="openjdk-23" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
8
.idea/modules.xml
generated
Normal file
8
.idea/modules.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/BumbleCee.iml" filepath="$PROJECT_DIR$/.idea/BumbleCee.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
22
.vscode/c_cpp_properties.json
vendored
Normal file
22
.vscode/c_cpp_properties.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Linux",
|
||||
"includePath": [
|
||||
"${workspaceFolder}/**",
|
||||
"${workspaceFolder}/include"
|
||||
],
|
||||
"defines": [
|
||||
"DDPP_CORO=on"
|
||||
],
|
||||
"compilerPath": "/usr/bin/gcc",
|
||||
"cStandard": "c17",
|
||||
"cppStandard": "c++20",
|
||||
"intelliSenseMode": "linux-gcc-x64",
|
||||
"compilerArgs": [
|
||||
"-DDPP_CORO"
|
||||
]
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
}
|
||||
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@@ -7,7 +7,7 @@
|
||||
"request": "launch",
|
||||
"program": "${workspaceFolder}/build/BumbleCee",
|
||||
"stopAtEntry": false,
|
||||
"cwd": "${fileDirname}",
|
||||
"cwd": "${workspaceFolder}",
|
||||
"environment": [],
|
||||
"externalConsole": false,
|
||||
"MIMode": "gdb",
|
||||
|
||||
149
.vscode/settings.json
vendored
149
.vscode/settings.json
vendored
@@ -1,78 +1,109 @@
|
||||
{
|
||||
"files.associations": {
|
||||
"iostream": "cpp",
|
||||
"any": "cpp",
|
||||
"chrono": "cpp",
|
||||
"codecvt": "cpp",
|
||||
"compare": "cpp",
|
||||
"condition_variable": "cpp",
|
||||
"deque": "cpp",
|
||||
"forward_list": "cpp",
|
||||
"list": "cpp",
|
||||
"string": "cpp",
|
||||
"unordered_map": "cpp",
|
||||
"vector": "cpp",
|
||||
"exception": "cpp",
|
||||
"functional": "cpp",
|
||||
"iterator": "cpp",
|
||||
"memory": "cpp",
|
||||
"memory_resource": "cpp",
|
||||
"optional": "cpp",
|
||||
"string_view": "cpp",
|
||||
"random": "cpp",
|
||||
"*.tcc": "cpp",
|
||||
"fstream": "cpp",
|
||||
"future": "cpp",
|
||||
"initializer_list": "cpp",
|
||||
"istream": "cpp",
|
||||
"mutex": "cpp",
|
||||
"new": "cpp",
|
||||
"ostream": "cpp",
|
||||
"ranges": "cpp",
|
||||
"semaphore": "cpp",
|
||||
"shared_mutex": "cpp",
|
||||
"iosfwd": "cpp",
|
||||
"sstream": "cpp",
|
||||
"stdexcept": "cpp",
|
||||
"stop_token": "cpp",
|
||||
"streambuf": "cpp",
|
||||
"system_error": "cpp",
|
||||
"thread": "cpp",
|
||||
"tuple": "cpp",
|
||||
"type_traits": "cpp",
|
||||
"typeinfo": "cpp",
|
||||
"valarray": "cpp",
|
||||
"variant": "cpp",
|
||||
"array": "cpp",
|
||||
"atomic": "cpp",
|
||||
"bit": "cpp",
|
||||
"cctype": "cpp",
|
||||
"charconv": "cpp",
|
||||
"clocale": "cpp",
|
||||
"cmath": "cpp",
|
||||
"concepts": "cpp",
|
||||
"coroutine": "cpp",
|
||||
"csignal": "cpp",
|
||||
"cstdarg": "cpp",
|
||||
"cstddef": "cpp",
|
||||
"cstdint": "cpp",
|
||||
"cstdio": "cpp",
|
||||
"cstdlib": "cpp",
|
||||
"cstring": "cpp",
|
||||
"ctime": "cpp",
|
||||
"cwchar": "cpp",
|
||||
"cwctype": "cpp",
|
||||
"map": "cpp",
|
||||
"algorithm": "cpp",
|
||||
"numeric": "cpp",
|
||||
"ratio": "cpp",
|
||||
"utility": "cpp",
|
||||
"iomanip": "cpp",
|
||||
"iosfwd": "cpp",
|
||||
"limits": "cpp",
|
||||
"numbers": "cpp",
|
||||
"cinttypes": "cpp",
|
||||
"any": "cpp",
|
||||
"array": "cpp",
|
||||
"atomic": "cpp",
|
||||
"strstream": "cpp",
|
||||
"bit": "cpp",
|
||||
"*.tcc": "cpp",
|
||||
"bitset": "cpp",
|
||||
"charconv": "cpp",
|
||||
"chrono": "cpp",
|
||||
"codecvt": "cpp",
|
||||
"compare": "cpp",
|
||||
"complex": "cpp",
|
||||
"concepts": "cpp",
|
||||
"condition_variable": "cpp",
|
||||
"coroutine": "cpp",
|
||||
"cstdint": "cpp",
|
||||
"deque": "cpp",
|
||||
"forward_list": "cpp",
|
||||
"list": "cpp",
|
||||
"map": "cpp",
|
||||
"set": "cpp",
|
||||
"regex": "cpp"
|
||||
"string": "cpp",
|
||||
"unordered_map": "cpp",
|
||||
"vector": "cpp",
|
||||
"exception": "cpp",
|
||||
"algorithm": "cpp",
|
||||
"functional": "cpp",
|
||||
"iterator": "cpp",
|
||||
"memory": "cpp",
|
||||
"memory_resource": "cpp",
|
||||
"numeric": "cpp",
|
||||
"optional": "cpp",
|
||||
"random": "cpp",
|
||||
"ratio": "cpp",
|
||||
"source_location": "cpp",
|
||||
"string_view": "cpp",
|
||||
"system_error": "cpp",
|
||||
"tuple": "cpp",
|
||||
"type_traits": "cpp",
|
||||
"utility": "cpp",
|
||||
"fstream": "cpp",
|
||||
"future": "cpp",
|
||||
"initializer_list": "cpp",
|
||||
"iomanip": "cpp",
|
||||
"iostream": "cpp",
|
||||
"istream": "cpp",
|
||||
"limits": "cpp",
|
||||
"mutex": "cpp",
|
||||
"new": "cpp",
|
||||
"numbers": "cpp",
|
||||
"ostream": "cpp",
|
||||
"ranges": "cpp",
|
||||
"semaphore": "cpp",
|
||||
"shared_mutex": "cpp",
|
||||
"stdexcept": "cpp",
|
||||
"stop_token": "cpp",
|
||||
"streambuf": "cpp",
|
||||
"thread": "cpp",
|
||||
"cinttypes": "cpp",
|
||||
"typeindex": "cpp",
|
||||
"typeinfo": "cpp",
|
||||
"valarray": "cpp",
|
||||
"variant": "cpp",
|
||||
"*.ipp": "cpp",
|
||||
"format": "cpp",
|
||||
"span": "cpp",
|
||||
"__bit_reference": "cpp",
|
||||
"__bits": "cpp",
|
||||
"__config": "cpp",
|
||||
"__debug": "cpp",
|
||||
"__errc": "cpp",
|
||||
"__hash_table": "cpp",
|
||||
"__locale": "cpp",
|
||||
"__mutex_base": "cpp",
|
||||
"__node_handle": "cpp",
|
||||
"__nullptr": "cpp",
|
||||
"__split_buffer": "cpp",
|
||||
"__string": "cpp",
|
||||
"__threading_support": "cpp",
|
||||
"__tree": "cpp",
|
||||
"__tuple": "cpp",
|
||||
"ios": "cpp",
|
||||
"locale": "cpp",
|
||||
"queue": "cpp",
|
||||
"hash_map": "cpp",
|
||||
"hash_set": "cpp",
|
||||
"regex": "cpp",
|
||||
"stack": "cpp",
|
||||
"__memory": "cpp",
|
||||
"__verbose_abort": "cpp",
|
||||
"print": "cpp"
|
||||
}
|
||||
}
|
||||
4
.vscode/tasks.json
vendored
4
.vscode/tasks.json
vendored
@@ -8,7 +8,7 @@
|
||||
"command": "make",
|
||||
"args": [],
|
||||
"options": {
|
||||
"cwd": "${fileDirname}/../build"
|
||||
"cwd": "${workspaceFolder}/build/"
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
@@ -24,7 +24,7 @@
|
||||
".."
|
||||
],
|
||||
"options": {
|
||||
"cwd": "${fileDirname}/../build"
|
||||
"cwd": "${workspaceFolder}/build/"
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
|
||||
8
BuildDockerAndUpload.sh
Executable file
8
BuildDockerAndUpload.sh
Executable file
@@ -0,0 +1,8 @@
|
||||
#!/bin/bash
|
||||
(
|
||||
cd build
|
||||
cmake .. && make
|
||||
)
|
||||
docker login -u happytanuki12 --password-stdin < password
|
||||
docker build --tag happytanuki12/bumblebee:latest .
|
||||
docker push happytanuki12/bumblebee:latest
|
||||
@@ -1,35 +1,30 @@
|
||||
cmake_minimum_required (VERSION 3.6)
|
||||
|
||||
INCLUDE_DIRECTORIES(include . ${Boost_INCLUDE_DIR})
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||
set(BOT_NAME "BumbleCee")
|
||||
|
||||
project(${BOT_NAME})
|
||||
aux_source_directory("src" coresrc)
|
||||
aux_source_directory("src/Audio" commands)
|
||||
aux_source_directory("src/Commands" commands)
|
||||
add_executable(${BOT_NAME} ${coresrc} ${commands})
|
||||
|
||||
string(ASCII 27 Esc)
|
||||
aux_source_directory("src/Queue" settings)
|
||||
aux_source_directory("src/Settings" settings)
|
||||
aux_source_directory("src/Utils" settings)
|
||||
add_executable(${BOT_NAME} ${coresrc} ${commands} ${settings})
|
||||
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
set_target_properties(${BOT_NAME} PROPERTIES
|
||||
CXX_STANDARD 17
|
||||
CXX_STANDARD_REQUIRED ON
|
||||
)
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
||||
add_definitions( -DBOOST_ALL_NO_LIB )
|
||||
set( Boost_USE_STATIC_LIBS ON )
|
||||
find_package(Threads REQUIRED)
|
||||
find_package(DPP)
|
||||
if(APPLE)
|
||||
if(CMAKE_APPLE_SILICON_PROCESSOR)
|
||||
set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl")
|
||||
else()
|
||||
set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
|
||||
endif()
|
||||
find_package(OpenSSL REQUIRED)
|
||||
else()
|
||||
find_package(OpenSSL REQUIRED)
|
||||
endif()
|
||||
find_package(OpenSSL REQUIRED)
|
||||
find_package(Boost REQUIRED)
|
||||
|
||||
target_include_directories(${BOT_NAME} PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||
@@ -38,43 +33,14 @@ target_include_directories(${BOT_NAME} PUBLIC
|
||||
)
|
||||
|
||||
target_link_libraries(${BOT_NAME}
|
||||
dl
|
||||
dpp
|
||||
opus
|
||||
opusfile
|
||||
ogg
|
||||
oggz
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${OPENSSL_CRYPTO_LIBRARY}
|
||||
${OPENSSL_SSL_LIBRARY}
|
||||
${Boost_LIBRARIES}
|
||||
)
|
||||
|
||||
if (DPP_FOUND)
|
||||
target_link_libraries(${BOT_NAME} ${DPP_LIBRARIES})
|
||||
target_include_directories(${BOT_NAME} PUBLIC ${DPP_INCLUDE_DIR})
|
||||
else()
|
||||
message(WARNING "Could not find DPP install. Building from source instead.")
|
||||
option(DPP_BUILD_TEST "" OFF)
|
||||
include(FetchContent)
|
||||
|
||||
FetchContent_Declare(
|
||||
libdpp
|
||||
GIT_REPOSITORY https://github.com/brainboxdotcc/DPP.git
|
||||
GIT_TAG master)
|
||||
|
||||
FetchContent_GetProperties(libdpp)
|
||||
if(NOT libdpp_POPULATED)
|
||||
FetchContent_Populate(libdpp)
|
||||
target_include_directories(${BOT_NAME} PUBLIC
|
||||
${libdpp_SOURCE_DIR}/include
|
||||
)
|
||||
add_subdirectory(
|
||||
${libdpp_SOURCE_DIR}
|
||||
${libdpp_BINARY_DIR}
|
||||
EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
||||
target_link_libraries(${BOT_NAME} dpp)
|
||||
endif()
|
||||
|
||||
set(CMAKE_CXX_FLAGS "-g")
|
||||
link_directories(/usr/lib)
|
||||
BIN
DPP-markdown-logo.png
Normal file
BIN
DPP-markdown-logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
21
Dockerfile
Normal file
21
Dockerfile
Normal file
@@ -0,0 +1,21 @@
|
||||
FROM debian:sid
|
||||
WORKDIR /
|
||||
RUN apt-get update && \
|
||||
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
|
||||
RUN pip3 install --break-system-packages --no-cache-dir pycryptodome
|
||||
RUN curl -Lo dpp.deb https://dl.dpp.dev/latest
|
||||
RUN curl -Lo dpp-legacy.deb https://github.com/brainboxdotcc/DPP/releases/download/v10.0.35/libdpp-10.0.35-linux-x64.deb
|
||||
RUN dpkg -i dpp.deb
|
||||
RUN dpkg -i dpp-legacy.deb
|
||||
RUN rm dpp.deb
|
||||
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 chmod +x BumbleCee
|
||||
RUN chmod +x streamOpus.sh
|
||||
ENTRYPOINT ["/usr/bin/tini", "--", "./BumbleCee"]
|
||||
48
README.md
Normal file
48
README.md
Normal file
@@ -0,0 +1,48 @@
|
||||
|
||||
# 이게 뭔가요?
|
||||
[](https://www.codefactor.io/repository/github/happytanuki/bumblecee)
|
||||
|
||||
C++ Dpp 라이브러리를 이용해서 개발된 간단한 디스코드 음악봇입니다!
|
||||
<div align="center">
|
||||
<a href="https://github.com/brainboxdotcc/DPP" alt="DPP"> <img src="DPP-markdown-logo.png" /> </a>
|
||||
</div>
|
||||
|
||||
|
||||
# 어떻게 써요?
|
||||
1. 실행파일 경로에 config.json 파일을 만들고 다음과 같이 입력하세요:
|
||||
```
|
||||
{
|
||||
"CLEAR_PREVIOUS_COMMAND": true,
|
||||
"FFMPEG_CMD": "ffmpeg",
|
||||
"LOGLEVEL": "debug",
|
||||
"TOKEN": "발급받은 토큰",
|
||||
"YTDLP_CMD": "./yt-dlp"
|
||||
}
|
||||
```
|
||||
2. 봇을 초대하시고 사용하시면 됩니다.
|
||||
|
||||
# 명령어
|
||||
## /p
|
||||
노래를 예약합니다.
|
||||
사용법:
|
||||
/p (노래링크 또는 노래 제목)
|
||||
## /q
|
||||
현재 큐의 내용물을 확인합니다.
|
||||
사용법:
|
||||
/q
|
||||
## /d
|
||||
현재 큐의 내용물을 삭제합니다.
|
||||
현재 재생중인 곡은 0번입니다.
|
||||
사용법:
|
||||
/d (큐의 노래번호)
|
||||
## /s
|
||||
현재 곡을 스킵합니다.
|
||||
사용법:
|
||||
/s
|
||||
## /l
|
||||
음성 채팅을 떠납니다.
|
||||
사용법:
|
||||
/l
|
||||
|
||||
# docker
|
||||
happytanuki12/bumblebee:latest
|
||||
7
docker-compose.yml
Normal file
7
docker-compose.yml
Normal file
@@ -0,0 +1,7 @@
|
||||
services:
|
||||
bumblebee:
|
||||
image: happytanuki12/bumblebee:latest
|
||||
container_name: BumbleBee
|
||||
volumes:
|
||||
- ./config.json:/config.json
|
||||
restart: unless-stopped
|
||||
1303
flamegraph.pl
Executable file
1303
flamegraph.pl
Executable file
File diff suppressed because it is too large
Load Diff
67
generateStackFlame.sh
Executable file
67
generateStackFlame.sh
Executable file
@@ -0,0 +1,67 @@
|
||||
#!/bin/bash
|
||||
|
||||
# 기본값 설정
|
||||
n_flag=20
|
||||
i_flag=0
|
||||
process_args=()
|
||||
|
||||
# 입력값 파싱
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
-n)
|
||||
shift
|
||||
if [[ ! "$1" =~ ^[0-9]+$ ]]; then
|
||||
echo "오류: -n 옵션 뒤에는 숫자가 와야 합니다." >&2
|
||||
exit 1
|
||||
fi
|
||||
n_flag="$1"
|
||||
;;
|
||||
-i)
|
||||
shift
|
||||
if [[ ! "$1" =~ ^[0-9]+$ ]]; then
|
||||
echo "오류: -i 옵션 뒤에는 숫자가 와야 합니다." >&2
|
||||
exit 1
|
||||
fi
|
||||
i_flag="$1"
|
||||
;;
|
||||
*)
|
||||
# 프로세스 명 또는 PID 검증
|
||||
if [[ "$1" =~ ^[0-9]+$ ]]; then
|
||||
# 숫자인 경우, PID 존재 여부 확인
|
||||
if ! ps -p "$1" > /dev/null 2>&1; then
|
||||
echo "오류: PID $1 에 해당하는 프로세스가 존재하지 않습니다." >&2
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
# 문자열인 경우, 프로세스 이름 존재 여부 확인
|
||||
if ! pgrep -x "$1" > /dev/null 2>&1; then
|
||||
echo "오류: 프로세스 '$1' 가 실행 중이지 않습니다." >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
process_args+=("$1")
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
# 프로세스 인자 검증
|
||||
if [[ ${#process_args[@]} -eq 0 ]]; then
|
||||
echo "오류: 최소한 하나 이상의 프로세스 이름 또는 PID를 입력해야 합니다." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
pid=$(pidof $process_args)
|
||||
|
||||
for x in $(seq 1 $n_flag)
|
||||
do
|
||||
sudo gdb -ex "set pagination 0" \
|
||||
-ex "thread apply all bt" \
|
||||
-batch -p $pid >> out.gdb 2> /dev/null
|
||||
sleep $i_flag
|
||||
done
|
||||
|
||||
./stackcollapse-gdb.pl out.gdb > out.folded
|
||||
rm out.gdb
|
||||
./flamegraph.pl out.folded > stackflame.svg
|
||||
rm out.folded
|
||||
67
include/Audio/MusicPlayManager.hpp
Normal file
67
include/Audio/MusicPlayManager.hpp
Normal file
@@ -0,0 +1,67 @@
|
||||
#pragma once
|
||||
#include <dpp/dpp.h>
|
||||
#include <Queue/MusicQueue.hpp>
|
||||
#include <condition_variable>
|
||||
|
||||
namespace bumbleBee {
|
||||
class MusicPlayManager {
|
||||
public:
|
||||
MusicPlayManager(std::shared_ptr<dpp::cluster> cluster, std::vector<dpp::snowflake> GIDs) :
|
||||
cluster(cluster), GIDs(GIDs) {
|
||||
queueMap = std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>>();
|
||||
queueEmptyMutex = std::unordered_map<dpp::snowflake, std::shared_ptr<std::mutex>>();
|
||||
|
||||
cluster->on_voice_ready([this](const dpp::voice_ready_t &event){on_voice_ready(event);});
|
||||
cluster->on_voice_track_marker([this](const dpp::voice_track_marker_t &event){on_voice_track_marker(event);});
|
||||
cluster->on_voice_client_disconnect([this](const dpp::voice_client_disconnect_t& event){on_voice_client_disconnect(event);});
|
||||
|
||||
for (auto GID : GIDs) {
|
||||
queueMap[GID] = std::make_shared<MusicQueue>();
|
||||
queueEmptyMutex[GID] = std::make_shared<std::mutex>();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief voice_ready 이벤트 인지시 콜백되는 함수
|
||||
* @param event const dpp::voice_ready_t&
|
||||
**/
|
||||
void on_voice_ready(const dpp::voice_ready_t& event);
|
||||
/**
|
||||
* @brief voice_track_marker 이벤트 인지시 콜백되는 함수
|
||||
* @param event const dpp::voice_track_marker_t&
|
||||
**/
|
||||
void on_voice_track_marker(const dpp::voice_track_marker_t& event);
|
||||
/**
|
||||
* @brief voice_client_disconnect 이벤트 인지시 콜백되는 함수
|
||||
* @param event const dpp::voice_client_disconnect_t&
|
||||
**/
|
||||
void on_voice_client_disconnect(const dpp::voice_client_disconnect_t& event);
|
||||
|
||||
void play(dpp::discord_voice_client* client);
|
||||
|
||||
void queue_music(const dpp::snowflake guildId, const std::shared_ptr<MusicQueueElement> music);
|
||||
|
||||
void clear(const dpp::snowflake guildId);
|
||||
std::shared_ptr<MusicQueueElement> remove(const dpp::snowflake guildId, dpp::discord_voice_client* client, int index);
|
||||
int size(const dpp::snowflake guildId);
|
||||
|
||||
void setRepeat(const dpp::snowflake guildId, const bool value);
|
||||
bool getRepeat(const dpp::snowflake guildId);
|
||||
|
||||
std::pair<std::shared_ptr<std::list<std::shared_ptr<MusicQueueElement>>>, std::list<std::shared_ptr<MusicQueueElement>>::iterator> getQueue(const dpp::snowflake guildId);
|
||||
MusicQueueElement getNowPlaying(const dpp::snowflake guildId);
|
||||
|
||||
std::condition_variable queuedCondition;
|
||||
|
||||
private:
|
||||
std::shared_ptr<dpp::cluster> cluster;
|
||||
|
||||
std::vector<dpp::snowflake> GIDs;
|
||||
/// @brief 음악 큐
|
||||
std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> queueMap;
|
||||
|
||||
std::unordered_map<dpp::snowflake, std::shared_ptr<std::mutex>> queueEmptyMutex;
|
||||
|
||||
void send_audio_to_voice(std::shared_ptr<bumbleBee::MusicQueueElement> music, dpp::discord_voice_client* client);
|
||||
};
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
#pragma once
|
||||
#include <Commands/CommandType.hpp>
|
||||
#include <dpp/dpp.h>
|
||||
#include <memory>
|
||||
|
||||
class IBot {
|
||||
public:
|
||||
IBot(std::string token, int totalShard);
|
||||
void start();
|
||||
void onCommand(const dpp::slashcommand_t &event);
|
||||
void onReady(const dpp::ready_t &event);
|
||||
|
||||
std::shared_ptr<dpp::cluster> botCluster;
|
||||
std::vector<std::shared_ptr<commands::ICommand>> commandsArray;
|
||||
protected:
|
||||
};
|
||||
54
include/BumbleBee.hpp
Normal file
54
include/BumbleBee.hpp
Normal file
@@ -0,0 +1,54 @@
|
||||
#pragma once
|
||||
#ifndef _BUMBLEBEE_HPP_
|
||||
#define _BUMBLEBEE_HPP_
|
||||
#include <dpp/dpp.h>
|
||||
#include <dpp/nlohmann/json.hpp>
|
||||
#include <memory>
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
|
||||
namespace bumbleBee {
|
||||
/**
|
||||
* @file BumbleBee.hpp
|
||||
* @brief 메인 봇 클래스
|
||||
**/
|
||||
class BumbleBee {
|
||||
public:
|
||||
/**
|
||||
* @brief 생성자
|
||||
**/
|
||||
BumbleBee();
|
||||
/**
|
||||
* @brief 파괴자
|
||||
* @details BumbleBee의 모든 Property를 책임지고 파괴합니다
|
||||
**/
|
||||
~BumbleBee() {}
|
||||
|
||||
/**
|
||||
* @brief 봇 시작
|
||||
**/
|
||||
void start();
|
||||
|
||||
/**
|
||||
* @brief slashcommand 이벤트 인지시 콜백되는 함수
|
||||
* @param event const dpp::slashcommand_t&
|
||||
**/
|
||||
void on_slashcommand(const dpp::slashcommand_t& event);
|
||||
/**
|
||||
* @brief ready 이벤트 인지시 콜백되는 함수
|
||||
* @param event const dpp::ready_t&
|
||||
**/
|
||||
void on_ready(const dpp::ready_t& event);
|
||||
|
||||
/// @brief DPP 기본 클러스터 객체
|
||||
std::shared_ptr<dpp::cluster> cluster;
|
||||
/// @brief guild id 배열
|
||||
std::vector<dpp::snowflake> GIDs;
|
||||
|
||||
private:
|
||||
/// @brief Command 목록
|
||||
std::unordered_map<std::string, std::shared_ptr<commands::ICommand>> commands;
|
||||
/// @brief voiceclient 관련 event 처리기 <guild id, 각 길드별 MusicPlayManager 인스턴스>
|
||||
std::shared_ptr<MusicPlayManager> musicManager;
|
||||
};
|
||||
}
|
||||
#endif
|
||||
@@ -1,15 +0,0 @@
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include <Bot.hpp>
|
||||
#include <dpp/dpp.h>
|
||||
#include <MusicQueue.hpp>
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
|
||||
class BumbleCeepp : public IBot {
|
||||
public:
|
||||
BumbleCeepp(std::string token, int totalShard);
|
||||
private:
|
||||
//<guild_id, queue> 쌍임.
|
||||
std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> queueMap;
|
||||
};
|
||||
69
include/Commands/BumbleBeeCommand.hpp
Normal file
69
include/Commands/BumbleBeeCommand.hpp
Normal file
@@ -0,0 +1,69 @@
|
||||
#pragma once
|
||||
#include <dpp/dpp.h>
|
||||
#include <Audio/MusicPlayManager.hpp>
|
||||
#include <functional>
|
||||
|
||||
namespace bumbleBee::commands {
|
||||
class ICommand : public dpp::slashcommand {
|
||||
public:
|
||||
/**
|
||||
* @brief 기본 생성자
|
||||
* @param botID 봇 아이디
|
||||
* @param manager 음악재생 매니저
|
||||
**/
|
||||
ICommand(dpp::snowflake botID, std::shared_ptr<MusicPlayManager> manager) {
|
||||
this->botID = botID;
|
||||
this->musicManager = manager;
|
||||
}
|
||||
/**
|
||||
* @brief 명령어 호출 시에 콜백될 메소드
|
||||
* @param event dpp::slashcommand_t
|
||||
**/
|
||||
virtual void execute(const dpp::slashcommand_t &event){};
|
||||
|
||||
/// @brief 명령어 별명
|
||||
std::vector<std::string> aliases;
|
||||
|
||||
private:
|
||||
/// @brief 봇 ID
|
||||
dpp::snowflake botID;
|
||||
|
||||
protected:
|
||||
/// @brief 음악재생 매니저
|
||||
std::shared_ptr<MusicPlayManager> musicManager;
|
||||
|
||||
protected:
|
||||
/// @brief concrete class에서 구현해야 하는 init 이벤트트
|
||||
virtual void init() = 0;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief 명령어 인자가 없는 명령어의 boilerplate 대체 매크로
|
||||
* @param name 명령어 이름 및 클래스명
|
||||
* @param description 명령어 설명
|
||||
**/
|
||||
#define _DECLARE_BUMBLEBEE_COMMAND(CLASS, NAME, DESCRIPTION) \
|
||||
namespace bumbleBee::commands { \
|
||||
class CLASS : public ICommand { \
|
||||
public: \
|
||||
CLASS (dpp::snowflake botID, std::shared_ptr<MusicPlayManager> manager) \
|
||||
: ICommand(botID, manager) { \
|
||||
name = #NAME; \
|
||||
description = DESCRIPTION; \
|
||||
init(); \
|
||||
} \
|
||||
void execute(const dpp::slashcommand_t &event) override; \
|
||||
\
|
||||
protected: \
|
||||
void init() override; \
|
||||
}; \
|
||||
}
|
||||
|
||||
_DECLARE_BUMBLEBEE_COMMAND(Delete, d, "큐의 해당하는 번호의 노래를 지웁니다")
|
||||
_DECLARE_BUMBLEBEE_COMMAND(Leave, l, "음성 채팅방을 떠납니다")
|
||||
_DECLARE_BUMBLEBEE_COMMAND(Play, p, "노래 재생")
|
||||
_DECLARE_BUMBLEBEE_COMMAND(Queue, q, "노래 예약 큐를 확인합니다")
|
||||
_DECLARE_BUMBLEBEE_COMMAND(Repeat, r, "반복을 켜거나 끕니다")
|
||||
_DECLARE_BUMBLEBEE_COMMAND(Skip, s, "현재 재생중인 곡을 스킵합니다")
|
||||
_DECLARE_BUMBLEBEE_COMMAND(Shuffle, shuffle, "큐를 섞습니다")
|
||||
@@ -1,29 +0,0 @@
|
||||
#pragma once
|
||||
#include <dpp/dpp.h>
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <MusicQueue.hpp>
|
||||
|
||||
namespace commands {
|
||||
class ICommand {
|
||||
public:
|
||||
//이 생성자를 명시적으로 호출할 것.
|
||||
ICommand(std::shared_ptr<dpp::cluster> botCluster);
|
||||
virtual void operator()(const dpp::slashcommand_t &event) = 0;
|
||||
|
||||
std::vector<dpp::slashcommand> commandObjectVector;
|
||||
protected:
|
||||
std::shared_ptr<dpp::cluster> botCluster;
|
||||
};
|
||||
}
|
||||
|
||||
namespace commands {
|
||||
class VCCommand : public ICommand {
|
||||
public:
|
||||
VCCommand(std::shared_ptr<dpp::cluster> botCluster) : ICommand(botCluster) {}
|
||||
|
||||
std::shared_ptr<MusicQueue> getQueue(const dpp::slashcommand_t& event);
|
||||
protected:
|
||||
std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap;
|
||||
};
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
#pragma once
|
||||
#include <Commands/Play.hpp>
|
||||
#include <Commands/Repeat.hpp>
|
||||
#include <Commands/Queue.hpp>
|
||||
#include <Commands/Skip.hpp>
|
||||
#include <Commands/Leave.hpp>
|
||||
#include <Commands/Delete.hpp>
|
||||
@@ -1,13 +0,0 @@
|
||||
#pragma once
|
||||
#include <Commands/CommandType.hpp>
|
||||
#include <BumbleCeepp.hpp>
|
||||
#include <memory>
|
||||
|
||||
namespace commands {
|
||||
class Delete : public VCCommand {
|
||||
public:
|
||||
Delete(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
|
||||
|
||||
void operator()(const dpp::slashcommand_t& event);
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
#pragma once
|
||||
#include <Commands/CommandType.hpp>
|
||||
#include <BumbleCeepp.hpp>
|
||||
#include <memory>
|
||||
|
||||
namespace commands {
|
||||
class Leave : public VCCommand {
|
||||
public:
|
||||
Leave(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
|
||||
|
||||
void operator()(const dpp::slashcommand_t& event);
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
#pragma once
|
||||
#include <Commands/CommandType.hpp>
|
||||
#include <BumbleCeepp.hpp>
|
||||
#include <memory>
|
||||
|
||||
namespace commands {
|
||||
class Play : public VCCommand {
|
||||
public:
|
||||
Play(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
|
||||
|
||||
void operator()(const dpp::slashcommand_t& event);
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
#pragma once
|
||||
#include <Commands/CommandType.hpp>
|
||||
#include <BumbleCeepp.hpp>
|
||||
#include <memory>
|
||||
|
||||
namespace commands {
|
||||
class Queue : public VCCommand {
|
||||
public:
|
||||
Queue(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
|
||||
|
||||
void operator()(const dpp::slashcommand_t& event);
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
#pragma once
|
||||
#include <Commands/CommandType.hpp>
|
||||
#include <BumbleCeepp.hpp>
|
||||
#include <memory>
|
||||
|
||||
namespace commands {
|
||||
class Repeat : public VCCommand {
|
||||
public:
|
||||
Repeat(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
|
||||
|
||||
void operator()(const dpp::slashcommand_t& event);
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
#pragma once
|
||||
#include <Commands/CommandType.hpp>
|
||||
#include <BumbleCeepp.hpp>
|
||||
#include <memory>
|
||||
|
||||
namespace commands {
|
||||
class Skip : public VCCommand {
|
||||
public:
|
||||
Skip(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap);
|
||||
|
||||
void operator()(const dpp::slashcommand_t& event);
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
#pragma once
|
||||
#include <string>
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
struct FQueueElement {
|
||||
std::string URL;
|
||||
std::string title;
|
||||
std::string description;
|
||||
std::string fileName;
|
||||
std::string thumbnail;
|
||||
std::string duration;
|
||||
dpp::embed embed;
|
||||
};
|
||||
@@ -1,33 +0,0 @@
|
||||
#pragma once
|
||||
#include <list>
|
||||
#include <FQueueElement.hpp>
|
||||
|
||||
struct FMusicQueueID {
|
||||
dpp::snowflake guild_id;
|
||||
uint32_t shard_id;
|
||||
};
|
||||
|
||||
class MusicQueue {
|
||||
public:
|
||||
MusicQueue(FMusicQueueID id, std::shared_ptr<dpp::cluster> botCluster);
|
||||
void operator+=(FQueueElement operand);
|
||||
FQueueElement pop(int index);
|
||||
FQueueElement peek(int index);
|
||||
bool empty();
|
||||
void clear();
|
||||
std::list<struct FQueueElement>::iterator begin();
|
||||
std::list<struct FQueueElement>::iterator end();
|
||||
std::size_t size();
|
||||
FMusicQueueID getId();
|
||||
void play();
|
||||
|
||||
void markerCallback();
|
||||
|
||||
bool repeat;
|
||||
private:
|
||||
std::list<struct FQueueElement> queue;
|
||||
std::mutex mutex;
|
||||
std::mutex playMutex;
|
||||
FMusicQueueID id;
|
||||
std::shared_ptr<dpp::cluster> botCluster;
|
||||
};
|
||||
51
include/Queue/MusicQueue.hpp
Normal file
51
include/Queue/MusicQueue.hpp
Normal file
@@ -0,0 +1,51 @@
|
||||
#pragma once
|
||||
#include <memory>
|
||||
#include <functional>
|
||||
#include <condition_variable>
|
||||
#include <list>
|
||||
#include <dpp/dpp.h>
|
||||
#include <Queue/MusicQueueElement.hpp>
|
||||
|
||||
namespace bumbleBee {
|
||||
|
||||
class MusicQueue {
|
||||
public:
|
||||
MusicQueue() {
|
||||
queue = std::list<std::shared_ptr<MusicQueueElement>>();
|
||||
currentPlayingPosition = queue.begin();
|
||||
repeat = true;
|
||||
}
|
||||
void
|
||||
enqueue(std::shared_ptr<MusicQueueElement> Element);
|
||||
std::shared_ptr<MusicQueueElement>
|
||||
dequeue();
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator
|
||||
findById(std::string id);
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator
|
||||
findByIndex(int index);
|
||||
std::shared_ptr<MusicQueueElement>
|
||||
nowplaying();
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator
|
||||
next_music();
|
||||
std::shared_ptr<MusicQueueElement>
|
||||
jump_to_index(int idx);
|
||||
void
|
||||
clear();
|
||||
std::shared_ptr<MusicQueueElement>
|
||||
erase(std::list<std::shared_ptr<MusicQueueElement>>::iterator it);
|
||||
std::pair<std::shared_ptr<std::list<std::shared_ptr<MusicQueueElement>>>, std::list<std::shared_ptr<MusicQueueElement>>::iterator>
|
||||
getQueueCopy();
|
||||
int
|
||||
size();
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator
|
||||
end();
|
||||
|
||||
bool repeat;
|
||||
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator currentPlayingPosition;
|
||||
|
||||
private:
|
||||
std::list<std::shared_ptr<MusicQueueElement>> queue;
|
||||
std::mutex queueMutex;
|
||||
};
|
||||
}
|
||||
20
include/Queue/MusicQueueElement.hpp
Normal file
20
include/Queue/MusicQueueElement.hpp
Normal file
@@ -0,0 +1,20 @@
|
||||
#pragma once
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
namespace bumbleBee {
|
||||
|
||||
class MusicQueueElement {
|
||||
public:
|
||||
MusicQueueElement(
|
||||
std::string id,
|
||||
std::string query,
|
||||
dpp::user issuingUser,
|
||||
dpp::embed embed) :
|
||||
id(id), query(query), issuingUser(issuingUser), embed(embed) {}
|
||||
|
||||
const std::string id;
|
||||
const std::string query;
|
||||
const dpp::user issuingUser;
|
||||
const dpp::embed embed;
|
||||
};
|
||||
}
|
||||
34
include/Settings/SettingsManager.hpp
Normal file
34
include/Settings/SettingsManager.hpp
Normal file
@@ -0,0 +1,34 @@
|
||||
#pragma once
|
||||
#include <dpp/dpp.h>
|
||||
|
||||
#define _DECLARE_DEFAULT_ACCESSER_STATIC_VARIABLE(type, name, Name)\
|
||||
private:\
|
||||
static type name;\
|
||||
public:\
|
||||
static type get##Name() {return name;}\
|
||||
static void set##Name(const type& value) {name = value; saveToFile();}
|
||||
|
||||
namespace bumbleBee {
|
||||
/// @brief 모든 설정은 이 객체를 통해 스태틱하게 제공됨.
|
||||
class SettingsManager {
|
||||
/// @brief 봇 토큰
|
||||
_DECLARE_DEFAULT_ACCESSER_STATIC_VARIABLE(std::string, TOKEN, TOKEN)
|
||||
/// @brief yt-dlp 실행 명령어
|
||||
_DECLARE_DEFAULT_ACCESSER_STATIC_VARIABLE(std::string, YTDLP_CMD, YTDLP_CMD)
|
||||
/// @brief ffmpeg 실행 명령어
|
||||
_DECLARE_DEFAULT_ACCESSER_STATIC_VARIABLE(std::string, FFMPEG_CMD, FFMPEG_CMD)
|
||||
/// @brief 로그레벨
|
||||
_DECLARE_DEFAULT_ACCESSER_STATIC_VARIABLE(dpp::loglevel, LOGLEVEL, LOGLEVEL)
|
||||
/// @brief 이전에 있던 명령을 지우고 등록할지 선택합니다.
|
||||
_DECLARE_DEFAULT_ACCESSER_STATIC_VARIABLE(bool, REGISTER_COMMAND, REGISTER_COMMAND)
|
||||
public:
|
||||
/// @brief 설정 로드하기, 설정은 이 load()를 부르기 전까지는 적절하지 못한 값을 가지고 있음.
|
||||
/// @return 로드 성공 시 true, 실패 시 false 반환.
|
||||
static bool load();
|
||||
/// @brief 설정 변경사항 저장
|
||||
static void saveToFile();
|
||||
/// @brief 토큰이 유효한지 체크합니다.
|
||||
/// @return 유효한 토큰이면 true, 아니면 false를 반환합니다.
|
||||
static bool validateToken();
|
||||
};
|
||||
}
|
||||
56
include/Utils/AsyncDownloadManager.hpp
Normal file
56
include/Utils/AsyncDownloadManager.hpp
Normal file
@@ -0,0 +1,56 @@
|
||||
#pragma once
|
||||
#include <queue>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
#include <condition_variable>
|
||||
#include <dpp/dpp.h>
|
||||
#include <Queue/MusicQueue.hpp>
|
||||
|
||||
namespace bumbleBee {
|
||||
/// @brief 싱글톤 멀티스레딩 다운로드 매니저
|
||||
class [[deprecated]] AsyncDownloadManager {
|
||||
public:
|
||||
static AsyncDownloadManager& getInstance(int worker_count, std::weak_ptr<dpp::cluster> weak_cluster) {
|
||||
static AsyncDownloadManager dl(worker_count);
|
||||
dl.weak_cluster = weak_cluster;
|
||||
return dl;
|
||||
}
|
||||
void enqueue(std::pair<std::string, dpp::message> query) {
|
||||
std::thread th(&bumbleBee::AsyncDownloadManager::enqueueAsyncDL, this, query);
|
||||
th.detach();
|
||||
}
|
||||
void stop() {
|
||||
auto cluster = weak_cluster.lock();
|
||||
cluster->log(dpp::ll_info, "AsyncDownloadManager stop/destructor called.");
|
||||
terminate = true;
|
||||
dlQueueCondition.notify_all();
|
||||
|
||||
for (auto& t : worker_thread) {
|
||||
t.join();
|
||||
}
|
||||
}
|
||||
|
||||
~AsyncDownloadManager(){
|
||||
stop();
|
||||
}
|
||||
|
||||
private:
|
||||
AsyncDownloadManager(int worker_count){
|
||||
worker_thread.reserve(worker_count);
|
||||
terminate = false;
|
||||
for (int i=0; i<worker_count; i++) {
|
||||
worker_thread.emplace_back([this](){this->downloadWorker();});
|
||||
}
|
||||
}
|
||||
|
||||
void enqueueAsyncDL(std::pair<std::string, dpp::message> query);
|
||||
void downloadWorker();
|
||||
|
||||
std::queue<std::pair<std::string, dpp::message>> downloadQueue;
|
||||
std::condition_variable dlQueueCondition;
|
||||
std::mutex dlQueueMutex;
|
||||
std::weak_ptr<dpp::cluster> weak_cluster;
|
||||
std::vector<std::thread> worker_thread;
|
||||
bool terminate;
|
||||
};
|
||||
}
|
||||
46
include/Utils/ConsoleUtils.hpp
Normal file
46
include/Utils/ConsoleUtils.hpp
Normal file
@@ -0,0 +1,46 @@
|
||||
#pragma once
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <queue>
|
||||
#include <regex>
|
||||
#include <boost/process.hpp>
|
||||
|
||||
namespace bumbleBee {
|
||||
class ConsoleUtils {
|
||||
public:
|
||||
/**
|
||||
* @brief 명령어를 쉘에서 실행하고 결과를 EOF 전까지 읽어 \n을 구분자로 토큰화하여 반환합니다
|
||||
* @param cmd 실행할 명령
|
||||
* @param args 아규먼트
|
||||
* @return std::queue<std::string> tokens
|
||||
*/
|
||||
static std::queue<std::string> safe_execute_command(const std::string& cmd, const std::vector<std::string>& args) {
|
||||
std::queue<std::string> tokens;
|
||||
try {
|
||||
boost::process::ipstream output; // 명령의 출력을 받을 스트림
|
||||
boost::process::child c(cmd, boost::process::args(args), boost::process::std_out > output);
|
||||
|
||||
std::string line;
|
||||
while (!output.eof() && std::getline(output, line))
|
||||
tokens.push(line);
|
||||
|
||||
c.wait(); // 프로세스가 종료될 때까지 대기
|
||||
return tokens;
|
||||
} catch (const std::exception& e) {
|
||||
return tokens;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @brief 명령어를 쉘에서 실행하고 결과를 파이프로 연결하여 반환합니다
|
||||
* @param cmd 실행할 명령
|
||||
* @param args 아규먼트
|
||||
* @return FILE* fd
|
||||
*/
|
||||
static FILE* safe_open_pipe(const std::string& cmd, const std::vector<std::string>& args) {
|
||||
boost::process::pipe pipe;
|
||||
boost::process::child c(cmd, boost::process::args(args), boost::process::std_out > pipe);
|
||||
|
||||
return fdopen(pipe.native_source(), "r");
|
||||
}
|
||||
};
|
||||
}
|
||||
77
include/Utils/QueuedMusicListEmbedProvider.hpp
Normal file
77
include/Utils/QueuedMusicListEmbedProvider.hpp
Normal file
@@ -0,0 +1,77 @@
|
||||
#pragma once
|
||||
#include <dpp/dpp.h>
|
||||
#include <Queue/MusicQueueElement.hpp>
|
||||
#include <cmath>
|
||||
|
||||
namespace bumbleBee {
|
||||
class QueuedMusicListEmbedProvider {
|
||||
public:
|
||||
static std::queue<dpp::embed> makeEmbed(std::shared_ptr<std::list<std::shared_ptr<MusicQueueElement>>> queue, std::list<std::shared_ptr<MusicQueueElement>>::iterator np, bool repeat) {
|
||||
std::queue<dpp::embed> returnValue;
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator it = queue->begin();
|
||||
if (queue->size() == 0) {
|
||||
dpp::embed embed = makeEmbedPart(queue, np, repeat, it);
|
||||
returnValue.push(embed);
|
||||
return returnValue;
|
||||
}
|
||||
for (int i = 0; i < std::ceil(queue->size() / 5.0) && it != queue->end(); i++) {
|
||||
dpp::embed embed = makeEmbedPart(queue, np, repeat, it);
|
||||
returnValue.push(embed);
|
||||
}
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
private:
|
||||
static dpp::embed makeEmbedPart(
|
||||
std::shared_ptr<std::list<std::shared_ptr<MusicQueueElement>>> queue,
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator np,
|
||||
bool repeat,
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator &startIter) {
|
||||
dpp::embed embed = dpp::embed()
|
||||
.set_color(dpp::colors::sti_blue);
|
||||
|
||||
if (queue->begin() == queue->end()) {
|
||||
embed
|
||||
.set_title("큐가 비었습니다!")
|
||||
.set_timestamp(time(0));
|
||||
|
||||
if (repeat)
|
||||
embed.add_field(":repeat:","");
|
||||
|
||||
return embed;
|
||||
}
|
||||
|
||||
int startIndex = std::distance(queue->begin(), startIter) + 1;
|
||||
int index = startIndex;
|
||||
|
||||
for (; (index < startIndex + 5) && startIter != queue->end() && index < queue->size()+1; startIter++, index++) { //iter로 순회하면 왠지 모르게 이상한 값을 읽을 때가 있음 이유는 나도 몰?루
|
||||
if (*startIter == *np)
|
||||
embed.add_field (
|
||||
"np",
|
||||
"",
|
||||
true
|
||||
);
|
||||
else
|
||||
embed.add_field (
|
||||
std::to_string(index),
|
||||
"",
|
||||
true
|
||||
);
|
||||
embed.add_field (
|
||||
(*startIter)->embed.title,
|
||||
(*startIter)->embed.description,
|
||||
true
|
||||
)
|
||||
.add_field("","");
|
||||
}
|
||||
|
||||
if (startIter == queue->end() || index >= queue->size()+1) {
|
||||
embed.set_timestamp(time(0));
|
||||
if (repeat)
|
||||
embed.add_field(":repeat:","");
|
||||
}
|
||||
|
||||
return embed;
|
||||
}
|
||||
};
|
||||
}
|
||||
83
include/Utils/VersionsCheckUtils.hpp
Normal file
83
include/Utils/VersionsCheckUtils.hpp
Normal file
@@ -0,0 +1,83 @@
|
||||
#pragma once
|
||||
#include <dpp/dpp.h>
|
||||
#include "ConsoleUtils.hpp"
|
||||
#include "../Settings/SettingsManager.hpp"
|
||||
|
||||
namespace bumbleBee {
|
||||
class VersionsCheckUtils {
|
||||
public:
|
||||
static bool isThereCMD(std::shared_ptr<dpp::cluster> cluster, std::string cmd) {
|
||||
if (ConsoleUtils::safe_execute_command("/usr/bin/which", {cmd}).size() == 0) {
|
||||
cluster->log(dpp::ll_error, cmd + " is unavaliable. unresolable error please install " + cmd);
|
||||
return false;
|
||||
}
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
static void validateFFMPEG(std::shared_ptr<dpp::cluster> cluster) {
|
||||
std::queue<std::string> result = ConsoleUtils::safe_execute_command(SettingsManager::getFFMPEG_CMD(), {"-version"});
|
||||
std::string front = result.front();
|
||||
if (front[0] != 'f' ||
|
||||
front[1] != 'f' ||
|
||||
front[2] != 'm' ||
|
||||
front[3] != 'p' ||
|
||||
front[4] != 'e' ||
|
||||
front[5] != 'g') {
|
||||
cluster->log(dpp::ll_warning, "ffmpeg is unavailable. downloading ffmpeg...");
|
||||
|
||||
if (!isThereCMD(cluster, "curl")) {
|
||||
exit(1);
|
||||
}
|
||||
if (!isThereCMD(cluster, "tar")) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
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/bin/ffmpeg .");
|
||||
system("rm -rf ffmpeg-master-latest-linux64-gpl");
|
||||
SettingsManager::setFFMPEG_CMD("./ffmpeg");
|
||||
}
|
||||
}
|
||||
|
||||
static void validateYTDLP(std::shared_ptr<dpp::cluster> cluster) {
|
||||
std::queue<std::string> result = ConsoleUtils::safe_execute_command(SettingsManager::getYTDLP_CMD(), {"--version"});
|
||||
std::string front = result.front();
|
||||
if ((front[0]-'0' < 0 || front[0]-'0' > 9) ||
|
||||
(front[1]-'0' < 0 || front[1]-'0' > 9) ||
|
||||
(front[2]-'0' < 0 || front[2]-'0' > 9) ||
|
||||
(front[3]-'0' < 0 || front[3]-'0' > 9)) {
|
||||
cluster->log(dpp::ll_warning, "ytdlp is unavailable. downloading ytdlp...");
|
||||
|
||||
if (!isThereCMD(cluster, "curl")) {
|
||||
exit(1);
|
||||
}
|
||||
if (!isThereCMD(cluster, "tar")) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
system("curl -LO https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp");
|
||||
system("chmod +x ./yt-dlp");
|
||||
SettingsManager::setYTDLP_CMD("./yt-dlp");
|
||||
}
|
||||
}
|
||||
|
||||
static void validateYTDLPFFMPEGBinary(std::shared_ptr<dpp::cluster> cluster) {
|
||||
cluster->log(dpp::ll_info, "Checking if yt-dlp and ffmpeg is available...");
|
||||
validateFFMPEG(cluster);
|
||||
validateYTDLP(cluster);
|
||||
}
|
||||
|
||||
static void updateytdlp(std::shared_ptr<dpp::cluster> cluster) {
|
||||
cluster->log(dpp::ll_info, "Checking if yt-dlp update is available...");
|
||||
std::queue<std::string> result = ConsoleUtils::safe_execute_command("./yt-dlp", {"-U"});
|
||||
while(!result.empty()) {
|
||||
std::string front = result.front();
|
||||
result.pop();
|
||||
cluster->log(dpp::ll_info, front);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
138
src/Audio/MusicPlayManager.cpp
Normal file
138
src/Audio/MusicPlayManager.cpp
Normal file
@@ -0,0 +1,138 @@
|
||||
#include <Audio/MusicPlayManager.hpp>
|
||||
#include <ogg/ogg.h>
|
||||
#include <oggz/oggz.h>
|
||||
#include <algorithm>
|
||||
#include <Settings/SettingsManager.hpp>
|
||||
|
||||
namespace bumbleBee {
|
||||
|
||||
void MusicPlayManager::on_voice_ready(const dpp::voice_ready_t& event) {
|
||||
play(event.voice_client);
|
||||
}
|
||||
|
||||
void MusicPlayManager::on_voice_track_marker(const dpp::voice_track_marker_t& event) {
|
||||
dpp::snowflake gid = dpp::find_channel(event.voice_client->channel_id)->guild_id;
|
||||
queueMap[gid]->next_music(); // TODO("repeat가 꺼져 있을 때 노래 큐에서 지우기")
|
||||
play(event.voice_client);
|
||||
}
|
||||
|
||||
void MusicPlayManager::on_voice_client_disconnect(const dpp::voice_client_disconnect_t& event) { // 이거 봇이 나갈 때가 아니고 같이 있는 유저가 나갈 때였고
|
||||
// dpp::snowflake gid = dpp::find_channel(event.voice_client->channel_id)->guild_id;
|
||||
// event.voice_client->stop_audio();
|
||||
// queueMap[gid]->clear();
|
||||
}
|
||||
|
||||
void MusicPlayManager::play(dpp::discord_voice_client* client) {
|
||||
std::thread t([&](dpp::discord_voice_client* client){
|
||||
dpp::snowflake gid = dpp::find_channel(client->channel_id)->guild_id;
|
||||
std::unique_lock<std::mutex> queueEmptyLock(*queueEmptyMutex[gid]);
|
||||
|
||||
queuedCondition.wait(queueEmptyLock, [&]{
|
||||
return queueMap[gid]->size() != 0 && queueMap[gid]->currentPlayingPosition != queueMap[gid]->end();
|
||||
});
|
||||
|
||||
auto next = queueMap[gid]->currentPlayingPosition;
|
||||
send_audio_to_voice(*next, client);
|
||||
}, client);
|
||||
t.detach();
|
||||
}
|
||||
|
||||
void MusicPlayManager::queue_music(const dpp::snowflake guildId, const std::shared_ptr<MusicQueueElement> music) {
|
||||
queueMap[guildId]->enqueue(music);
|
||||
}
|
||||
|
||||
void MusicPlayManager::clear(const dpp::snowflake guildId) {
|
||||
queueMap[guildId]->clear();
|
||||
}
|
||||
std::shared_ptr<MusicQueueElement> MusicPlayManager::remove(const dpp::snowflake guildId, dpp::discord_voice_client* client, int index) {
|
||||
auto queue = queueMap[guildId];
|
||||
auto foundIterator = queue->findByIndex(index);
|
||||
|
||||
if (queue->currentPlayingPosition == foundIterator) {
|
||||
auto removed = queue->erase(queue->findByIndex(0));
|
||||
if (client == nullptr)
|
||||
return removed;
|
||||
client->pause_audio(true);
|
||||
client->stop_audio();
|
||||
client->pause_audio(false);
|
||||
client->insert_marker("end");
|
||||
return removed;
|
||||
}
|
||||
|
||||
return queue->erase(queue->findByIndex(index));
|
||||
}
|
||||
int MusicPlayManager::size(const dpp::snowflake guildId) {
|
||||
return queueMap[guildId]->size();
|
||||
}
|
||||
void MusicPlayManager::setRepeat(const dpp::snowflake guildId, const bool value) {
|
||||
queueMap[guildId]->repeat = value;
|
||||
}
|
||||
|
||||
bool MusicPlayManager::getRepeat(const dpp::snowflake guildId) {
|
||||
return queueMap[guildId]->repeat;
|
||||
}
|
||||
|
||||
std::pair<std::shared_ptr<std::list<std::shared_ptr<MusicQueueElement>>>, std::list<std::shared_ptr<MusicQueueElement>>::iterator>
|
||||
MusicPlayManager::getQueue(const dpp::snowflake guildId){
|
||||
auto returnValue = queueMap[guildId]->getQueueCopy();
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
MusicQueueElement MusicPlayManager::getNowPlaying(const dpp::snowflake guildId) {
|
||||
std::shared_ptr<MusicQueueElement> nowplaying = queueMap[guildId]->nowplaying();
|
||||
if (nowplaying == nullptr)
|
||||
return MusicQueueElement("", "", dpp::user(), dpp::embed());
|
||||
MusicQueueElement returnValue(*nowplaying);
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
void MusicPlayManager::send_audio_to_voice(std::shared_ptr<bumbleBee::MusicQueueElement> music, dpp::discord_voice_client* client) {
|
||||
std::thread t([](std::shared_ptr<bumbleBee::MusicQueueElement> music, dpp::discord_voice_client* client) { // TODO: thread 벡터 만들고 delete, leave, skip시에 전송 중지하도록 만들고. 또 노래 캐싱하고 ytdlp를 버퍼링하여 혹시 있을지 모르는 음성의 끊김을 방지할 것것
|
||||
std::string command = "./streamOpus.sh ";
|
||||
command += SettingsManager::getYTDLP_CMD() + " ";
|
||||
command += SettingsManager::getFFMPEG_CMD() + " ";
|
||||
command += "https://youtu.be/";
|
||||
command += music->id;
|
||||
|
||||
OGGZ* og = oggz_open_stdio(popen(command.c_str(), "r"), OGGZ_READ);
|
||||
|
||||
// client->stop_audio(); //이거 필요함??
|
||||
|
||||
oggz_set_read_callback(
|
||||
og, -1,
|
||||
[](OGGZ *oggz, oggz_packet *packet, long serialno, void *user_data) {
|
||||
auto voiceConn = (dpp::discord_voice_client *)user_data;
|
||||
|
||||
voiceConn->send_audio_opus(packet->op.packet, packet->op.bytes);
|
||||
|
||||
return 0;
|
||||
},
|
||||
(void *)client
|
||||
);
|
||||
|
||||
while (client && !client->terminating && music != nullptr) {
|
||||
static const constexpr long CHUNK_READ = BUFSIZ * 2;
|
||||
|
||||
const long read_bytes = oggz_read(og, CHUNK_READ);
|
||||
|
||||
/* break on eof */
|
||||
if (!read_bytes) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (music != nullptr)
|
||||
client->creator->log(dpp::ll_info, "Sending " + music->embed.title + " - " + music->id + " complete!");
|
||||
else {
|
||||
client->stop_audio();
|
||||
client->pause_audio(true);
|
||||
}
|
||||
|
||||
oggz_close(og);
|
||||
|
||||
client->insert_marker();
|
||||
}, music, client);
|
||||
t.detach();
|
||||
}
|
||||
}
|
||||
|
||||
42
src/Bot.cpp
42
src/Bot.cpp
@@ -1,42 +0,0 @@
|
||||
#include <Bot.hpp>
|
||||
#include <Commands/CommandType.hpp>
|
||||
|
||||
IBot::IBot(std::string token, int totalShard)
|
||||
{
|
||||
botCluster = std::make_shared<dpp::cluster>(token, dpp::i_default_intents, totalShard);
|
||||
botCluster->on_log(dpp::utility::cout_logger());
|
||||
|
||||
botCluster->on_slashcommand([this](const dpp::slashcommand_t& event){onCommand(event);});
|
||||
botCluster->on_ready([this](const dpp::ready_t &event){onReady(event);});
|
||||
}
|
||||
|
||||
void IBot::onCommand(const dpp::slashcommand_t &event)
|
||||
{
|
||||
auto _event = event;
|
||||
for (int i = 0; i < commandsArray.size(); i++) {
|
||||
for (auto alias : commandsArray[i]->commandObjectVector) {
|
||||
if (event.command.get_command_name() == alias.name) {
|
||||
(*commandsArray[i])(_event);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void IBot::onReady(const dpp::ready_t &event)
|
||||
{
|
||||
if (!dpp::run_once<struct register_bot_commands>())
|
||||
return;
|
||||
|
||||
//BotCluster->global_bulk_command_delete();
|
||||
|
||||
for (int i = 0; i < commandsArray.size(); i++) {
|
||||
for (auto Alias : commandsArray[i]->commandObjectVector) {
|
||||
botCluster->global_command_create(Alias);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void IBot::start()
|
||||
{
|
||||
botCluster->start(dpp::st_wait);
|
||||
}
|
||||
80
src/BumbleBee.cpp
Normal file
80
src/BumbleBee.cpp
Normal file
@@ -0,0 +1,80 @@
|
||||
#include <BumbleBee.hpp>
|
||||
#include <memory>
|
||||
#include <Settings/SettingsManager.hpp>
|
||||
#include <Utils/VersionsCheckUtils.hpp>
|
||||
#include <Audio/MusicPlayManager.hpp>
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
|
||||
namespace bumbleBee{
|
||||
BumbleBee::BumbleBee() {
|
||||
if (!SettingsManager::load()) {
|
||||
std::cout << "Please configure confing.json" << std::endl;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
cluster = std::make_shared<dpp::cluster>(SettingsManager::getTOKEN());
|
||||
|
||||
cluster->on_log([](const dpp::log_t& event) {
|
||||
if (event.severity >= SettingsManager::getLOGLEVEL()) {
|
||||
std::cout << "[" << dpp::utility::current_date_time() << "] " << dpp::utility::loglevel(event.severity) << ": " << event.message << std::endl;
|
||||
}
|
||||
});
|
||||
cluster->on_slashcommand([this](const dpp::slashcommand_t& event){on_slashcommand(event);});
|
||||
cluster->on_ready([this](const dpp::ready_t &event){on_ready(event);});
|
||||
|
||||
VersionsCheckUtils::validateYTDLPFFMPEGBinary(cluster);
|
||||
VersionsCheckUtils::updateytdlp(cluster);
|
||||
}
|
||||
|
||||
void BumbleBee::start() { this->cluster->start(dpp::st_wait); }
|
||||
|
||||
void BumbleBee::on_slashcommand(const dpp::slashcommand_t &event) {
|
||||
if (commands.find(event.command.get_command_name()) != commands.end()) {
|
||||
event.thinking();
|
||||
auto command = commands.at(event.command.get_command_name());
|
||||
std::thread t([](const dpp::slashcommand_t &event, std::shared_ptr<commands::ICommand> command){
|
||||
command->execute(event);
|
||||
}, event, command);
|
||||
t.detach();
|
||||
}
|
||||
}
|
||||
|
||||
void BumbleBee::on_ready(const dpp::ready_t &event) {
|
||||
GIDs = event.guilds;
|
||||
musicManager = std::make_shared<MusicPlayManager>(cluster, GIDs);
|
||||
|
||||
commands["d"] = std::make_shared<commands::Delete> (cluster->cluster_id, musicManager);
|
||||
commands["l"] = std::make_shared<commands::Leave> (cluster->cluster_id, musicManager);
|
||||
commands["p"] = std::make_shared<commands::Play> (cluster->cluster_id, musicManager);
|
||||
commands["q"] = std::make_shared<commands::Queue> (cluster->cluster_id, musicManager);
|
||||
commands["r"] = std::make_shared<commands::Repeat> (cluster->cluster_id, musicManager);
|
||||
commands["s"] = std::make_shared<commands::Skip> (cluster->cluster_id, musicManager);
|
||||
commands["shuffle"] = std::make_shared<commands::Shuffle> (cluster->cluster_id, musicManager);
|
||||
|
||||
if (event.guilds.size() == 0) {
|
||||
cluster->log(dpp::loglevel::ll_info, "Bot is not on any server! Please invite this bot to any server.");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (dpp::run_once<struct register_bot_commands>()) {
|
||||
if (SettingsManager::getREGISTER_COMMAND()) {
|
||||
cluster->log(dpp::loglevel::ll_info, "Clear Pre-installed commands");
|
||||
|
||||
cluster->global_bulk_command_create({
|
||||
*commands["d"],
|
||||
*commands["l"],
|
||||
*commands["p"],
|
||||
*commands["q"],
|
||||
*commands["r"],
|
||||
*commands["s"],
|
||||
*commands["shuffle"]
|
||||
}, [&](const dpp::confirmation_callback_t &t){
|
||||
cluster->log(dpp::loglevel::ll_info, "Command created.");
|
||||
SettingsManager::setREGISTER_COMMAND(false);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
cluster->log(dpp::loglevel::ll_info, "Bot ready.");
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
#include "BumbleCeepp.hpp"
|
||||
#include <string>
|
||||
#include <FQueueElement.hpp>
|
||||
#include <Commands/Commands.hpp>
|
||||
|
||||
BumbleCeepp::BumbleCeepp(std::string token, int totalShard)
|
||||
: IBot(token, totalShard)
|
||||
{
|
||||
commandsArray.push_back(std::make_shared<commands::Play>(botCluster, &queueMap));
|
||||
commandsArray.push_back(std::make_shared<commands::Repeat>(botCluster, &queueMap));
|
||||
commandsArray.push_back(std::make_shared<commands::Queue>(botCluster, &queueMap));
|
||||
commandsArray.push_back(std::make_shared<commands::Skip>(botCluster, &queueMap));
|
||||
commandsArray.push_back(std::make_shared<commands::Leave>(botCluster, &queueMap));
|
||||
commandsArray.push_back(std::make_shared<commands::Delete>(botCluster, &queueMap));
|
||||
|
||||
std::cout << "Command added.\n";
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
#include <Commands/CommandType.hpp>
|
||||
|
||||
commands::ICommand::ICommand(std::shared_ptr<dpp::cluster> botCluster)
|
||||
{
|
||||
this->botCluster = botCluster;
|
||||
}
|
||||
|
||||
std::shared_ptr<MusicQueue> commands::VCCommand::getQueue(const dpp::slashcommand_t& event) {
|
||||
auto findResult = queueMap->find(event.command.guild_id);
|
||||
if (findResult == queueMap->end())
|
||||
{
|
||||
FMusicQueueID queueID;
|
||||
queueID.guild_id = event.command.guild_id;
|
||||
queueID.shard_id = event.from->shard_id;
|
||||
|
||||
(*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID, botCluster);
|
||||
}
|
||||
return queueMap->find(event.command.guild_id)->second;
|
||||
}
|
||||
@@ -1,62 +1,32 @@
|
||||
#include <Commands/Delete.hpp>
|
||||
#include <iostream>
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
#include <format>
|
||||
|
||||
commands::Delete::Delete(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
|
||||
: VCCommand(botCluster)
|
||||
{
|
||||
this->queueMap = queueMap;
|
||||
dpp::slashcommand Command = dpp::slashcommand("d", "큐의 해당하는 번호의 노래를 지웁니다", botCluster->me.id);
|
||||
namespace bumbleBee::commands {
|
||||
void Delete::execute(const dpp::slashcommand_t &event) {
|
||||
int pos = std::get<std::int64_t>(event.get_parameter("pos"));
|
||||
|
||||
Command.add_option(
|
||||
dpp::command_option(dpp::co_string, "pos", "큐 번호", botCluster->me.id)
|
||||
);
|
||||
|
||||
commandObjectVector.push_back(Command);
|
||||
}
|
||||
|
||||
void commands::Delete::operator()(const dpp::slashcommand_t& event)
|
||||
{
|
||||
if (std::holds_alternative<std::monostate>(event.get_parameter("pos"))) {
|
||||
event.reply("삭제할 노래의 인덱스가 정확하지 않습니다.");
|
||||
return;
|
||||
}
|
||||
std::string Pos = std::get<std::string>(event.get_parameter("pos"));
|
||||
event.thinking();
|
||||
|
||||
std::shared_ptr<MusicQueue> queue = getQueue(event);
|
||||
|
||||
auto index = atoi(Pos.c_str());
|
||||
|
||||
int queueSize = queue->size();
|
||||
|
||||
std::cout << "queue size : " << queueSize << "\n";
|
||||
|
||||
if (index < 0 || (queueSize - 1) < index) {
|
||||
std::cout << "invalid index : " << index << ", " + Pos + "\n";
|
||||
|
||||
event.edit_original_response(dpp::message(event.command.channel_id, "이상한 인덱스 위치. Pos : " + Pos));
|
||||
return;
|
||||
}
|
||||
|
||||
auto PopedElement = queue->pop(index);
|
||||
|
||||
dpp::embed embed = PopedElement.embed
|
||||
.set_timestamp(time(0));
|
||||
|
||||
dpp::message msg(event.command.channel_id, "다음 항목을 큐에서 삭제했습니다!:");
|
||||
|
||||
if (atoi(Pos.c_str()) == 0) {
|
||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
||||
|
||||
if (!v || !v->voiceclient || !v->voiceclient->is_ready()) {
|
||||
if (pos < 0 || pos > musicManager->size(event.command.guild_id))
|
||||
{
|
||||
event.edit_original_response(dpp::message(std::string("이상한 인덱스 위치. Pos :") + std::to_string(pos)));
|
||||
return;
|
||||
}
|
||||
|
||||
v->voiceclient->stop_audio();
|
||||
v->voiceclient->insert_marker("end of music");
|
||||
}
|
||||
|
||||
msg.add_embed(embed);
|
||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
||||
|
||||
event.edit_original_response(msg);
|
||||
std::shared_ptr<MusicQueueElement> removed;
|
||||
|
||||
if (!v) // v-> 로 nullptr을 참조하면 안 되므로.
|
||||
removed = musicManager->remove(event.command.guild_id, nullptr, pos);
|
||||
else
|
||||
removed = musicManager->remove(event.command.guild_id, v->voiceclient, pos);
|
||||
|
||||
dpp::message msg("다음 항목을 큐에서 삭제했습니다!:");
|
||||
msg.add_embed(removed->embed);
|
||||
|
||||
event.edit_original_response(msg);
|
||||
}
|
||||
|
||||
void Delete::init() {
|
||||
add_option(dpp::command_option(dpp::co_integer, "pos", "지울 위치(위치는 1부터 시작, 현재 재생곡은 0)", true));
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,23 @@
|
||||
#include <Commands/Leave.hpp>
|
||||
#include <iostream>
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
|
||||
commands::Leave::Leave(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
|
||||
: VCCommand(botCluster)
|
||||
{
|
||||
this->queueMap = queueMap;
|
||||
dpp::slashcommand command = dpp::slashcommand("l", "음챗을 떠납니다", botCluster->me.id);
|
||||
namespace bumbleBee::commands {
|
||||
void Leave::execute(const dpp::slashcommand_t &event) {
|
||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
||||
|
||||
commandObjectVector.push_back(command);
|
||||
}
|
||||
if (!v || !v->voiceclient || !v->voiceclient->is_ready()) {
|
||||
event.edit_original_response(dpp::message("현재 음성 채팅방에 있는 상태가 아닙니다!"));
|
||||
return;
|
||||
}
|
||||
musicManager->clear(event.command.guild_id);
|
||||
|
||||
v->voiceclient->stop_audio();
|
||||
v->voiceclient->pause_audio(true);
|
||||
event.from->clear_queue();
|
||||
event.from->disconnect_voice(event.command.guild_id);
|
||||
|
||||
void commands::Leave::operator()(const dpp::slashcommand_t& event)
|
||||
{
|
||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
||||
|
||||
if (!v || !v->voiceclient || !v->voiceclient->is_ready()) {
|
||||
return;
|
||||
event.edit_original_response(dpp::message("음성 채팅방을 떠납니다!"));
|
||||
}
|
||||
v->voiceclient->stop_audio();
|
||||
|
||||
std::shared_ptr<MusicQueue> queue = getQueue(event);
|
||||
|
||||
queue->clear();
|
||||
event.from->disconnect_voice(event.command.guild_id);
|
||||
|
||||
dpp::message msg(event.command.channel_id, "음성 채팅방을 떠납니다!");
|
||||
|
||||
event.reply(msg);
|
||||
void Leave::init() {
|
||||
}
|
||||
}
|
||||
@@ -1,126 +1,240 @@
|
||||
#include <Commands/Play.hpp>
|
||||
#include <dpp/dpp.h>
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
#include <Utils/ConsoleUtils.hpp>
|
||||
#include <Settings/SettingsManager.hpp>
|
||||
#include <dpp/nlohmann/json.hpp>
|
||||
#include <string>
|
||||
#include <filesystem>
|
||||
#include <ctime>
|
||||
#include <Utils/QueuedMusicListEmbedProvider.hpp>
|
||||
#include <Utils/ConsoleUtils.hpp>
|
||||
#include <variant>
|
||||
|
||||
using json = nlohmann::json;
|
||||
namespace bumbleBee::commands {
|
||||
void Play::execute(const dpp::slashcommand_t &event) { // TODO : 길드 단위로 잠구고 메타데이터 로딩 중엔 로딩 중임을 표시할 수 있는 UI 만들 것것
|
||||
dpp::guild *g = dpp::find_guild(event.command.guild_id);
|
||||
|
||||
commands::Play::Play(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
|
||||
: VCCommand(botCluster)
|
||||
{
|
||||
this->queueMap = queueMap;
|
||||
dpp::slashcommand command = dpp::slashcommand("p", "노래 재생", botCluster->me.id);
|
||||
|
||||
command.add_option(
|
||||
dpp::command_option(dpp::co_string, "query", "링크 또는 검색어", botCluster->me.id)
|
||||
);
|
||||
|
||||
commandObjectVector.push_back(command);
|
||||
}
|
||||
|
||||
void commands::Play::operator()(const dpp::slashcommand_t& event)
|
||||
{
|
||||
if (std::holds_alternative<std::monostate>(event.get_parameter("query")))
|
||||
{
|
||||
event.reply("노래를 재생하려면 검색어 또는 링크를 입력해 주십시오.");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Attempt to connect to a voice channel, returns false if we fail to connect. */
|
||||
if (!event.from->get_voice(event.command.guild_id))
|
||||
{
|
||||
if (!dpp::find_guild(event.command.guild_id)->connect_member_voice(event.command.get_issuing_user().id))
|
||||
{
|
||||
return event.reply("노래를 재생할 음성 채팅방에 먼저 참가하고 신청해야 합니다!");
|
||||
if (!g) { //wtf?
|
||||
event.edit_original_response(dpp::message("GUILD NOT FOUND!! WHAT IS THIS SORCERY??"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (std::holds_alternative<std::monostate>(event.get_parameter("query"))) // 이거 필요한가???
|
||||
{
|
||||
event.reply("노래를 재생하려면 검색어 또는 링크를 입력해 주십시오.");
|
||||
return;
|
||||
}
|
||||
if (!event.from->get_voice(event.command.guild_id) && !g->connect_member_voice(event.command.usr.id)) {
|
||||
event.edit_original_response(dpp::message("노래를 재생할 음성 채팅방에 먼저 참가하고 신청해야 합니다!"));
|
||||
return;
|
||||
}
|
||||
std::string query = std::get<std::string>(event.get_parameter("query"));
|
||||
// query = "\"" + query + "\"";
|
||||
|
||||
std::string Query = std::get<std::string>(event.get_parameter("query"));
|
||||
std::queue<std::string> ids =
|
||||
ConsoleUtils::safe_execute_command(
|
||||
SettingsManager::getYTDLP_CMD(), {
|
||||
"--default-search",
|
||||
"ytsearch",
|
||||
"--flat-playlist",
|
||||
"--skip-download",
|
||||
"--quiet",
|
||||
"--ignore-errors",
|
||||
"--print",
|
||||
"id",
|
||||
query});
|
||||
|
||||
event.thinking();
|
||||
std::queue<std::shared_ptr<MusicQueueElement>> musics;
|
||||
|
||||
std::shared_ptr<MusicQueue> queue = getQueue(event);
|
||||
int initialQueuedCount = musicManager->size(event.command.guild_id);
|
||||
|
||||
std::cout << "다운로드 시작" << "\n";
|
||||
std::system(("python3 yt-download.py \"" + Query + "\" & wait").c_str());
|
||||
std::cout << "다운로드 완료" << "\n";
|
||||
dpp::message msg;
|
||||
|
||||
dpp::message msg(event.command.channel_id, "큐에 다음 곡을 추가했습니다:");
|
||||
if (musicManager->size(event.command.guild_id) == 0)
|
||||
msg.content = "다음 곡을 재생합니다:";
|
||||
else
|
||||
msg.content = "큐에 다음 곡을 추가했습니다:";
|
||||
|
||||
std::ifstream infofile, idfile;
|
||||
json document;
|
||||
std::string ID;
|
||||
std::queue<FQueueElement> RequestedMusic;
|
||||
idfile.open("Temp/CurMusic");
|
||||
while (std::getline(idfile, ID))
|
||||
{
|
||||
std::cout << ID << "\n";
|
||||
infofile.open("Music/" + ID + ".info.json");
|
||||
infofile >> document;
|
||||
infofile.close();
|
||||
if (!ids.empty()) { // TODO : 이거 멀티스레드로 바꿔서 더 빨리 정보를 받아올 수 있도록 개선할 것것
|
||||
if (ids.front() == "") {
|
||||
ids.pop();
|
||||
}
|
||||
|
||||
time_t SongLength = int(document["duration"]);
|
||||
char SongLengthStr[10];
|
||||
tm t;
|
||||
t.tm_mday = SongLength / 86400;
|
||||
t.tm_hour = (SongLength % 86400)/3600;
|
||||
t.tm_min = (SongLength % 3600)/60;
|
||||
t.tm_sec = SongLength%60;
|
||||
strftime(SongLengthStr, sizeof(SongLengthStr), "%X", &t);
|
||||
std::string jsonData = ConsoleUtils::safe_execute_command(SettingsManager::getYTDLP_CMD(), {
|
||||
"--default-search",
|
||||
"ytsearch",
|
||||
"--flat-playlist",
|
||||
"--skip-download",
|
||||
"--quiet",
|
||||
"--ignore-errors",
|
||||
"-J",
|
||||
"http://youtu.be/" + ids.front()
|
||||
}).front();
|
||||
|
||||
FQueueElement Data = {
|
||||
std::string(document["webpage_url"]),
|
||||
std::string(document["title"]),
|
||||
std::string(document["uploader"]),
|
||||
std::string(document["id"]),
|
||||
std::string(document["thumbnail"]),
|
||||
to_string(document["duration"]),
|
||||
dpp::embed()
|
||||
std::istringstream iss(jsonData);
|
||||
nlohmann::json videoDataJson;
|
||||
iss >> videoDataJson;
|
||||
|
||||
time_t SongLength = int(videoDataJson["duration"]);
|
||||
char SongLengthStr[13];
|
||||
tm t;
|
||||
t.tm_mday = SongLength / 86400;
|
||||
t.tm_hour = (SongLength % 86400)/3600;
|
||||
t.tm_min = (SongLength % 3600)/60;
|
||||
t.tm_sec = SongLength%60;
|
||||
if (t.tm_mday > 0)
|
||||
strftime(SongLengthStr, sizeof(SongLengthStr), "%d:%H:%M:%S", &t);
|
||||
else if (t.tm_hour > 0)
|
||||
strftime(SongLengthStr, sizeof(SongLengthStr), "%H:%M:%S", &t);
|
||||
else
|
||||
strftime(SongLengthStr, sizeof(SongLengthStr), "%M:%S", &t);
|
||||
|
||||
dpp::embed embed = dpp::embed()
|
||||
.set_color(dpp::colors::sti_blue)
|
||||
.set_title(Data.title)
|
||||
.set_description(Data.description)
|
||||
.set_url(Data.URL)
|
||||
.set_image(Data.thumbnail)
|
||||
.set_title(std::string(videoDataJson["title"]))
|
||||
.set_description(std::string(videoDataJson["uploader"]))
|
||||
.set_url(std::string(videoDataJson["webpage_url"]))
|
||||
.set_image(std::string(videoDataJson["thumbnail"]))
|
||||
.add_field(
|
||||
"길이",
|
||||
SongLengthStr,
|
||||
true
|
||||
)
|
||||
};
|
||||
);
|
||||
|
||||
(*queue) += Data;
|
||||
musics.push(std::make_shared<MusicQueueElement>(ids.front(), query, event.command.usr, embed));
|
||||
ids.pop();
|
||||
}
|
||||
|
||||
RequestedMusic.push(Data);
|
||||
}
|
||||
idfile.close();
|
||||
std::system("rm -f Temp/CurMusic");
|
||||
std::cout << "queued\n";
|
||||
if (!ids.empty()) {
|
||||
std::thread t([](
|
||||
std::queue<std::string> ids,
|
||||
dpp::snowflake guildId,
|
||||
dpp::snowflake channelId,
|
||||
std::string query,
|
||||
dpp::user user,
|
||||
dpp::cluster* cluster,
|
||||
std::shared_ptr<MusicPlayManager> manager
|
||||
) {
|
||||
while (!ids.empty()) {
|
||||
if (ids.front() == "") {
|
||||
ids.pop();
|
||||
continue;
|
||||
}
|
||||
|
||||
msg.add_embed(RequestedMusic.front().embed);
|
||||
RequestedMusic.pop();
|
||||
event.edit_original_response(msg);
|
||||
std::string jsonData = ConsoleUtils::safe_execute_command(SettingsManager::getYTDLP_CMD(), {
|
||||
"--default-search",
|
||||
"ytsearch",
|
||||
"--flat-playlist",
|
||||
"--skip-download",
|
||||
"--quiet",
|
||||
"--ignore-errors",
|
||||
"-J",
|
||||
"http://youtu.be/" + ids.front()
|
||||
}).front();
|
||||
|
||||
std::istringstream iss(jsonData);
|
||||
nlohmann::json videoDataJson;
|
||||
iss >> videoDataJson;
|
||||
|
||||
while (!RequestedMusic.empty())
|
||||
{
|
||||
dpp::message followMsg(event.command.channel_id, "");
|
||||
time_t SongLength = int(videoDataJson["duration"]);
|
||||
char SongLengthStr[13];
|
||||
tm t;
|
||||
t.tm_mday = SongLength / 86400;
|
||||
t.tm_hour = (SongLength % 86400)/3600;
|
||||
t.tm_min = (SongLength % 3600)/60;
|
||||
t.tm_sec = SongLength%60;
|
||||
if (t.tm_mday > 0)
|
||||
strftime(SongLengthStr, sizeof(SongLengthStr), "%d:%H:%M:%S", &t);
|
||||
else if (t.tm_hour > 0)
|
||||
strftime(SongLengthStr, sizeof(SongLengthStr), "%H:%M:%S", &t);
|
||||
else
|
||||
strftime(SongLengthStr, sizeof(SongLengthStr), "%M:%S", &t);
|
||||
|
||||
followMsg.add_embed(RequestedMusic.front().embed);
|
||||
RequestedMusic.pop();
|
||||
dpp::embed embed = dpp::embed()
|
||||
.set_color(dpp::colors::sti_blue)
|
||||
.set_title(std::string(videoDataJson["title"]))
|
||||
.set_description(std::string(videoDataJson["uploader"]))
|
||||
.set_url(std::string(videoDataJson["webpage_url"]))
|
||||
.set_image(std::string(videoDataJson["thumbnail"]))
|
||||
.add_field(
|
||||
"길이",
|
||||
SongLengthStr,
|
||||
true
|
||||
);
|
||||
|
||||
botCluster->message_create(followMsg);
|
||||
}
|
||||
std::cout << "replied\n";
|
||||
auto music = std::make_shared<MusicQueueElement>(ids.front(), query, user, embed);
|
||||
|
||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
||||
cluster->log(dpp::ll_info, "Enqueuing " + music->embed.title + " - " + music->id);
|
||||
manager->queue_music(guildId, music);
|
||||
ids.pop();
|
||||
}
|
||||
|
||||
/* If the voice channel was invalid, or there is an issue with it, then tell the user. */
|
||||
if (v && v->voiceclient && v->voiceclient->is_ready())
|
||||
{
|
||||
queue->play();
|
||||
std::mutex messageorder;
|
||||
std::unique_lock lock(messageorder);
|
||||
std::condition_variable messageSentCondition; // 개씨발 코드 개더러워 ;;
|
||||
bool messagesent = false;
|
||||
auto queue = manager->getQueue(guildId);
|
||||
auto queued = QueuedMusicListEmbedProvider::makeEmbed(queue.first, queue.second, manager->getRepeat(guildId));
|
||||
if (!queued.empty()) {
|
||||
dpp::message followMsg(channelId, "현재 큐에 있는 항목:");
|
||||
|
||||
followMsg.add_embed(queued.front());
|
||||
messagesent = false;
|
||||
cluster->message_create(followMsg, [&](const dpp::confirmation_callback_t &callback){
|
||||
messagesent = true;
|
||||
messageSentCondition.notify_all();
|
||||
});
|
||||
|
||||
messageSentCondition.wait(lock, [&](){ return messagesent; });
|
||||
queued.pop();
|
||||
}
|
||||
while (!queued.empty()) {
|
||||
dpp::message followMsg(channelId, "");
|
||||
|
||||
followMsg.add_embed(queued.front());
|
||||
messagesent = false;
|
||||
cluster->message_create(followMsg, [&](const dpp::confirmation_callback_t &callback){
|
||||
messagesent = true;
|
||||
messageSentCondition.notify_all();
|
||||
});
|
||||
|
||||
messageSentCondition.wait(lock, [&](){ return messagesent; });
|
||||
queued.pop();
|
||||
}
|
||||
},
|
||||
ids,
|
||||
event.command.guild_id,
|
||||
event.command.channel_id,
|
||||
query,
|
||||
event.command.usr,
|
||||
event.from->creator,
|
||||
musicManager);
|
||||
|
||||
t.detach();
|
||||
}
|
||||
|
||||
if (!musics.empty()) {
|
||||
event.from->creator->log(dpp::ll_info, "Enqueuing " + musics.front()->embed.title + " - " + musics.front()->id);
|
||||
musicManager->queue_music(event.command.guild_id, musics.front());
|
||||
msg.add_embed(musics.front()->embed);
|
||||
musics.pop();
|
||||
|
||||
event.edit_original_response(msg);
|
||||
musicManager->queuedCondition.notify_all();
|
||||
}
|
||||
else {
|
||||
msg.content = "검색 결과가 없습니다";
|
||||
event.edit_original_response(msg);
|
||||
}
|
||||
|
||||
if (musicManager->getNowPlaying(event.command.guild_id).id == "") {
|
||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
||||
|
||||
if (!v || !v->voiceclient || !v->voiceclient->is_ready()) {
|
||||
event.edit_original_response(dpp::message("현재 음성 채팅방에 있는 상태가 아닙니다!"));
|
||||
return;
|
||||
}
|
||||
v->voiceclient->insert_marker();
|
||||
v->voiceclient->pause_audio(false);
|
||||
}
|
||||
}
|
||||
|
||||
botCluster->on_voice_ready([this, queue](const dpp::voice_ready_t& Voice){ queue->play(); });
|
||||
return;
|
||||
void Play::init() {
|
||||
add_option(dpp::command_option(dpp::co_string, "query", "링크 또는 검색어", true));
|
||||
}
|
||||
}
|
||||
@@ -1,97 +1,73 @@
|
||||
#include <Commands/Queue.hpp>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <cmath>
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
#include <Utils/QueuedMusicListEmbedProvider.hpp>
|
||||
|
||||
namespace commands {
|
||||
dpp::embed makeEmbed(std::list<FQueueElement>::iterator& iter, std::list<FQueueElement>::iterator end, bool Repeat = false, int Index = 0)
|
||||
{
|
||||
dpp::embed embed = dpp::embed()
|
||||
.set_color(dpp::colors::sti_blue);
|
||||
namespace bumbleBee::commands {
|
||||
void Queue::execute(const dpp::slashcommand_t &event) {
|
||||
auto queue = musicManager->getQueue(event.command.guild_id);
|
||||
|
||||
if (iter == end) {
|
||||
embed
|
||||
.set_title("큐가 비었습니다!")
|
||||
.set_timestamp(time(0));
|
||||
dpp::message msg;
|
||||
dpp::embed embed;
|
||||
|
||||
if (Repeat)
|
||||
embed.add_field(":repeat:","");
|
||||
auto queued = QueuedMusicListEmbedProvider::makeEmbed(queue.first, queue.second, musicManager->getRepeat(event.command.guild_id));
|
||||
|
||||
return embed;
|
||||
}
|
||||
// if (queue.first.size() == 0) {
|
||||
// msg.add_embed(queued.front());
|
||||
// event.edit_original_response(msg);
|
||||
// return;
|
||||
// }
|
||||
|
||||
std::ostringstream Number;
|
||||
int Start = Index;
|
||||
// &&
|
||||
// queue.first.size() != 0 &&
|
||||
// *queue.second != nullptr &&
|
||||
// (*queue.second)->id != ""
|
||||
|
||||
for (; (Index < Start + 5) && (iter != end); iter++, Index++) {
|
||||
Number.clear();
|
||||
Number.str("");
|
||||
Number << Index;
|
||||
embed.add_field(
|
||||
Number.str(),
|
||||
"",
|
||||
true
|
||||
)
|
||||
.add_field(
|
||||
iter->title,
|
||||
iter->description,
|
||||
true
|
||||
)
|
||||
.add_field(
|
||||
"",
|
||||
""
|
||||
);
|
||||
}
|
||||
|
||||
if (iter == end) {
|
||||
embed.set_timestamp(time(0));
|
||||
if (Repeat)
|
||||
embed.add_field(":repeat:","");
|
||||
}
|
||||
|
||||
return embed;
|
||||
}
|
||||
}
|
||||
|
||||
commands::Queue::Queue(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
|
||||
: VCCommand(botCluster)
|
||||
{
|
||||
this->queueMap = queueMap;
|
||||
dpp::slashcommand command = dpp::slashcommand("q", "노래 예약 큐 확인", botCluster->me.id);
|
||||
|
||||
commandObjectVector.push_back(command);
|
||||
}
|
||||
|
||||
void commands::Queue::operator()(const dpp::slashcommand_t& event) {
|
||||
dpp::message msg;
|
||||
msg.set_channel_id(event.command.channel_id);
|
||||
std::shared_ptr<MusicQueue> queue = getQueue(event);
|
||||
|
||||
if (queue->size() < 1) {
|
||||
auto iter = queue->begin();
|
||||
msg.add_embed(makeEmbed(iter, queue->end(), queue->repeat));
|
||||
}
|
||||
else {
|
||||
msg.set_content("지금 재생 중:");
|
||||
msg.add_embed(queue->peek(0).embed);
|
||||
}
|
||||
|
||||
event.reply(msg, [this, queue, event](const dpp::confirmation_callback_t &_event) {
|
||||
auto iter = queue->begin();
|
||||
int queueSize = queue->size();
|
||||
iter++;
|
||||
for (int i = 0; i < ceil(queueSize / 5.0); i++) {
|
||||
dpp::embed followEmbed = makeEmbed(iter, queue->end(), queue->repeat, i * 5 + 1);
|
||||
|
||||
dpp::message followMsg;
|
||||
followMsg.channel_id = event.command.channel_id;
|
||||
|
||||
if (i == 0) {
|
||||
followMsg.content = "현재 큐에 있는 항목:";
|
||||
}
|
||||
followMsg.add_embed(followEmbed);
|
||||
|
||||
botCluster->message_create(followMsg);
|
||||
if (queue.first->size() != 0 && queue.first->end() != queue.second && (*queue.second)->id != "") {
|
||||
msg.content = "지금 재생 중:";
|
||||
msg.add_embed((*queue.second)->embed);
|
||||
event.edit_original_response(msg);
|
||||
}
|
||||
});
|
||||
else {
|
||||
msg.content = "재생 중인 노래가 없습니다";
|
||||
event.edit_original_response(msg);
|
||||
}
|
||||
|
||||
std::thread t([](std::queue<dpp::embed> queued, dpp::snowflake channel_id, dpp::cluster* cluster) {
|
||||
std::mutex messageorder;
|
||||
std::unique_lock lock(messageorder);
|
||||
std::condition_variable messageSentCondition;
|
||||
bool messagesent = false;
|
||||
if (!queued.empty()) {
|
||||
dpp::message followMsg(channel_id, "현재 큐에 있는 항목:");
|
||||
|
||||
followMsg.add_embed(queued.front());
|
||||
messagesent = false;
|
||||
cluster->message_create(followMsg, [&](const dpp::confirmation_callback_t &callback){
|
||||
messagesent = true;
|
||||
messageSentCondition.notify_all();
|
||||
});
|
||||
|
||||
messageSentCondition.wait(lock, [&](){ return messagesent; });
|
||||
|
||||
queued.pop();
|
||||
}
|
||||
while (!queued.empty()) {
|
||||
dpp::message followMsg(channel_id, "");
|
||||
|
||||
followMsg.add_embed(queued.front());
|
||||
|
||||
messagesent = false;
|
||||
cluster->message_create(followMsg, [&](const dpp::confirmation_callback_t &callback){
|
||||
messagesent = true;
|
||||
messageSentCondition.notify_all();
|
||||
});
|
||||
|
||||
messageSentCondition.wait(lock, [&](){ return messagesent; });
|
||||
queued.pop();
|
||||
}
|
||||
}, queued, event.command.channel_id, event.from->creator);
|
||||
t.detach();
|
||||
}
|
||||
|
||||
void Queue::init() {
|
||||
}
|
||||
}
|
||||
@@ -1,27 +1,16 @@
|
||||
#include <Commands/Repeat.hpp>
|
||||
#include <dpp/dpp.h>
|
||||
#include <string>
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
|
||||
commands::Repeat::Repeat(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
|
||||
: VCCommand(botCluster)
|
||||
{
|
||||
this->queueMap = queueMap;
|
||||
dpp::slashcommand command = dpp::slashcommand("r", "반복 켜기/끄기", botCluster->me.id);
|
||||
|
||||
commandObjectVector.push_back(command);
|
||||
}
|
||||
|
||||
void commands::Repeat::operator()(const dpp::slashcommand_t& event) {
|
||||
std::shared_ptr<MusicQueue> queue = getQueue(event);
|
||||
|
||||
if (queue->repeat) {
|
||||
event.reply("반복을 껐습니다.");
|
||||
queue->repeat = false;
|
||||
}
|
||||
else {
|
||||
event.reply("반복을 켰습니다.");
|
||||
queue->repeat = true;
|
||||
namespace bumbleBee::commands {
|
||||
void Repeat::execute(const dpp::slashcommand_t &event) {
|
||||
if (musicManager->getRepeat(event.command.guild_id)) {
|
||||
event.edit_original_response(dpp::message("반복을 껐습니다."));
|
||||
musicManager->setRepeat(event.command.guild_id, false);
|
||||
}
|
||||
else {
|
||||
event.edit_original_response(dpp::message("반복을 켰습니다."));
|
||||
musicManager->setRepeat(event.command.guild_id, true);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
void Repeat::init() {}
|
||||
}
|
||||
11
src/Commands/Shuffle.cpp
Normal file
11
src/Commands/Shuffle.cpp
Normal file
@@ -0,0 +1,11 @@
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
|
||||
namespace bumbleBee::commands {
|
||||
void Shuffle::execute(const dpp::slashcommand_t &event) {
|
||||
event.edit_original_response(dpp::message("shuffle"));
|
||||
// TODO : 구현
|
||||
}
|
||||
|
||||
void Shuffle::init() {
|
||||
}
|
||||
}
|
||||
@@ -1,29 +1,19 @@
|
||||
#include <Commands/Skip.hpp>
|
||||
#include <dpp/dpp.h>
|
||||
#include <string>
|
||||
#include <Commands/BumbleBeeCommand.hpp>
|
||||
|
||||
commands::Skip::Skip(std::shared_ptr<dpp::cluster> botCluster, std::unordered_map<dpp::snowflake, std::shared_ptr<MusicQueue>> *queueMap)
|
||||
: VCCommand(botCluster)
|
||||
{
|
||||
this->queueMap = queueMap;
|
||||
dpp::slashcommand command = dpp::slashcommand("s", "현재곡 스킵", botCluster->me.id);
|
||||
namespace bumbleBee::commands {
|
||||
void Skip::execute(const dpp::slashcommand_t &event) {
|
||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
||||
|
||||
commandObjectVector.push_back(command);
|
||||
}
|
||||
if (!v || !v->voiceclient || !v->voiceclient->is_ready()) {
|
||||
event.edit_original_response(dpp::message("스킵하려면 음악을 재생중이어야 합니다!"));
|
||||
return;
|
||||
}
|
||||
v->voiceclient->stop_audio();
|
||||
v->voiceclient->insert_marker();
|
||||
|
||||
void commands::Skip::operator()(const dpp::slashcommand_t& event) {
|
||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
||||
|
||||
if (!v || !v->voiceclient || !v->voiceclient->is_ready()) {
|
||||
return;
|
||||
event.edit_original_response(dpp::message("스킵했습니다!"));
|
||||
}
|
||||
|
||||
v->voiceclient->stop_audio();
|
||||
v->voiceclient->insert_marker("next marker");
|
||||
|
||||
std::shared_ptr<MusicQueue> queue = getQueue(event);
|
||||
|
||||
event.reply("스킵했습니다!");
|
||||
|
||||
return;
|
||||
void Skip::init() {
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
OSeStDEAZJQ
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
@@ -1,216 +0,0 @@
|
||||
#include <MusicQueue.hpp>
|
||||
#include <ogg/ogg.h>
|
||||
#include <oggz/oggz.h>
|
||||
#include <opus/opusfile.h>
|
||||
#include <thread>
|
||||
|
||||
MusicQueue::MusicQueue(FMusicQueueID id, std::shared_ptr<dpp::cluster> botCluster)
|
||||
{
|
||||
this->id = id;
|
||||
repeat = false;
|
||||
this->botCluster = botCluster;
|
||||
|
||||
botCluster->on_voice_track_marker([this, botCluster](const dpp::voice_track_marker_t &marker)
|
||||
{
|
||||
std::cout << marker.track_meta << " Marker reached.\n";
|
||||
|
||||
if (empty())
|
||||
{
|
||||
std::cout << "Queue ended\n";
|
||||
playMutex.unlock();
|
||||
return;
|
||||
}
|
||||
|
||||
auto music = pop(0);
|
||||
if (repeat)
|
||||
{
|
||||
(*this) += music;
|
||||
}
|
||||
|
||||
markerCallback();
|
||||
});
|
||||
}
|
||||
|
||||
void MusicQueue::operator+=(FQueueElement operand)
|
||||
{
|
||||
mutex.lock();
|
||||
queue.push_back(operand);
|
||||
mutex.unlock();
|
||||
}
|
||||
|
||||
FQueueElement MusicQueue::pop(int index)
|
||||
{
|
||||
mutex.lock();
|
||||
auto iter = queue.begin();
|
||||
std::advance(iter, index);
|
||||
auto returnValue = *iter;
|
||||
queue.erase(iter);
|
||||
mutex.unlock();
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
FQueueElement MusicQueue::peek(int index)
|
||||
{
|
||||
mutex.lock();
|
||||
auto iter = queue.begin();
|
||||
std::advance(iter, index);
|
||||
auto returnValue = *iter;
|
||||
mutex.unlock();
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
bool MusicQueue::empty()
|
||||
{
|
||||
mutex.lock();
|
||||
bool empty = queue.empty();
|
||||
mutex.unlock();
|
||||
|
||||
return empty;
|
||||
}
|
||||
|
||||
void MusicQueue::clear()
|
||||
{
|
||||
mutex.lock();
|
||||
queue.clear();
|
||||
mutex.unlock();
|
||||
}
|
||||
|
||||
std::list<struct FQueueElement>::iterator MusicQueue::begin()
|
||||
{
|
||||
mutex.lock();
|
||||
auto returnValue = queue.begin();
|
||||
mutex.unlock();
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
std::list<struct FQueueElement>::iterator MusicQueue::end()
|
||||
{
|
||||
mutex.lock();
|
||||
auto returnValue = queue.end();
|
||||
mutex.unlock();
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
std::size_t MusicQueue::size()
|
||||
{
|
||||
mutex.lock();
|
||||
auto returnValue = queue.size();
|
||||
mutex.unlock();
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
FMusicQueueID MusicQueue::getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
void MusicQueue::markerCallback()
|
||||
{
|
||||
std::cout << "Music play started\n";
|
||||
|
||||
dpp::discord_client* joinedShard = botCluster->get_shard(id.shard_id);
|
||||
if (!joinedShard)
|
||||
{
|
||||
std::cout << "No shard\n";
|
||||
return;
|
||||
}
|
||||
|
||||
if (empty())
|
||||
{
|
||||
std::cout << "Queue ended\n";
|
||||
playMutex.unlock();
|
||||
return;
|
||||
}
|
||||
|
||||
FQueueElement music = peek(0);
|
||||
|
||||
dpp::voiceconn* v = joinedShard->get_voice(id.guild_id);
|
||||
if (!v || !v->voiceclient || !v->voiceclient->is_ready())
|
||||
{
|
||||
std::cout << "not in voicechat. quit musicplay";
|
||||
return;
|
||||
}
|
||||
|
||||
//v->voiceclient->error(4014);
|
||||
|
||||
/* load the audio file with oggz */
|
||||
OGGZ *track_og = oggz_open(("Music/" + music.fileName + ".ogg").c_str(), OGGZ_READ);
|
||||
|
||||
/* If there was an issue reading the file, tell the user and stop */
|
||||
if (!track_og) {
|
||||
fprintf(stderr, "Error opening file\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* set read callback, this callback will be called on packets with the serialno,
|
||||
* -1 means every packet will be handled with this callback.
|
||||
*/
|
||||
oggz_set_read_callback(
|
||||
track_og, -1,
|
||||
[](OGGZ *oggz, oggz_packet *packet, long serialno, void *user_data) {
|
||||
dpp::voiceconn *voiceconn = (dpp::voiceconn *)user_data;
|
||||
|
||||
/* send the audio */
|
||||
voiceconn->voiceclient->send_audio_opus(packet->op.packet, packet->op.bytes);
|
||||
|
||||
/* make sure to always return 0 here, read more on oggz documentation */
|
||||
return 0;
|
||||
},
|
||||
/* this will be the value of void *user_data */
|
||||
(void *)v
|
||||
);
|
||||
|
||||
// read loop
|
||||
while (v && v->voiceclient && !v->voiceclient->terminating) {
|
||||
/* you can tweak this to whatever. Here I use BUFSIZ, defined in
|
||||
* stdio.h as 8192.
|
||||
*/
|
||||
static const constexpr long CHUNK_READ = BUFSIZ * 2;
|
||||
|
||||
const long read_bytes = oggz_read(track_og, CHUNK_READ);
|
||||
|
||||
/* break on eof */
|
||||
if (!read_bytes) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Don't forget to free the memory */
|
||||
oggz_close(track_og);
|
||||
|
||||
v->voiceclient->insert_marker(music.fileName + " end");
|
||||
|
||||
std::cout << "audio sending complete\n";
|
||||
}
|
||||
|
||||
void MusicQueue::play()
|
||||
{
|
||||
if (!playMutex.try_lock())
|
||||
{
|
||||
std::cout << "Already playing\n";
|
||||
return;
|
||||
}
|
||||
|
||||
dpp::discord_client* joinedShard = botCluster->get_shard(id.shard_id);
|
||||
if (!joinedShard)
|
||||
{
|
||||
std::cout << "No shard\n";
|
||||
playMutex.unlock();
|
||||
return;
|
||||
}
|
||||
|
||||
dpp::voiceconn* v = joinedShard->get_voice(id.guild_id);
|
||||
if (!v || !v->voiceclient || !v->voiceclient->is_ready())
|
||||
{
|
||||
std::cout << "not in voicechat. quit musicplay";
|
||||
playMutex.unlock();
|
||||
return;
|
||||
}
|
||||
|
||||
markerCallback();
|
||||
}
|
||||
115
src/Queue/MusicQueue.cpp
Normal file
115
src/Queue/MusicQueue.cpp
Normal file
@@ -0,0 +1,115 @@
|
||||
#include <Queue/MusicQueue.hpp>
|
||||
#include <iostream>
|
||||
#include <algorithm>
|
||||
#include <Utils/QueuedMusicListEmbedProvider.hpp>
|
||||
|
||||
namespace bumbleBee {
|
||||
|
||||
void MusicQueue::enqueue(std::shared_ptr<MusicQueueElement> Element) {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
queue.push_back(Element);
|
||||
if (queue.size() == 1) // 이전에 하나도 없었다는 말이므로.
|
||||
currentPlayingPosition = queue.begin(); // 첫번째 곡으로 iterator를 옮겨준다.
|
||||
}
|
||||
|
||||
std::shared_ptr<MusicQueueElement> MusicQueue::dequeue() {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
auto value = queue.front();
|
||||
queue.pop_front();
|
||||
return value;
|
||||
}
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator MusicQueue::findById(std::string id) {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
int index = 0;
|
||||
for (auto iter = queue.begin(); iter != queue.end(); iter++) {
|
||||
if ((*iter).get()->id == id)
|
||||
return iter;
|
||||
}
|
||||
return queue.end();
|
||||
}
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator MusicQueue::findByIndex(int index) {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
if (index < 0)
|
||||
return queue.end();
|
||||
if (index == 0)
|
||||
return currentPlayingPosition;
|
||||
return std::next(queue.begin(), index - 1);
|
||||
}
|
||||
std::shared_ptr<MusicQueueElement> MusicQueue::nowplaying() {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
if (currentPlayingPosition == queue.end())
|
||||
return nullptr;
|
||||
else
|
||||
return *currentPlayingPosition;
|
||||
}
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator MusicQueue::next_music() {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
if (currentPlayingPosition == --queue.end() && repeat)
|
||||
currentPlayingPosition = queue.begin();
|
||||
else if (currentPlayingPosition == --queue.end() && !repeat) // 반복이 꺼져있을 때 큐 재생이 끝난 경우
|
||||
currentPlayingPosition = queue.end();
|
||||
else if (currentPlayingPosition == queue.end() && !repeat) // 반복이 꺼져있고 현재 재생 곡이 없는데 새 곡이 들어왔을 경우
|
||||
currentPlayingPosition = --queue.end();
|
||||
else
|
||||
++currentPlayingPosition;
|
||||
return currentPlayingPosition;
|
||||
}
|
||||
std::shared_ptr<MusicQueueElement> MusicQueue::jump_to_index(int idx) {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
int index = 0;
|
||||
for (auto iter = queue.begin(); iter != queue.end(); iter++) {
|
||||
if (idx == index++) {
|
||||
currentPlayingPosition = iter;
|
||||
return *iter;
|
||||
}
|
||||
}
|
||||
return std::shared_ptr<MusicQueueElement>();
|
||||
}
|
||||
void MusicQueue::clear() {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
queue.clear();
|
||||
currentPlayingPosition = queue.begin();
|
||||
}
|
||||
std::shared_ptr<MusicQueueElement> MusicQueue::erase(std::list<std::shared_ptr<MusicQueueElement>>::iterator it) {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
if (it == queue.end())
|
||||
return nullptr;
|
||||
|
||||
if (currentPlayingPosition == it) {
|
||||
auto removedValue = *it;
|
||||
auto after = queue.erase(currentPlayingPosition++);
|
||||
if (after == queue.end())
|
||||
currentPlayingPosition = --queue.end();
|
||||
return removedValue;
|
||||
}
|
||||
else {
|
||||
auto removedValue = *it;
|
||||
queue.erase(it);
|
||||
return removedValue;
|
||||
}
|
||||
}
|
||||
std::pair<std::shared_ptr<std::list<std::shared_ptr<MusicQueueElement>>>, std::list<std::shared_ptr<MusicQueueElement>>::iterator>
|
||||
MusicQueue::getQueueCopy() {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
std::shared_ptr<std::list<std::shared_ptr<MusicQueueElement>>> returnValue = std::make_shared<std::list<std::shared_ptr<MusicQueueElement>>>();
|
||||
|
||||
for (auto i = queue.begin(); i != queue.end(); i++)
|
||||
returnValue->push_back(*i);
|
||||
|
||||
if (returnValue->begin() == returnValue->end() || currentPlayingPosition == queue.end())
|
||||
return std::make_pair(returnValue, returnValue->end());
|
||||
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator iter = returnValue->begin();
|
||||
std::advance(iter, std::distance(queue.begin(), currentPlayingPosition));
|
||||
|
||||
return std::make_pair(returnValue, iter);
|
||||
}
|
||||
int MusicQueue::size() {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
return queue.size();
|
||||
}
|
||||
std::list<std::shared_ptr<MusicQueueElement>>::iterator MusicQueue::end() {
|
||||
std::lock_guard<std::mutex> lock(queueMutex);
|
||||
return queue.end();
|
||||
}
|
||||
}
|
||||
124
src/Settings/SettingsManager.cpp
Normal file
124
src/Settings/SettingsManager.cpp
Normal file
@@ -0,0 +1,124 @@
|
||||
#include <Settings/SettingsManager.hpp>
|
||||
#include <dpp/nlohmann/json.hpp>
|
||||
#include <Utils/ConsoleUtils.hpp>
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
|
||||
namespace bumbleBee {
|
||||
|
||||
std::string SettingsManager::TOKEN = "";
|
||||
std::string SettingsManager::YTDLP_CMD = "./yt-dlp";
|
||||
std::string SettingsManager::FFMPEG_CMD = "./ffmpeg";
|
||||
dpp::loglevel SettingsManager::LOGLEVEL = dpp::ll_debug;
|
||||
bool SettingsManager::REGISTER_COMMAND = false;
|
||||
|
||||
bool SettingsManager::validateToken() {
|
||||
nlohmann::json response;
|
||||
std::string curl = ConsoleUtils::safe_execute_command("/usr/bin/which", {"curl"}).front();
|
||||
if (curl == "") {
|
||||
std::cout << "curl is unavaliable. unresolable error please install curl." << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string stresult = ConsoleUtils::safe_execute_command(curl, {
|
||||
"-sX",
|
||||
"GET",
|
||||
"https://discord.com/api/v10/users/@me",
|
||||
"-H",
|
||||
"Authorization: Bot " + TOKEN + ""
|
||||
}).front();
|
||||
std::stringstream ss(stresult);
|
||||
ss >> response;
|
||||
|
||||
if (response.contains("message") && response["message"] == "401: Unauthorized") {
|
||||
std::cout << "Token is invalid" << std::endl;
|
||||
return false;
|
||||
}
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SettingsManager::load() {
|
||||
nlohmann::json configdocument;
|
||||
try {
|
||||
std::ifstream configfile("config.json");
|
||||
if (!configfile) {
|
||||
saveToFile();
|
||||
return false;
|
||||
}
|
||||
configfile >> configdocument;
|
||||
|
||||
TOKEN = configdocument["TOKEN"];
|
||||
|
||||
if (!validateToken())
|
||||
return false;
|
||||
|
||||
YTDLP_CMD = configdocument["YTDLP_CMD"];
|
||||
FFMPEG_CMD = configdocument["FFMPEG_CMD"];
|
||||
|
||||
std::string level = configdocument["LOGLEVEL"];
|
||||
|
||||
std::transform(level.begin(), level.end(), level.begin(), ::tolower);
|
||||
if (level == "trace")
|
||||
LOGLEVEL = dpp::ll_trace;
|
||||
else if (level == "debug")
|
||||
LOGLEVEL = dpp::ll_debug;
|
||||
else if (level == "warning")
|
||||
LOGLEVEL = dpp::ll_warning;
|
||||
else if (level == "error")
|
||||
LOGLEVEL = dpp::ll_error;
|
||||
else if (level == "critical")
|
||||
LOGLEVEL = dpp::ll_critical;
|
||||
else // 값이 병신같을때 기본값으로 ll_info 부여
|
||||
LOGLEVEL = dpp::ll_info;
|
||||
|
||||
REGISTER_COMMAND = configdocument["CLEAR_PREVIOUS_COMMAND"];
|
||||
}
|
||||
catch (const nlohmann::json::type_error& e) {
|
||||
saveToFile();
|
||||
return load();
|
||||
}
|
||||
catch (const nlohmann::json::parse_error& e) {
|
||||
saveToFile();
|
||||
return load();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void SettingsManager::saveToFile() {
|
||||
nlohmann::json configdocument;
|
||||
|
||||
configdocument["TOKEN"] = TOKEN;
|
||||
configdocument["YTDLP_CMD"] = YTDLP_CMD;
|
||||
configdocument["FFMPEG_CMD"] = FFMPEG_CMD;
|
||||
|
||||
switch (LOGLEVEL) {
|
||||
case dpp::ll_trace:
|
||||
configdocument["LOGLEVEL"] = "trace";
|
||||
break;
|
||||
case dpp::ll_debug:
|
||||
configdocument["LOGLEVEL"] = "debug";
|
||||
break;
|
||||
case dpp::ll_info:
|
||||
configdocument["LOGLEVEL"] = "info";
|
||||
break;
|
||||
case dpp::ll_warning:
|
||||
configdocument["LOGLEVEL"] = "warning";
|
||||
break;
|
||||
case dpp::ll_error:
|
||||
configdocument["LOGLEVEL"] = "error";
|
||||
break;
|
||||
default:
|
||||
configdocument["LOGLEVEL"] = "critical";
|
||||
break;
|
||||
}
|
||||
|
||||
configdocument["CLEAR_PREVIOUS_COMMAND"] = REGISTER_COMMAND;
|
||||
|
||||
std::ofstream configFile("config.json");
|
||||
if (configFile.is_open()) {
|
||||
configFile << configdocument.dump(4);
|
||||
configFile.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
103
src/Utils/AsyncDownloadManager.cpp
Normal file
103
src/Utils/AsyncDownloadManager.cpp
Normal file
@@ -0,0 +1,103 @@
|
||||
#include <Utils/AsyncDownloadManager.hpp>
|
||||
#include <sstream>
|
||||
#include "Utils/ConsoleUtils.hpp"
|
||||
#include "Settings/SettingsManager.hpp"
|
||||
#include <ogg/ogg.h>
|
||||
#include <oggz/oggz.h>
|
||||
#include <opus/opusfile.h>
|
||||
#include <memory>
|
||||
|
||||
namespace bumbleBee {
|
||||
void AsyncDownloadManager::enqueueAsyncDL(std::pair<std::string, dpp::message> query) {
|
||||
std::lock_guard<std::mutex> lock(dlQueueMutex);
|
||||
downloadQueue.push(query);
|
||||
dlQueueCondition.notify_one();
|
||||
}
|
||||
|
||||
void AsyncDownloadManager::downloadWorker() {
|
||||
std::ostringstream tid;
|
||||
tid << std::this_thread::get_id();
|
||||
while (true) {
|
||||
//mutex lock
|
||||
std::unique_lock<std::mutex> dlQueueLock(dlQueueMutex);
|
||||
dlQueueCondition.wait(dlQueueLock, [&]{ return !downloadQueue.empty() || terminate; });
|
||||
auto cluster = weak_cluster.lock();
|
||||
if (weak_cluster.expired()) {
|
||||
cluster->log(dpp::ll_error, "Missing cluster, terminating thread " + tid.str());
|
||||
break;
|
||||
}
|
||||
if (terminate) {
|
||||
cluster->log(dpp::ll_info, "Terminating thread " + tid.str());
|
||||
break;
|
||||
}
|
||||
std::string query = downloadQueue.front().first;
|
||||
dpp::message oRes = downloadQueue.front().second;
|
||||
downloadQueue.pop();
|
||||
dlQueueLock.unlock();
|
||||
|
||||
cluster->log(dpp::ll_info, "AsyncDownloadManager: " + query + " accepted.");
|
||||
|
||||
std::queue<std::string> ids =
|
||||
ConsoleUtils::safe_execute_command(
|
||||
SettingsManager::getYTDLP_CMD(), {
|
||||
"--default-search",
|
||||
"ytsearch",
|
||||
"--flat-playlist",
|
||||
"--skip-download",
|
||||
"--quiet",
|
||||
"--ignore-errors",
|
||||
"--print",
|
||||
"id",
|
||||
query});
|
||||
|
||||
if (ids.size() >= 2) {
|
||||
cluster->log(dpp::ll_info, query + " is playlist");
|
||||
while (!ids.empty()) {
|
||||
if (ids.front() == "") {
|
||||
ids.pop();
|
||||
continue;
|
||||
}
|
||||
cluster->log(dpp::ll_info, "Enqueuing playlist element " + ids.front());
|
||||
enqueue(std::make_pair("https://youtu.be/" + ids.front(), oRes));
|
||||
ids.pop();
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
std::queue<std::string> urls =
|
||||
ConsoleUtils::safe_execute_command(SettingsManager::getYTDLP_CMD(), {
|
||||
"-f",
|
||||
"ba*",
|
||||
"--print",
|
||||
"urls",
|
||||
"https://youtu.be/" + ids.front()
|
||||
});
|
||||
|
||||
cluster->log(dpp::ll_debug, "url: " + urls.front());
|
||||
|
||||
FILE* stream;
|
||||
|
||||
// musicQueue->enqueue(std::make_shared<MusicQueueElement>(oRes, ids.front(), urls.front(), stream));
|
||||
|
||||
std::string downloadID = ids.front();
|
||||
|
||||
std::thread th([&, downloadID](){
|
||||
if (terminate)
|
||||
return;
|
||||
std::ostringstream tid;
|
||||
tid << std::this_thread::get_id();
|
||||
|
||||
cluster->log(dpp::ll_info, "Thread id: " + tid.str() + ": " + downloadID + " accepted.");
|
||||
|
||||
stream = ConsoleUtils::safe_open_pipe("./streamOpus.sh", {
|
||||
SettingsManager::getYTDLP_CMD(),
|
||||
downloadID,
|
||||
SettingsManager::getFFMPEG_CMD()
|
||||
});
|
||||
|
||||
cluster->log(dpp::ll_info, "Thread id: " + tid.str() + " Opened stream: " + downloadID);
|
||||
});
|
||||
th.detach();
|
||||
}
|
||||
}
|
||||
}
|
||||
21
src/main.cpp
21
src/main.cpp
@@ -1,18 +1,9 @@
|
||||
#include <BumbleCeepp.hpp>
|
||||
#include <dpp/nlohmann/json.hpp>
|
||||
#include <memory>
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
||||
int main()
|
||||
{
|
||||
json configdocument;
|
||||
std::ifstream configfile("config.json");
|
||||
configfile >> configdocument;
|
||||
|
||||
std::shared_ptr<BumbleCeepp> bumbleBee = std::make_shared<BumbleCeepp>(configdocument["token"], 1);
|
||||
|
||||
bumbleBee->start();
|
||||
#include <iostream>
|
||||
#include <BumbleBee.hpp>
|
||||
#include <thread>
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
bumbleBee::BumbleBee bot;
|
||||
bot.start();
|
||||
return 0;
|
||||
}
|
||||
BIN
src/yt-dlp
BIN
src/yt-dlp
Binary file not shown.
@@ -1,47 +0,0 @@
|
||||
import yt_dlp
|
||||
import sys
|
||||
import os
|
||||
import json
|
||||
|
||||
if len(sys.argv) != 2:
|
||||
sys.exit()
|
||||
|
||||
ydl_opts = {
|
||||
'quiet': True,
|
||||
'clean_infojson': False,
|
||||
'default_search': 'ytsearch',
|
||||
'format': '251',
|
||||
'outtmpl': {'default': 'Temp/%(id)s.temp'},
|
||||
'overwrites': False,
|
||||
'writeinfojson': True }
|
||||
|
||||
with yt_dlp.YoutubeDL(ydl_opts) as ydl:
|
||||
info = ydl.extract_info(sys.argv[1], download=False)
|
||||
id = list()
|
||||
with open("out", "w") as f:
|
||||
f.write(json.dumps(ydl.sanitize_info(info)))
|
||||
with open("Music/Archive", "r") as f:
|
||||
ArchiveList = f.read().split("\n")
|
||||
if "entries" in info:
|
||||
if len(info["entries"]) != 0:
|
||||
for entry in info["entries"]:
|
||||
if entry["id"] not in ArchiveList:
|
||||
ydl.download(entry["webpage_url"])
|
||||
os.system("echo " + entry["id"] + " >> Music/Archive")
|
||||
os.system("yes n 2>/dev/null | ffmpeg -hide_banner -loglevel error -i \"" + "Temp/" + entry["id"] + ".temp" + "\" -c copy Music/" + entry["id"] + ".ogg")
|
||||
os.system("mv Temp/" + entry["id"] + ".temp.info.json Music/" + entry["id"] + ".info.json")
|
||||
id.append(entry["id"])
|
||||
else:
|
||||
if info["id"] not in ArchiveList:
|
||||
ydl.download(info["webpage_url"])
|
||||
os.system("echo " + info["id"] + " >> Music/Archive")
|
||||
os.system("yes n 2>/dev/null | ffmpeg -hide_banner -loglevel error -i \"" + "Temp/" + info["id"] + ".temp" + "\" -c copy Music/" + info["id"] + ".ogg")
|
||||
os.system("mv Temp/" + info["id"] + ".temp.info.json Music/" + info["id"] + ".info.json")
|
||||
id.append(info["id"])
|
||||
|
||||
os.system("rm -f Temp/*.temp")
|
||||
os.system("rm -f Temp/*.json")
|
||||
|
||||
with open("Temp/CurMusic", "w") as f:
|
||||
for item in id:
|
||||
f.write(item + "\n")
|
||||
72
stackcollapse-gdb.pl
Executable file
72
stackcollapse-gdb.pl
Executable file
@@ -0,0 +1,72 @@
|
||||
#!/usr/bin/perl -ws
|
||||
#
|
||||
# stackcollapse-gdb Collapse GDB backtraces
|
||||
#
|
||||
# Parse a list of GDB backtraces as generated with the poor man's
|
||||
# profiler [1]:
|
||||
#
|
||||
# for x in $(seq 1 500); do
|
||||
# gdb -ex "set pagination 0" -ex "thread apply all bt" -batch -p $pid 2> /dev/null
|
||||
# sleep 0.01
|
||||
# done
|
||||
#
|
||||
# [1] http://poormansprofiler.org/
|
||||
#
|
||||
# Copyright 2014 Gabriel Corona. All rights reserved.
|
||||
#
|
||||
# CDDL HEADER START
|
||||
#
|
||||
# The contents of this file are subject to the terms of the
|
||||
# Common Development and Distribution License (the "License").
|
||||
# You may not use this file except in compliance with the License.
|
||||
#
|
||||
# You can obtain a copy of the license at docs/cddl1.txt or
|
||||
# http://opensource.org/licenses/CDDL-1.0.
|
||||
# See the License for the specific language governing permissions
|
||||
# and limitations under the License.
|
||||
#
|
||||
# When distributing Covered Code, include this CDDL HEADER in each
|
||||
# file and include the License file at docs/cddl1.txt.
|
||||
# If applicable, add the following below this CDDL HEADER, with the
|
||||
# fields enclosed by brackets "[]" replaced with your own identifying
|
||||
# information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
#
|
||||
# CDDL HEADER END
|
||||
|
||||
use strict;
|
||||
|
||||
my $current = "";
|
||||
my $previous_function = "";
|
||||
|
||||
my %stacks;
|
||||
|
||||
while(<>) {
|
||||
chomp;
|
||||
if (m/^Thread/) {
|
||||
$current=""
|
||||
}
|
||||
elsif(m/^#[0-9]* *([^ ]*) ([^ ]*) ([^ ]*) ([^ ]*)/) {
|
||||
my $function = $3;
|
||||
my $alt = $1;
|
||||
if(not($1 =~ /0x[a-zA-Z0-9]*/)) {
|
||||
$function = $alt;
|
||||
}
|
||||
if ($current eq "") {
|
||||
$current = $function;
|
||||
} else {
|
||||
$current = $function . ";" . $current;
|
||||
}
|
||||
} elsif(!($current eq "")) {
|
||||
$stacks{$current} += 1;
|
||||
$current = "";
|
||||
}
|
||||
}
|
||||
|
||||
if(!($current eq "")) {
|
||||
$stacks{$current} += 1;
|
||||
$current = "";
|
||||
}
|
||||
|
||||
foreach my $k (sort { $a cmp $b } keys %stacks) {
|
||||
print "$k $stacks{$k}\n";
|
||||
}
|
||||
435
stackcollapse-perf.pl
Executable file
435
stackcollapse-perf.pl
Executable file
@@ -0,0 +1,435 @@
|
||||
#!/usr/bin/perl -w
|
||||
#
|
||||
# stackcollapse-perf.pl collapse perf samples into single lines.
|
||||
#
|
||||
# Parses a list of multiline stacks generated by "perf script", and
|
||||
# outputs a semicolon separated stack followed by a space and a count.
|
||||
# If memory addresses (+0xd) are present, they are stripped, and resulting
|
||||
# identical stacks are colased with their counts summed.
|
||||
#
|
||||
# USAGE: ./stackcollapse-perf.pl [options] infile > outfile
|
||||
#
|
||||
# Run "./stackcollapse-perf.pl -h" to list options.
|
||||
#
|
||||
# Example input:
|
||||
#
|
||||
# swapper 0 [000] 158665.570607: cpu-clock:
|
||||
# ffffffff8103ce3b native_safe_halt ([kernel.kallsyms])
|
||||
# ffffffff8101c6a3 default_idle ([kernel.kallsyms])
|
||||
# ffffffff81013236 cpu_idle ([kernel.kallsyms])
|
||||
# ffffffff815bf03e rest_init ([kernel.kallsyms])
|
||||
# ffffffff81aebbfe start_kernel ([kernel.kallsyms].init.text)
|
||||
# [...]
|
||||
#
|
||||
# Example output:
|
||||
#
|
||||
# swapper;start_kernel;rest_init;cpu_idle;default_idle;native_safe_halt 1
|
||||
#
|
||||
# Input may be created and processed using:
|
||||
#
|
||||
# perf record -a -g -F 997 sleep 60
|
||||
# perf script | ./stackcollapse-perf.pl > out.stacks-folded
|
||||
#
|
||||
# The output of "perf script" should include stack traces. If these are missing
|
||||
# for you, try manually selecting the perf script output; eg:
|
||||
#
|
||||
# perf script -f comm,pid,tid,cpu,time,event,ip,sym,dso,trace | ...
|
||||
#
|
||||
# This is also required for the --pid or --tid options, so that the output has
|
||||
# both the PID and TID.
|
||||
#
|
||||
# Copyright 2012 Joyent, Inc. All rights reserved.
|
||||
# Copyright 2012 Brendan Gregg. All rights reserved.
|
||||
#
|
||||
# CDDL HEADER START
|
||||
#
|
||||
# The contents of this file are subject to the terms of the
|
||||
# Common Development and Distribution License (the "License").
|
||||
# You may not use this file except in compliance with the License.
|
||||
#
|
||||
# You can obtain a copy of the license at docs/cddl1.txt or
|
||||
# http://opensource.org/licenses/CDDL-1.0.
|
||||
# See the License for the specific language governing permissions
|
||||
# and limitations under the License.
|
||||
#
|
||||
# When distributing Covered Code, include this CDDL HEADER in each
|
||||
# file and include the License file at docs/cddl1.txt.
|
||||
# If applicable, add the following below this CDDL HEADER, with the
|
||||
# fields enclosed by brackets "[]" replaced with your own identifying
|
||||
# information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
#
|
||||
# CDDL HEADER END
|
||||
#
|
||||
# 02-Mar-2012 Brendan Gregg Created this.
|
||||
# 02-Jul-2014 " " Added process name to stacks.
|
||||
|
||||
use strict;
|
||||
use Getopt::Long;
|
||||
|
||||
my %collapsed;
|
||||
|
||||
sub remember_stack {
|
||||
my ($stack, $count) = @_;
|
||||
$collapsed{$stack} += $count;
|
||||
}
|
||||
my $annotate_kernel = 0; # put an annotation on kernel function
|
||||
my $annotate_jit = 0; # put an annotation on jit symbols
|
||||
my $annotate_all = 0; # enale all annotations
|
||||
my $include_pname = 1; # include process names in stacks
|
||||
my $include_pid = 0; # include process ID with process name
|
||||
my $include_tid = 0; # include process & thread ID with process name
|
||||
my $include_addrs = 0; # include raw address where a symbol can't be found
|
||||
my $tidy_java = 1; # condense Java signatures
|
||||
my $tidy_generic = 1; # clean up function names a little
|
||||
my $target_pname; # target process name from perf invocation
|
||||
my $event_filter = ""; # event type filter, defaults to first encountered event
|
||||
my $event_defaulted = 0; # whether we defaulted to an event (none provided)
|
||||
my $event_warning = 0; # if we printed a warning for the event
|
||||
|
||||
my $show_inline = 0;
|
||||
my $show_context = 0;
|
||||
|
||||
my $srcline_in_input = 0; # if there are extra lines with source location (perf script -F+srcline)
|
||||
GetOptions('inline' => \$show_inline,
|
||||
'context' => \$show_context,
|
||||
'srcline' => \$srcline_in_input,
|
||||
'pid' => \$include_pid,
|
||||
'kernel' => \$annotate_kernel,
|
||||
'jit' => \$annotate_jit,
|
||||
'all' => \$annotate_all,
|
||||
'tid' => \$include_tid,
|
||||
'addrs' => \$include_addrs,
|
||||
'event-filter=s' => \$event_filter)
|
||||
or die <<USAGE_END;
|
||||
USAGE: $0 [options] infile > outfile\n
|
||||
--pid # include PID with process names [1]
|
||||
--tid # include TID and PID with process names [1]
|
||||
--inline # un-inline using addr2line
|
||||
--all # all annotations (--kernel --jit)
|
||||
--kernel # annotate kernel functions with a _[k]
|
||||
--jit # annotate jit functions with a _[j]
|
||||
--context # adds source context to --inline
|
||||
--srcline # parses output of 'perf script -F+srcline' and adds source context
|
||||
--addrs # include raw addresses where symbols can't be found
|
||||
--event-filter=EVENT # event name filter\n
|
||||
[1] perf script must emit both PID and TIDs for these to work; eg, Linux < 4.1:
|
||||
perf script -f comm,pid,tid,cpu,time,event,ip,sym,dso,trace
|
||||
for Linux >= 4.1:
|
||||
perf script -F comm,pid,tid,cpu,time,event,ip,sym,dso,trace
|
||||
If you save this output add --header on Linux >= 3.14 to include perf info.
|
||||
USAGE_END
|
||||
|
||||
if ($annotate_all) {
|
||||
$annotate_kernel = $annotate_jit = 1;
|
||||
}
|
||||
|
||||
my %inlineCache;
|
||||
|
||||
my %nmCache;
|
||||
|
||||
sub inlineCacheAdd {
|
||||
my ($pc, $mod, $result) = @_;
|
||||
if (defined($inlineCache{$pc})) {
|
||||
$inlineCache{$pc}{$mod} = $result;
|
||||
} else {
|
||||
$inlineCache{$pc} = {$mod => $result};
|
||||
}
|
||||
}
|
||||
|
||||
# for the --inline option
|
||||
sub inline {
|
||||
my ($pc, $rawfunc, $mod) = @_;
|
||||
|
||||
return $inlineCache{$pc}{$mod} if defined($inlineCache{$pc}{$mod});
|
||||
|
||||
# capture addr2line output
|
||||
my $a2l_output = `addr2line -a $pc -e $mod -i -f -s -C`;
|
||||
|
||||
# remove first line
|
||||
$a2l_output =~ s/^(.*\n){1}//;
|
||||
|
||||
if ($a2l_output =~ /\?\?\n\?\?:0/) {
|
||||
# if addr2line fails and rawfunc is func+offset, then fall back to it
|
||||
if ($rawfunc =~ /^(.+)\+0x([0-9a-f]+)$/) {
|
||||
my $func = $1;
|
||||
my $addr = hex $2;
|
||||
|
||||
$nmCache{$mod}=`nm $mod` unless defined $nmCache{$mod};
|
||||
|
||||
if ($nmCache{$mod} =~ /^([0-9a-f]+) . \Q$func\E$/m) {
|
||||
my $base = hex $1;
|
||||
my $newPc = sprintf "0x%x", $base+$addr;
|
||||
my $result = inline($newPc, '', $mod);
|
||||
inlineCacheAdd($pc, $mod, $result);
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
my @fullfunc;
|
||||
my $one_item = "";
|
||||
for (split /^/, $a2l_output) {
|
||||
chomp $_;
|
||||
|
||||
# remove discriminator info if exists
|
||||
$_ =~ s/ \(discriminator \S+\)//;
|
||||
|
||||
if ($one_item eq "") {
|
||||
$one_item = $_;
|
||||
} else {
|
||||
if ($show_context == 1) {
|
||||
unshift @fullfunc, $one_item . ":$_";
|
||||
} else {
|
||||
unshift @fullfunc, $one_item;
|
||||
}
|
||||
$one_item = "";
|
||||
}
|
||||
}
|
||||
|
||||
my $result = join ";" , @fullfunc;
|
||||
|
||||
inlineCacheAdd($pc, $mod, $result);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
my @stack;
|
||||
my $pname;
|
||||
my $m_pid;
|
||||
my $m_tid;
|
||||
my $m_period;
|
||||
|
||||
#
|
||||
# Main loop
|
||||
#
|
||||
while (defined($_ = <>)) {
|
||||
|
||||
# find the name of the process launched by perf, by stepping backwards
|
||||
# over the args to find the first non-option (no dash):
|
||||
if (/^# cmdline/) {
|
||||
my @args = split ' ', $_;
|
||||
foreach my $arg (reverse @args) {
|
||||
if ($arg !~ /^-/) {
|
||||
$target_pname = $arg;
|
||||
$target_pname =~ s:.*/::; # strip pathname
|
||||
last;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# skip remaining comments
|
||||
next if m/^#/;
|
||||
chomp;
|
||||
|
||||
# end of stack. save cached data.
|
||||
if (m/^$/) {
|
||||
# ignore filtered samples
|
||||
next if not $pname;
|
||||
|
||||
if ($include_pname) {
|
||||
if (defined $pname) {
|
||||
unshift @stack, $pname;
|
||||
} else {
|
||||
unshift @stack, "";
|
||||
}
|
||||
}
|
||||
remember_stack(join(";", @stack), $m_period) if @stack;
|
||||
undef @stack;
|
||||
undef $pname;
|
||||
next;
|
||||
}
|
||||
|
||||
#
|
||||
# event record start
|
||||
#
|
||||
if (/^(\S.+?)\s+(\d+)\/*(\d+)*\s+/) {
|
||||
# default "perf script" output has TID but not PID
|
||||
# eg, "java 25607 4794564.109216: 1 cycles:"
|
||||
# eg, "java 12688 [002] 6544038.708352: 235 cpu-clock:"
|
||||
# eg, "V8 WorkerThread 25607 4794564.109216: 104345 cycles:"
|
||||
# eg, "java 24636/25607 [000] 4794564.109216: 1 cycles:"
|
||||
# eg, "java 12688/12764 6544038.708352: 10309278 cpu-clock:"
|
||||
# eg, "V8 WorkerThread 24636/25607 [000] 94564.109216: 100 cycles:"
|
||||
# other combinations possible
|
||||
my ($comm, $pid, $tid, $period) = ($1, $2, $3, "");
|
||||
if (not $tid) {
|
||||
$tid = $pid;
|
||||
$pid = "?";
|
||||
}
|
||||
|
||||
if (/:\s*(\d+)*\s+(\S+):\s*$/) {
|
||||
$period = $1;
|
||||
my $event = $2;
|
||||
|
||||
if ($event_filter eq "") {
|
||||
# By default only show events of the first encountered
|
||||
# event type. Merging together different types, such as
|
||||
# instructions and cycles, produces misleading results.
|
||||
$event_filter = $event;
|
||||
$event_defaulted = 1;
|
||||
} elsif ($event ne $event_filter) {
|
||||
if ($event_defaulted and $event_warning == 0) {
|
||||
# only print this warning if necessary:
|
||||
# when we defaulted and there was
|
||||
# multiple event types.
|
||||
print STDERR "Filtering for events of type: $event\n";
|
||||
$event_warning = 1;
|
||||
}
|
||||
next;
|
||||
}
|
||||
}
|
||||
|
||||
if (not $period) {
|
||||
$period = 1
|
||||
}
|
||||
($m_pid, $m_tid, $m_period) = ($pid, $tid, $period);
|
||||
|
||||
if ($include_tid) {
|
||||
$pname = "$comm-$m_pid/$m_tid";
|
||||
} elsif ($include_pid) {
|
||||
$pname = "$comm-$m_pid";
|
||||
} else {
|
||||
$pname = "$comm";
|
||||
}
|
||||
$pname =~ tr/ /_/;
|
||||
|
||||
#
|
||||
# stack line
|
||||
#
|
||||
} elsif (/^\s*(\w+)\s*(.+) \((.*)\)/) {
|
||||
# ignore filtered samples
|
||||
next if not $pname;
|
||||
|
||||
my ($pc, $rawfunc, $mod) = ($1, $2, $3);
|
||||
|
||||
if ($show_inline == 1 && $mod !~ m/(perf-\d+.map|kernel\.|\[[^\]]+\])/) {
|
||||
my $inlineRes = inline($pc, $rawfunc, $mod);
|
||||
# - empty result this happens e.g., when $mod does not exist or is a path to a compressed kernel module
|
||||
# if this happens, the user will see error message from addr2line written to stderr
|
||||
# - if addr2line results in "??" , then it's much more sane to fall back than produce a '??' in graph
|
||||
if($inlineRes ne "" and $inlineRes ne "??" and $inlineRes ne "??:??:0" ) {
|
||||
unshift @stack, $inlineRes;
|
||||
next;
|
||||
}
|
||||
}
|
||||
|
||||
# Linux 4.8 included symbol offsets in perf script output by default, eg:
|
||||
# 7fffb84c9afc cpu_startup_entry+0x800047c022ec ([kernel.kallsyms])
|
||||
# strip these off:
|
||||
$rawfunc =~ s/\+0x[\da-f]+$//;
|
||||
|
||||
next if $rawfunc =~ /^\(/; # skip process names
|
||||
|
||||
my $is_unknown=0;
|
||||
my @inline;
|
||||
for (split /\->/, $rawfunc) {
|
||||
my $func = $_;
|
||||
|
||||
if ($func eq "[unknown]") {
|
||||
if ($mod ne "[unknown]") { # use module name instead, if known
|
||||
$func = $mod;
|
||||
$func =~ s/.*\///;
|
||||
} else {
|
||||
$func = "unknown";
|
||||
$is_unknown=1;
|
||||
}
|
||||
|
||||
if ($include_addrs) {
|
||||
$func = "\[$func \<$pc\>\]";
|
||||
} else {
|
||||
$func = "\[$func\]";
|
||||
}
|
||||
}
|
||||
|
||||
if ($tidy_generic) {
|
||||
$func =~ s/;/:/g;
|
||||
if ($func !~ m/\.\(.*\)\./) {
|
||||
# This doesn't look like a Go method name (such as
|
||||
# "net/http.(*Client).Do"), so everything after the first open
|
||||
# paren (that is not part of an "(anonymous namespace)") is
|
||||
# just noise.
|
||||
$func =~ s/\((?!anonymous namespace\)).*//;
|
||||
}
|
||||
# now tidy this horrible thing:
|
||||
# 13a80b608e0a RegExp:[&<>\"\'] (/tmp/perf-7539.map)
|
||||
$func =~ tr/"\'//d;
|
||||
# fall through to $tidy_java
|
||||
}
|
||||
|
||||
if ($tidy_java and $pname =~ m/^java/) {
|
||||
# along with $tidy_generic, converts the following:
|
||||
# Lorg/mozilla/javascript/ContextFactory;.call(Lorg/mozilla/javascript/ContextAction;)Ljava/lang/Object;
|
||||
# Lorg/mozilla/javascript/ContextFactory;.call(Lorg/mozilla/javascript/C
|
||||
# Lorg/mozilla/javascript/MemberBox;.<init>(Ljava/lang/reflect/Method;)V
|
||||
# into:
|
||||
# org/mozilla/javascript/ContextFactory:.call
|
||||
# org/mozilla/javascript/ContextFactory:.call
|
||||
# org/mozilla/javascript/MemberBox:.init
|
||||
$func =~ s/^L// if $func =~ m:/:;
|
||||
}
|
||||
|
||||
#
|
||||
# Annotations
|
||||
#
|
||||
# detect inlined from the @inline array
|
||||
# detect kernel from the module name; eg, frames to parse include:
|
||||
# ffffffff8103ce3b native_safe_halt ([kernel.kallsyms])
|
||||
# 8c3453 tcp_sendmsg (/lib/modules/4.3.0-rc1-virtual/build/vmlinux)
|
||||
# 7d8 ipv4_conntrack_local+0x7f8f80b8 ([nf_conntrack_ipv4])
|
||||
# detect jit from the module name; eg:
|
||||
# 7f722d142778 Ljava/io/PrintStream;::print (/tmp/perf-19982.map)
|
||||
if (scalar(@inline) > 0) {
|
||||
$func .= "_[i]" unless $func =~ m/\_\[i\]/; # inlined
|
||||
} elsif ($annotate_kernel == 1 && $mod =~ m/(^\[|vmlinux$)/ && $mod !~ /unknown/) {
|
||||
$func .= "_[k]"; # kernel
|
||||
} elsif ($annotate_jit == 1 && $mod =~ m:/tmp/perf-\d+\.map:) {
|
||||
$func .= "_[j]" unless $func =~ m/\_\[j\]/; # jitted
|
||||
}
|
||||
|
||||
#
|
||||
# Source lines
|
||||
#
|
||||
#
|
||||
# Sample outputs:
|
||||
# | a.out 35081 252436.005167: 667783 cycles:
|
||||
# | 408ebb some_method_name+0x8b (/full/path/to/a.out)
|
||||
# | uniform_int_dist.h:300
|
||||
# | 4069f5 main+0x935 (/full/path/to/a.out)
|
||||
# | file.cpp:137
|
||||
# | 7f6d2148eb25 __libc_start_main+0xd5 (/lib64/libc-2.33.so)
|
||||
# | libc-2.33.so[27b25]
|
||||
#
|
||||
# | a.out 35081 252435.738165: 306459 cycles:
|
||||
# | 7f6d213c2750 [unknown] (/usr/lib64/libkmod.so.2.3.6)
|
||||
# | libkmod.so.2.3.6[6750]
|
||||
#
|
||||
# | a.out 35081 252435.738373: 315813 cycles:
|
||||
# | 7f6d215ca51b __strlen_avx2+0x4b (/lib64/libc-2.33.so)
|
||||
# | libc-2.33.so[16351b]
|
||||
# | 7ffc71ee9580 [unknown] ([unknown])
|
||||
# |
|
||||
#
|
||||
# | a.out 35081 252435.718940: 247984 cycles:
|
||||
# | ffffffff814f9302 up_write+0x32 ([kernel.kallsyms])
|
||||
# | [kernel.kallsyms][ffffffff814f9302]
|
||||
if($srcline_in_input and not $is_unknown){
|
||||
$_ = <>;
|
||||
chomp;
|
||||
s/\[.*?\]//g;
|
||||
s/^\s*//g;
|
||||
s/\s*$//g;
|
||||
$func.=':'.$_ unless $_ eq "";
|
||||
}
|
||||
|
||||
push @inline, $func;
|
||||
}
|
||||
|
||||
unshift @stack, @inline;
|
||||
} else {
|
||||
warn "Unrecognized line: $_";
|
||||
}
|
||||
}
|
||||
|
||||
foreach my $k (sort { $a cmp $b } keys %collapsed) {
|
||||
print "$k $collapsed{$k}\n";
|
||||
}
|
||||
862
stackflame.svg
Normal file
862
stackflame.svg
Normal file
@@ -0,0 +1,862 @@
|
||||
<?xml version="1.0" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" width="1200" height="390" onload="init(evt)" viewBox="0 0 1200 390" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Flame graph stack visualization. See https://github.com/brendangregg/FlameGraph for latest version, and http://www.brendangregg.com/flamegraphs.html for examples. -->
|
||||
<!-- NOTES: -->
|
||||
<defs>
|
||||
<linearGradient id="background" y1="0" y2="1" x1="0" x2="0" >
|
||||
<stop stop-color="#eeeeee" offset="5%" />
|
||||
<stop stop-color="#eeeeb0" offset="95%" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<style type="text/css">
|
||||
text { font-family:Verdana; font-size:12px; fill:rgb(0,0,0); }
|
||||
#search, #ignorecase { opacity:0.1; cursor:pointer; }
|
||||
#search:hover, #search.show, #ignorecase:hover, #ignorecase.show { opacity:1; }
|
||||
#subtitle { text-anchor:middle; font-color:rgb(160,160,160); }
|
||||
#title { text-anchor:middle; font-size:17px}
|
||||
#unzoom { cursor:pointer; }
|
||||
#frames > *:hover { stroke:black; stroke-width:0.5; cursor:pointer; }
|
||||
.hide { display:none; }
|
||||
.parent { opacity:0.5; }
|
||||
</style>
|
||||
<script type="text/ecmascript">
|
||||
<![CDATA[
|
||||
"use strict";
|
||||
var details, searchbtn, unzoombtn, matchedtxt, svg, searching, currentSearchTerm, ignorecase, ignorecaseBtn;
|
||||
function init(evt) {
|
||||
details = document.getElementById("details").firstChild;
|
||||
searchbtn = document.getElementById("search");
|
||||
ignorecaseBtn = document.getElementById("ignorecase");
|
||||
unzoombtn = document.getElementById("unzoom");
|
||||
matchedtxt = document.getElementById("matched");
|
||||
svg = document.getElementsByTagName("svg")[0];
|
||||
searching = 0;
|
||||
currentSearchTerm = null;
|
||||
|
||||
// use GET parameters to restore a flamegraphs state.
|
||||
var params = get_params();
|
||||
if (params.x && params.y)
|
||||
zoom(find_group(document.querySelector('[x="' + params.x + '"][y="' + params.y + '"]')));
|
||||
if (params.s) search(params.s);
|
||||
}
|
||||
|
||||
// event listeners
|
||||
window.addEventListener("click", function(e) {
|
||||
var target = find_group(e.target);
|
||||
if (target) {
|
||||
if (target.nodeName == "a") {
|
||||
if (e.ctrlKey === false) return;
|
||||
e.preventDefault();
|
||||
}
|
||||
if (target.classList.contains("parent")) unzoom(true);
|
||||
zoom(target);
|
||||
if (!document.querySelector('.parent')) {
|
||||
// we have basically done a clearzoom so clear the url
|
||||
var params = get_params();
|
||||
if (params.x) delete params.x;
|
||||
if (params.y) delete params.y;
|
||||
history.replaceState(null, null, parse_params(params));
|
||||
unzoombtn.classList.add("hide");
|
||||
return;
|
||||
}
|
||||
|
||||
// set parameters for zoom state
|
||||
var el = target.querySelector("rect");
|
||||
if (el && el.attributes && el.attributes.y && el.attributes._orig_x) {
|
||||
var params = get_params()
|
||||
params.x = el.attributes._orig_x.value;
|
||||
params.y = el.attributes.y.value;
|
||||
history.replaceState(null, null, parse_params(params));
|
||||
}
|
||||
}
|
||||
else if (e.target.id == "unzoom") clearzoom();
|
||||
else if (e.target.id == "search") search_prompt();
|
||||
else if (e.target.id == "ignorecase") toggle_ignorecase();
|
||||
}, false)
|
||||
|
||||
// mouse-over for info
|
||||
// show
|
||||
window.addEventListener("mouseover", function(e) {
|
||||
var target = find_group(e.target);
|
||||
if (target) details.nodeValue = "Function: " + g_to_text(target);
|
||||
}, false)
|
||||
|
||||
// clear
|
||||
window.addEventListener("mouseout", function(e) {
|
||||
var target = find_group(e.target);
|
||||
if (target) details.nodeValue = ' ';
|
||||
}, false)
|
||||
|
||||
// ctrl-F for search
|
||||
// ctrl-I to toggle case-sensitive search
|
||||
window.addEventListener("keydown",function (e) {
|
||||
if (e.keyCode === 114 || (e.ctrlKey && e.keyCode === 70)) {
|
||||
e.preventDefault();
|
||||
search_prompt();
|
||||
}
|
||||
else if (e.ctrlKey && e.keyCode === 73) {
|
||||
e.preventDefault();
|
||||
toggle_ignorecase();
|
||||
}
|
||||
}, false)
|
||||
|
||||
// functions
|
||||
function get_params() {
|
||||
var params = {};
|
||||
var paramsarr = window.location.search.substr(1).split('&');
|
||||
for (var i = 0; i < paramsarr.length; ++i) {
|
||||
var tmp = paramsarr[i].split("=");
|
||||
if (!tmp[0] || !tmp[1]) continue;
|
||||
params[tmp[0]] = decodeURIComponent(tmp[1]);
|
||||
}
|
||||
return params;
|
||||
}
|
||||
function parse_params(params) {
|
||||
var uri = "?";
|
||||
for (var key in params) {
|
||||
uri += key + '=' + encodeURIComponent(params[key]) + '&';
|
||||
}
|
||||
if (uri.slice(-1) == "&")
|
||||
uri = uri.substring(0, uri.length - 1);
|
||||
if (uri == '?')
|
||||
uri = window.location.href.split('?')[0];
|
||||
return uri;
|
||||
}
|
||||
function find_child(node, selector) {
|
||||
var children = node.querySelectorAll(selector);
|
||||
if (children.length) return children[0];
|
||||
}
|
||||
function find_group(node) {
|
||||
var parent = node.parentElement;
|
||||
if (!parent) return;
|
||||
if (parent.id == "frames") return node;
|
||||
return find_group(parent);
|
||||
}
|
||||
function orig_save(e, attr, val) {
|
||||
if (e.attributes["_orig_" + attr] != undefined) return;
|
||||
if (e.attributes[attr] == undefined) return;
|
||||
if (val == undefined) val = e.attributes[attr].value;
|
||||
e.setAttribute("_orig_" + attr, val);
|
||||
}
|
||||
function orig_load(e, attr) {
|
||||
if (e.attributes["_orig_"+attr] == undefined) return;
|
||||
e.attributes[attr].value = e.attributes["_orig_" + attr].value;
|
||||
e.removeAttribute("_orig_"+attr);
|
||||
}
|
||||
function g_to_text(e) {
|
||||
var text = find_child(e, "title").firstChild.nodeValue;
|
||||
return (text)
|
||||
}
|
||||
function g_to_func(e) {
|
||||
var func = g_to_text(e);
|
||||
// if there's any manipulation we want to do to the function
|
||||
// name before it's searched, do it here before returning.
|
||||
return (func);
|
||||
}
|
||||
function update_text(e) {
|
||||
var r = find_child(e, "rect");
|
||||
var t = find_child(e, "text");
|
||||
var w = parseFloat(r.attributes.width.value) -3;
|
||||
var txt = find_child(e, "title").textContent.replace(/\([^(]*\)$/,"");
|
||||
t.attributes.x.value = parseFloat(r.attributes.x.value) + 3;
|
||||
|
||||
// Smaller than this size won't fit anything
|
||||
if (w < 2 * 12 * 0.59) {
|
||||
t.textContent = "";
|
||||
return;
|
||||
}
|
||||
|
||||
t.textContent = txt;
|
||||
var sl = t.getSubStringLength(0, txt.length);
|
||||
// check if only whitespace or if we can fit the entire string into width w
|
||||
if (/^ *$/.test(txt) || sl < w)
|
||||
return;
|
||||
|
||||
// this isn't perfect, but gives a good starting point
|
||||
// and avoids calling getSubStringLength too often
|
||||
var start = Math.floor((w/sl) * txt.length);
|
||||
for (var x = start; x > 0; x = x-2) {
|
||||
if (t.getSubStringLength(0, x + 2) <= w) {
|
||||
t.textContent = txt.substring(0, x) + "..";
|
||||
return;
|
||||
}
|
||||
}
|
||||
t.textContent = "";
|
||||
}
|
||||
|
||||
// zoom
|
||||
function zoom_reset(e) {
|
||||
if (e.attributes != undefined) {
|
||||
orig_load(e, "x");
|
||||
orig_load(e, "width");
|
||||
}
|
||||
if (e.childNodes == undefined) return;
|
||||
for (var i = 0, c = e.childNodes; i < c.length; i++) {
|
||||
zoom_reset(c[i]);
|
||||
}
|
||||
}
|
||||
function zoom_child(e, x, ratio) {
|
||||
if (e.attributes != undefined) {
|
||||
if (e.attributes.x != undefined) {
|
||||
orig_save(e, "x");
|
||||
e.attributes.x.value = (parseFloat(e.attributes.x.value) - x - 10) * ratio + 10;
|
||||
if (e.tagName == "text")
|
||||
e.attributes.x.value = find_child(e.parentNode, "rect[x]").attributes.x.value + 3;
|
||||
}
|
||||
if (e.attributes.width != undefined) {
|
||||
orig_save(e, "width");
|
||||
e.attributes.width.value = parseFloat(e.attributes.width.value) * ratio;
|
||||
}
|
||||
}
|
||||
|
||||
if (e.childNodes == undefined) return;
|
||||
for (var i = 0, c = e.childNodes; i < c.length; i++) {
|
||||
zoom_child(c[i], x - 10, ratio);
|
||||
}
|
||||
}
|
||||
function zoom_parent(e) {
|
||||
if (e.attributes) {
|
||||
if (e.attributes.x != undefined) {
|
||||
orig_save(e, "x");
|
||||
e.attributes.x.value = 10;
|
||||
}
|
||||
if (e.attributes.width != undefined) {
|
||||
orig_save(e, "width");
|
||||
e.attributes.width.value = parseInt(svg.width.baseVal.value) - (10 * 2);
|
||||
}
|
||||
}
|
||||
if (e.childNodes == undefined) return;
|
||||
for (var i = 0, c = e.childNodes; i < c.length; i++) {
|
||||
zoom_parent(c[i]);
|
||||
}
|
||||
}
|
||||
function zoom(node) {
|
||||
var attr = find_child(node, "rect").attributes;
|
||||
var width = parseFloat(attr.width.value);
|
||||
var xmin = parseFloat(attr.x.value);
|
||||
var xmax = parseFloat(xmin + width);
|
||||
var ymin = parseFloat(attr.y.value);
|
||||
var ratio = (svg.width.baseVal.value - 2 * 10) / width;
|
||||
|
||||
// XXX: Workaround for JavaScript float issues (fix me)
|
||||
var fudge = 0.0001;
|
||||
|
||||
unzoombtn.classList.remove("hide");
|
||||
|
||||
var el = document.getElementById("frames").children;
|
||||
for (var i = 0; i < el.length; i++) {
|
||||
var e = el[i];
|
||||
var a = find_child(e, "rect").attributes;
|
||||
var ex = parseFloat(a.x.value);
|
||||
var ew = parseFloat(a.width.value);
|
||||
var upstack;
|
||||
// Is it an ancestor
|
||||
if (0 == 0) {
|
||||
upstack = parseFloat(a.y.value) > ymin;
|
||||
} else {
|
||||
upstack = parseFloat(a.y.value) < ymin;
|
||||
}
|
||||
if (upstack) {
|
||||
// Direct ancestor
|
||||
if (ex <= xmin && (ex+ew+fudge) >= xmax) {
|
||||
e.classList.add("parent");
|
||||
zoom_parent(e);
|
||||
update_text(e);
|
||||
}
|
||||
// not in current path
|
||||
else
|
||||
e.classList.add("hide");
|
||||
}
|
||||
// Children maybe
|
||||
else {
|
||||
// no common path
|
||||
if (ex < xmin || ex + fudge >= xmax) {
|
||||
e.classList.add("hide");
|
||||
}
|
||||
else {
|
||||
zoom_child(e, xmin, ratio);
|
||||
update_text(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
search();
|
||||
}
|
||||
function unzoom(dont_update_text) {
|
||||
unzoombtn.classList.add("hide");
|
||||
var el = document.getElementById("frames").children;
|
||||
for(var i = 0; i < el.length; i++) {
|
||||
el[i].classList.remove("parent");
|
||||
el[i].classList.remove("hide");
|
||||
zoom_reset(el[i]);
|
||||
if(!dont_update_text) update_text(el[i]);
|
||||
}
|
||||
search();
|
||||
}
|
||||
function clearzoom() {
|
||||
unzoom();
|
||||
|
||||
// remove zoom state
|
||||
var params = get_params();
|
||||
if (params.x) delete params.x;
|
||||
if (params.y) delete params.y;
|
||||
history.replaceState(null, null, parse_params(params));
|
||||
}
|
||||
|
||||
// search
|
||||
function toggle_ignorecase() {
|
||||
ignorecase = !ignorecase;
|
||||
if (ignorecase) {
|
||||
ignorecaseBtn.classList.add("show");
|
||||
} else {
|
||||
ignorecaseBtn.classList.remove("show");
|
||||
}
|
||||
reset_search();
|
||||
search();
|
||||
}
|
||||
function reset_search() {
|
||||
var el = document.querySelectorAll("#frames rect");
|
||||
for (var i = 0; i < el.length; i++) {
|
||||
orig_load(el[i], "fill")
|
||||
}
|
||||
var params = get_params();
|
||||
delete params.s;
|
||||
history.replaceState(null, null, parse_params(params));
|
||||
}
|
||||
function search_prompt() {
|
||||
if (!searching) {
|
||||
var term = prompt("Enter a search term (regexp " +
|
||||
"allowed, eg: ^ext4_)"
|
||||
+ (ignorecase ? ", ignoring case" : "")
|
||||
+ "\nPress Ctrl-i to toggle case sensitivity", "");
|
||||
if (term != null) search(term);
|
||||
} else {
|
||||
reset_search();
|
||||
searching = 0;
|
||||
currentSearchTerm = null;
|
||||
searchbtn.classList.remove("show");
|
||||
searchbtn.firstChild.nodeValue = "Search"
|
||||
matchedtxt.classList.add("hide");
|
||||
matchedtxt.firstChild.nodeValue = ""
|
||||
}
|
||||
}
|
||||
function search(term) {
|
||||
if (term) currentSearchTerm = term;
|
||||
if (currentSearchTerm === null) return;
|
||||
|
||||
var re = new RegExp(currentSearchTerm, ignorecase ? 'i' : '');
|
||||
var el = document.getElementById("frames").children;
|
||||
var matches = new Object();
|
||||
var maxwidth = 0;
|
||||
for (var i = 0; i < el.length; i++) {
|
||||
var e = el[i];
|
||||
var func = g_to_func(e);
|
||||
var rect = find_child(e, "rect");
|
||||
if (func == null || rect == null)
|
||||
continue;
|
||||
|
||||
// Save max width. Only works as we have a root frame
|
||||
var w = parseFloat(rect.attributes.width.value);
|
||||
if (w > maxwidth)
|
||||
maxwidth = w;
|
||||
|
||||
if (func.match(re)) {
|
||||
// highlight
|
||||
var x = parseFloat(rect.attributes.x.value);
|
||||
orig_save(rect, "fill");
|
||||
rect.attributes.fill.value = "rgb(230,0,230)";
|
||||
|
||||
// remember matches
|
||||
if (matches[x] == undefined) {
|
||||
matches[x] = w;
|
||||
} else {
|
||||
if (w > matches[x]) {
|
||||
// overwrite with parent
|
||||
matches[x] = w;
|
||||
}
|
||||
}
|
||||
searching = 1;
|
||||
}
|
||||
}
|
||||
if (!searching)
|
||||
return;
|
||||
var params = get_params();
|
||||
params.s = currentSearchTerm;
|
||||
history.replaceState(null, null, parse_params(params));
|
||||
|
||||
searchbtn.classList.add("show");
|
||||
searchbtn.firstChild.nodeValue = "Reset Search";
|
||||
|
||||
// calculate percent matched, excluding vertical overlap
|
||||
var count = 0;
|
||||
var lastx = -1;
|
||||
var lastw = 0;
|
||||
var keys = Array();
|
||||
for (k in matches) {
|
||||
if (matches.hasOwnProperty(k))
|
||||
keys.push(k);
|
||||
}
|
||||
// sort the matched frames by their x location
|
||||
// ascending, then width descending
|
||||
keys.sort(function(a, b){
|
||||
return a - b;
|
||||
});
|
||||
// Step through frames saving only the biggest bottom-up frames
|
||||
// thanks to the sort order. This relies on the tree property
|
||||
// where children are always smaller than their parents.
|
||||
var fudge = 0.0001; // JavaScript floating point
|
||||
for (var k in keys) {
|
||||
var x = parseFloat(keys[k]);
|
||||
var w = matches[keys[k]];
|
||||
if (x >= lastx + lastw - fudge) {
|
||||
count += w;
|
||||
lastx = x;
|
||||
lastw = w;
|
||||
}
|
||||
}
|
||||
// display matched percent
|
||||
matchedtxt.classList.remove("hide");
|
||||
var pct = 100 * count / maxwidth;
|
||||
if (pct != 100) pct = pct.toFixed(1)
|
||||
matchedtxt.firstChild.nodeValue = "Matched: " + pct + "%";
|
||||
}
|
||||
]]>
|
||||
</script>
|
||||
<rect x="0.0" y="0" width="1200.0" height="390.0" fill="url(#background)" />
|
||||
<text id="title" x="600.00" y="24" >Flame Graph</text>
|
||||
<text id="details" x="10.00" y="373" > </text>
|
||||
<text id="unzoom" x="10.00" y="24" class="hide">Reset Zoom</text>
|
||||
<text id="search" x="1090.00" y="24" >Search</text>
|
||||
<text id="ignorecase" x="1174.00" y="24" >ic</text>
|
||||
<text id="matched" x="1090.00" y="373" > </text>
|
||||
<g id="frames">
|
||||
<g >
|
||||
<title>_IO_new_file_underflow (2 samples, 0.52%)</title><rect x="1122.4" y="101" width="6.1" height="15.0" fill="rgb(214,42,10)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="111.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::ssl_client::read_loop() (4 samples, 1.04%)</title><rect x="919.6" y="213" width="12.3" height="15.0" fill="rgb(243,175,41)" rx="2" ry="2" />
|
||||
<text x="922.58" y="223.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>lll_mutex_lock_optimized (1 samples, 0.26%)</title><rect x="117.6" y="213" width="3.0" height="15.0" fill="rgb(209,22,5)" rx="2" ry="2" />
|
||||
<text x="120.55" y="223.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::https_client::connect() (4 samples, 1.04%)</title><rect x="919.6" y="229" width="12.3" height="15.0" fill="rgb(251,211,50)" rx="2" ry="2" />
|
||||
<text x="922.58" y="239.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>___pthread_cond_wait (20 samples, 5.21%)</title><rect x="1128.5" y="277" width="61.5" height="15.0" fill="rgb(252,219,52)" rx="2" ry="2" />
|
||||
<text x="1131.54" y="287.5" >___pth..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>___pthread_mutex_lock (1 samples, 0.26%)</title><rect x="117.6" y="229" width="3.0" height="15.0" fill="rgb(206,7,1)" rx="2" ry="2" />
|
||||
<text x="120.55" y="239.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>all (384 samples, 100%)</title><rect x="10.0" y="341" width="1180.0" height="15.0" fill="rgb(213,39,9)" rx="2" ry="2" />
|
||||
<text x="13.00" y="351.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___underflow (2 samples, 0.52%)</title><rect x="1122.4" y="117" width="6.1" height="15.0" fill="rgb(221,74,17)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="127.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>nlohmann::json_abi_v3_11_2::detail::parser<nlohmann::json_abi_v3_11_2::basic_json<std::map, (1 samples, 0.26%)</title><rect x="1079.4" y="149" width="3.0" height="15.0" fill="rgb(217,59,14)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="159.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__futex_abstimed_wait_common (256 samples, 66.67%)</title><rect x="132.9" y="197" width="786.7" height="15.0" fill="rgb(205,0,0)" rx="2" ry="2" />
|
||||
<text x="135.92" y="207.5" >__futex_abstimed_wait_common</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>___pthread_cond_clockwait64 (40 samples, 10.42%)</title><rect x="931.9" y="261" width="122.9" height="15.0" fill="rgb(233,129,30)" rx="2" ry="2" />
|
||||
<text x="934.88" y="271.5" >___pthread_cond..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>?? (2 samples, 0.52%)</title><rect x="1122.4" y="165" width="6.1" height="15.0" fill="rgb(249,205,49)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="175.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___libc_free (1 samples, 0.26%)</title><rect x="1054.8" y="133" width="3.1" height="15.0" fill="rgb(252,218,52)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="143.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>_IO_new_file_underflow (3 samples, 0.78%)</title><rect x="1057.9" y="117" width="9.2" height="15.0" fill="rgb(214,42,10)" rx="2" ry="2" />
|
||||
<text x="1060.86" y="127.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_Invoker<std::tuple<bumbleBee::MusicPlayManager::play(dpp::discord_voice_client*)::<lambda(dpp::discord_voice_client*)>, (13 samples, 3.39%)</title><rect x="1082.4" y="261" width="40.0" height="15.0" fill="rgb(208,13,3)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="271.5" >std..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI__IO_fread (3 samples, 0.78%)</title><rect x="1057.9" y="165" width="9.2" height="15.0" fill="rgb(212,34,8)" rx="2" ry="2" />
|
||||
<text x="1060.86" y="175.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>bumbleBee::MusicPlayManager::remove (1 samples, 0.26%)</title><rect x="1054.8" y="165" width="3.1" height="15.0" fill="rgb(230,117,28)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="175.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI__IO_default_xsgetn (3 samples, 0.78%)</title><rect x="1057.9" y="149" width="9.2" height="15.0" fill="rgb(236,145,34)" rx="2" ry="2" />
|
||||
<text x="1060.86" y="159.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>___pthread_cond_clockwait64 (40 samples, 10.42%)</title><rect x="931.9" y="245" width="122.9" height="15.0" fill="rgb(233,129,30)" rx="2" ry="2" />
|
||||
<text x="934.88" y="255.5" >___pthread_cond..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI__IO_getline (4 samples, 1.04%)</title><rect x="1067.1" y="133" width="12.3" height="15.0" fill="rgb(226,100,23)" rx="2" ry="2" />
|
||||
<text x="1070.08" y="143.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>_int_free (1 samples, 0.26%)</title><rect x="1054.8" y="117" width="3.1" height="15.0" fill="rgb(247,196,46)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="127.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___libc_read (2 samples, 0.52%)</title><rect x="1122.4" y="69" width="6.1" height="15.0" fill="rgb(241,166,39)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="79.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::in_thread::in_loop(unsigned (260 samples, 67.71%)</title><rect x="132.9" y="277" width="799.0" height="15.0" fill="rgb(208,15,3)" rx="2" ry="2" />
|
||||
<text x="135.92" y="287.5" >dpp::in_thread::in_loop(unsigned</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>bumbleBee::BumbleBee::start (20 samples, 5.21%)</title><rect x="1128.5" y="309" width="61.5" height="15.0" fill="rgb(252,216,51)" rx="2" ry="2" />
|
||||
<text x="1131.54" y="319.5" >bumble..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__futex_abstimed_wait_common64 (13 samples, 3.39%)</title><rect x="1082.4" y="101" width="40.0" height="15.0" fill="rgb(220,71,17)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="111.5" >__f..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::discord_voice_client::write_ready() (4 samples, 1.04%)</title><rect x="120.6" y="245" width="12.3" height="15.0" fill="rgb(245,186,44)" rx="2" ry="2" />
|
||||
<text x="123.62" y="255.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>operator() (2 samples, 0.52%)</title><rect x="1122.4" y="197" width="6.1" height="15.0" fill="rgb(231,121,29)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="207.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__pthread_cond_wait_common (40 samples, 10.42%)</title><rect x="931.9" y="229" width="122.9" height="15.0" fill="rgb(210,24,5)" rx="2" ry="2" />
|
||||
<text x="934.88" y="239.5" >__pthread_cond_..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI__IO_default_xsgetn (2 samples, 0.52%)</title><rect x="1122.4" y="133" width="6.1" height="15.0" fill="rgb(236,145,34)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="143.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>nlohmann::json_abi_v3_11_2::operator>> (1 samples, 0.26%)</title><rect x="1079.4" y="165" width="3.0" height="15.0" fill="rgb(210,23,5)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="175.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__futex_abstimed_wait_common (40 samples, 10.42%)</title><rect x="931.9" y="197" width="122.9" height="15.0" fill="rgb(205,0,0)" rx="2" ry="2" />
|
||||
<text x="934.88" y="207.5" >__futex_abstime..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>___pthread_cond_wait (13 samples, 3.39%)</title><rect x="1082.4" y="165" width="40.0" height="15.0" fill="rgb(252,219,52)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="175.5" >___..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::__invoke_impl<void, (13 samples, 3.39%)</title><rect x="1082.4" y="213" width="40.0" height="15.0" fill="rgb(244,179,42)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="223.5" >std..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>main (20 samples, 5.21%)</title><rect x="1128.5" y="325" width="61.5" height="15.0" fill="rgb(243,179,42)" rx="2" ry="2" />
|
||||
<text x="1131.54" y="335.5" >main</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_Invoker<std::tuple<bumbleBee::BumbleBee::on_slashcommand(const (9 samples, 2.34%)</title><rect x="1054.8" y="245" width="27.6" height="15.0" fill="rgb(251,213,50)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="255.5" >s..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::__invoke<bumbleBee::MusicPlayManager::send_audio_to_voice(std::shared_ptr<bumbleBee::MusicQueueElement>, (2 samples, 0.52%)</title><rect x="1122.4" y="229" width="6.1" height="15.0" fill="rgb(217,59,14)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="239.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::request_queue::out_loop() (40 samples, 10.42%)</title><rect x="931.9" y="277" width="122.9" height="15.0" fill="rgb(227,105,25)" rx="2" ry="2" />
|
||||
<text x="934.88" y="287.5" >dpp::request_qu..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_Invoker<std::tuple<bumbleBee::MusicPlayManager::send_audio_to_voice(std::shared_ptr<bumbleBee::MusicQueueElement>, (2 samples, 0.52%)</title><rect x="1122.4" y="245" width="6.1" height="15.0" fill="rgb(216,50,12)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="255.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::__invoke_impl<void, (9 samples, 2.34%)</title><rect x="1054.8" y="213" width="27.6" height="15.0" fill="rgb(244,179,42)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="223.5" >s..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_Invoker<std::tuple<bumbleBee::BumbleBee::on_slashcommand(const (9 samples, 2.34%)</title><rect x="1054.8" y="261" width="27.6" height="15.0" fill="rgb(251,213,50)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="271.5" >s..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_State_impl<std::thread::_Invoker<std::tuple<bumbleBee::MusicPlayManager::play(dpp::discord_voice_client*)::<lambda(dpp::discord_voice_client*)>, (13 samples, 3.39%)</title><rect x="1082.4" y="277" width="40.0" height="15.0" fill="rgb(205,4,1)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="287.5" >std..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>bumbleBee::commands::Play::execute (8 samples, 2.08%)</title><rect x="1057.9" y="181" width="24.5" height="15.0" fill="rgb(217,56,13)" rx="2" ry="2" />
|
||||
<text x="1060.86" y="191.5" >b..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___poll (20 samples, 5.21%)</title><rect x="10.0" y="245" width="61.5" height="15.0" fill="rgb(228,110,26)" rx="2" ry="2" />
|
||||
<text x="13.00" y="255.5" >__GI__..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>_IO_fgets (4 samples, 1.04%)</title><rect x="1067.1" y="149" width="12.3" height="15.0" fill="rgb(235,139,33)" rx="2" ry="2" />
|
||||
<text x="1070.08" y="159.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::__invoke<bumbleBee::MusicPlayManager::play(dpp::discord_voice_client*)::<lambda(dpp::discord_voice_client*)>, (13 samples, 3.39%)</title><rect x="1082.4" y="229" width="40.0" height="15.0" fill="rgb(209,22,5)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="239.5" >std..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_State_impl<std::thread::_Invoker<std::tuple<bumbleBee::MusicPlayManager::send_audio_to_voice(std::shared_ptr<bumbleBee::MusicQueueElement>, (2 samples, 0.52%)</title><rect x="1122.4" y="277" width="6.1" height="15.0" fill="rgb(213,41,9)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="287.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___libc_read (2 samples, 0.52%)</title><rect x="1122.4" y="85" width="6.1" height="15.0" fill="rgb(241,166,39)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="95.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>___pthread_cond_clockwait64 (256 samples, 66.67%)</title><rect x="132.9" y="245" width="786.7" height="15.0" fill="rgb(233,129,30)" rx="2" ry="2" />
|
||||
<text x="135.92" y="255.5" >___pthread_cond_clockwait64</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>operator() (9 samples, 2.34%)</title><rect x="1054.8" y="197" width="27.6" height="15.0" fill="rgb(231,121,29)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="207.5" >o..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___clock_nanosleep (1 samples, 0.26%)</title><rect x="120.6" y="213" width="3.1" height="15.0" fill="rgb(232,126,30)" rx="2" ry="2" />
|
||||
<text x="123.62" y="223.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__futex_abstimed_wait_common (13 samples, 3.39%)</title><rect x="1082.4" y="117" width="40.0" height="15.0" fill="rgb(205,0,0)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="127.5" >__f..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___poll (4 samples, 1.04%)</title><rect x="919.6" y="197" width="12.3" height="15.0" fill="rgb(228,110,26)" rx="2" ry="2" />
|
||||
<text x="922.58" y="207.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__pthread_cond_wait_common (20 samples, 5.21%)</title><rect x="1128.5" y="261" width="61.5" height="15.0" fill="rgb(210,24,5)" rx="2" ry="2" />
|
||||
<text x="1131.54" y="271.5" >__pthr..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>nlohmann::json_abi_v3_11_2::detail::lexer<nlohmann::json_abi_v3_11_2::basic_json<std::map, (1 samples, 0.26%)</title><rect x="1079.4" y="85" width="3.0" height="15.0" fill="rgb(222,78,18)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="95.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>nlohmann::json_abi_v3_11_2::detail::parser<nlohmann::json_abi_v3_11_2::basic_json<std::map, (1 samples, 0.26%)</title><rect x="1079.4" y="133" width="3.0" height="15.0" fill="rgb(217,59,14)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="143.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::discord_voice_client::thread_run() (20 samples, 5.21%)</title><rect x="71.5" y="277" width="61.4" height="15.0" fill="rgb(238,153,36)" rx="2" ry="2" />
|
||||
<text x="74.46" y="287.5" >dpp::d..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::discord_client::thread_run() (20 samples, 5.21%)</title><rect x="10.0" y="277" width="61.5" height="15.0" fill="rgb(251,214,51)" rx="2" ry="2" />
|
||||
<text x="13.00" y="287.5" >dpp::d..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>nlohmann::json_abi_v3_11_2::detail::lexer<nlohmann::json_abi_v3_11_2::basic_json<std::map, (1 samples, 0.26%)</title><rect x="1079.4" y="101" width="3.0" height="15.0" fill="rgb(222,78,18)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="111.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___poll (15 samples, 3.91%)</title><rect x="71.5" y="245" width="46.1" height="15.0" fill="rgb(228,110,26)" rx="2" ry="2" />
|
||||
<text x="74.46" y="255.5" >__GI..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___underflow (3 samples, 0.78%)</title><rect x="1057.9" y="133" width="9.2" height="15.0" fill="rgb(221,74,17)" rx="2" ry="2" />
|
||||
<text x="1060.86" y="143.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_State_impl<std::thread::_Invoker<std::tuple<bumbleBee::BumbleBee::on_slashcommand(const (9 samples, 2.34%)</title><rect x="1054.8" y="277" width="27.6" height="15.0" fill="rgb(249,203,48)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="287.5" >s..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___futex_abstimed_wait_cancelable64 (13 samples, 3.39%)</title><rect x="1082.4" y="133" width="40.0" height="15.0" fill="rgb(215,48,11)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="143.5" >__G..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>___pthread_cond_clockwait64 (256 samples, 66.67%)</title><rect x="132.9" y="261" width="786.7" height="15.0" fill="rgb(233,129,30)" rx="2" ry="2" />
|
||||
<text x="135.92" y="271.5" >___pthread_cond_clockwait64</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::https_client::https_client(std::__cxx11::basic_string<char, (4 samples, 1.04%)</title><rect x="919.6" y="245" width="12.3" height="15.0" fill="rgb(206,4,1)" rx="2" ry="2" />
|
||||
<text x="922.58" y="255.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>nlohmann::json_abi_v3_11_2::detail::lexer<nlohmann::json_abi_v3_11_2::basic_json<std::map, (1 samples, 0.26%)</title><rect x="1079.4" y="69" width="3.0" height="15.0" fill="rgb(222,78,18)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="79.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::ssl_client::read_loop() (20 samples, 5.21%)</title><rect x="71.5" y="261" width="61.4" height="15.0" fill="rgb(243,175,41)" rx="2" ry="2" />
|
||||
<text x="74.46" y="271.5" >dpp::s..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___futex_abstimed_wait_cancelable64 (40 samples, 10.42%)</title><rect x="931.9" y="213" width="122.9" height="15.0" fill="rgb(215,48,11)" rx="2" ry="2" />
|
||||
<text x="934.88" y="223.5" >__GI___futex_ab..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__futex_abstimed_wait_common64 (40 samples, 10.42%)</title><rect x="931.9" y="181" width="122.9" height="15.0" fill="rgb(220,71,17)" rx="2" ry="2" />
|
||||
<text x="934.88" y="191.5" >__futex_abstime..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>futex_wait (1 samples, 0.26%)</title><rect x="117.6" y="181" width="3.0" height="15.0" fill="rgb(235,138,33)" rx="2" ry="2" />
|
||||
<text x="120.55" y="191.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__pthread_cond_wait_common (256 samples, 66.67%)</title><rect x="132.9" y="229" width="786.7" height="15.0" fill="rgb(210,24,5)" rx="2" ry="2" />
|
||||
<text x="135.92" y="239.5" >__pthread_cond_wait_common</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::vector<char, (1 samples, 0.26%)</title><rect x="1079.4" y="53" width="3.0" height="15.0" fill="rgb(222,81,19)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="63.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::condition_variable::wait<bumbleBee::MusicPlayManager::play(dpp::discord_voice_client*)::<lambda(dpp::discord_voice_client*)>::<lambda()> (13 samples, 3.39%)</title><rect x="1082.4" y="181" width="40.0" height="15.0" fill="rgb(242,172,41)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="191.5" >std..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___libc_read (3 samples, 0.78%)</title><rect x="1057.9" y="85" width="9.2" height="15.0" fill="rgb(241,166,39)" rx="2" ry="2" />
|
||||
<text x="1060.86" y="95.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI__IO_fread (2 samples, 0.52%)</title><rect x="1122.4" y="149" width="6.1" height="15.0" fill="rgb(212,34,8)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="159.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>?? (364 samples, 94.79%)</title><rect x="10.0" y="293" width="1118.5" height="15.0" fill="rgb(249,205,49)" rx="2" ry="2" />
|
||||
<text x="13.00" y="303.5" >??</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__futex_abstimed_wait_common (20 samples, 5.21%)</title><rect x="1128.5" y="229" width="61.5" height="15.0" fill="rgb(205,0,0)" rx="2" ry="2" />
|
||||
<text x="1131.54" y="239.5" >__fute..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>start_thread (364 samples, 94.79%)</title><rect x="10.0" y="309" width="1118.5" height="15.0" fill="rgb(212,34,8)" rx="2" ry="2" />
|
||||
<text x="13.00" y="319.5" >start_thread</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___lll_lock_wait (1 samples, 0.26%)</title><rect x="117.6" y="197" width="3.0" height="15.0" fill="rgb(226,96,23)" rx="2" ry="2" />
|
||||
<text x="120.55" y="207.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>clone3 (364 samples, 94.79%)</title><rect x="10.0" y="325" width="1118.5" height="15.0" fill="rgb(216,54,12)" rx="2" ry="2" />
|
||||
<text x="13.00" y="335.5" >clone3</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::http_request::run(dpp::cluster*) (4 samples, 1.04%)</title><rect x="919.6" y="261" width="12.3" height="15.0" fill="rgb(230,119,28)" rx="2" ry="2" />
|
||||
<text x="922.58" y="271.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI__IO_default_uflow (4 samples, 1.04%)</title><rect x="1067.1" y="101" width="12.3" height="15.0" fill="rgb(234,135,32)" rx="2" ry="2" />
|
||||
<text x="1070.08" y="111.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_Invoker<std::tuple<bumbleBee::MusicPlayManager::play(dpp::discord_voice_client*)::<lambda(dpp::discord_voice_client*)>, (13 samples, 3.39%)</title><rect x="1082.4" y="245" width="40.0" height="15.0" fill="rgb(208,13,3)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="255.5" >std..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___libc_read (4 samples, 1.04%)</title><rect x="1067.1" y="69" width="12.3" height="15.0" fill="rgb(241,166,39)" rx="2" ry="2" />
|
||||
<text x="1070.08" y="79.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___libc_read (3 samples, 0.78%)</title><rect x="1057.9" y="101" width="9.2" height="15.0" fill="rgb(241,166,39)" rx="2" ry="2" />
|
||||
<text x="1060.86" y="111.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>_IO_new_file_underflow (4 samples, 1.04%)</title><rect x="1067.1" y="85" width="12.3" height="15.0" fill="rgb(214,42,10)" rx="2" ry="2" />
|
||||
<text x="1070.08" y="95.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___libc_read (4 samples, 1.04%)</title><rect x="1067.1" y="53" width="12.3" height="15.0" fill="rgb(241,166,39)" rx="2" ry="2" />
|
||||
<text x="1070.08" y="63.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::discord_voice_client::stop_audio() (1 samples, 0.26%)</title><rect x="1054.8" y="149" width="3.1" height="15.0" fill="rgb(217,57,13)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="159.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::__invoke<bumbleBee::BumbleBee::on_slashcommand(const (9 samples, 2.34%)</title><rect x="1054.8" y="229" width="27.6" height="15.0" fill="rgb(253,222,53)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="239.5" >s..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::ssl_client::read_loop() (20 samples, 5.21%)</title><rect x="10.0" y="261" width="61.5" height="15.0" fill="rgb(243,175,41)" rx="2" ry="2" />
|
||||
<text x="13.00" y="271.5" >dpp::s..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI__IO_getline_info (4 samples, 1.04%)</title><rect x="1067.1" y="117" width="12.3" height="15.0" fill="rgb(248,199,47)" rx="2" ry="2" />
|
||||
<text x="1070.08" y="127.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>bumbleBee::commands::Delete::execute (1 samples, 0.26%)</title><rect x="1054.8" y="181" width="3.1" height="15.0" fill="rgb(246,190,45)" rx="2" ry="2" />
|
||||
<text x="1057.79" y="191.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::__invoke_impl<void, (2 samples, 0.52%)</title><rect x="1122.4" y="213" width="6.1" height="15.0" fill="rgb(244,179,42)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="223.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::cluster::start(bool) (20 samples, 5.21%)</title><rect x="1128.5" y="293" width="61.5" height="15.0" fill="rgb(205,0,0)" rx="2" ry="2" />
|
||||
<text x="1131.54" y="303.5" >dpp::c..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::vector<dpp::voice_out_packet, (3 samples, 0.78%)</title><rect x="123.7" y="229" width="9.2" height="15.0" fill="rgb(222,82,19)" rx="2" ry="2" />
|
||||
<text x="126.70" y="239.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>dpp::discord_voice_client::want_write() (1 samples, 0.26%)</title><rect x="117.6" y="245" width="3.0" height="15.0" fill="rgb(233,130,31)" rx="2" ry="2" />
|
||||
<text x="120.55" y="255.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__pthread_cond_wait_common (13 samples, 3.39%)</title><rect x="1082.4" y="149" width="40.0" height="15.0" fill="rgb(210,24,5)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="159.5" >__p..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__futex_abstimed_wait_common64 (256 samples, 66.67%)</title><rect x="132.9" y="181" width="786.7" height="15.0" fill="rgb(220,71,17)" rx="2" ry="2" />
|
||||
<text x="135.92" y="191.5" >__futex_abstimed_wait_common64</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___nanosleep (1 samples, 0.26%)</title><rect x="120.6" y="229" width="3.1" height="15.0" fill="rgb(231,119,28)" rx="2" ry="2" />
|
||||
<text x="123.62" y="239.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>oggz_read (2 samples, 0.52%)</title><rect x="1122.4" y="181" width="6.1" height="15.0" fill="rgb(252,218,52)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="191.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>operator() (13 samples, 3.39%)</title><rect x="1082.4" y="197" width="40.0" height="15.0" fill="rgb(231,121,29)" rx="2" ry="2" />
|
||||
<text x="1085.45" y="207.5" >ope..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::thread::_Invoker<std::tuple<bumbleBee::MusicPlayManager::send_audio_to_voice(std::shared_ptr<bumbleBee::MusicQueueElement>, (2 samples, 0.52%)</title><rect x="1122.4" y="261" width="6.1" height="15.0" fill="rgb(216,50,12)" rx="2" ry="2" />
|
||||
<text x="1125.40" y="271.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___futex_abstimed_wait_cancelable64 (256 samples, 66.67%)</title><rect x="132.9" y="213" width="786.7" height="15.0" fill="rgb(215,48,11)" rx="2" ry="2" />
|
||||
<text x="135.92" y="223.5" >__GI___futex_abstimed_wait_cancelable64</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>nlohmann::json_abi_v3_11_2::detail::parser<nlohmann::json_abi_v3_11_2::basic_json<std::map, (1 samples, 0.26%)</title><rect x="1079.4" y="117" width="3.0" height="15.0" fill="rgb(217,59,14)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="127.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>std::move<char&> (1 samples, 0.26%)</title><rect x="1079.4" y="37" width="3.0" height="15.0" fill="rgb(232,124,29)" rx="2" ry="2" />
|
||||
<text x="1082.38" y="47.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>bumbleBee::ConsoleUtils::getResultFromCommand (4 samples, 1.04%)</title><rect x="1067.1" y="165" width="12.3" height="15.0" fill="rgb(223,85,20)" rx="2" ry="2" />
|
||||
<text x="1070.08" y="175.5" ></text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__futex_abstimed_wait_common64 (20 samples, 5.21%)</title><rect x="1128.5" y="213" width="61.5" height="15.0" fill="rgb(220,71,17)" rx="2" ry="2" />
|
||||
<text x="1131.54" y="223.5" >__fute..</text>
|
||||
</g>
|
||||
<g >
|
||||
<title>__GI___futex_abstimed_wait_cancelable64 (20 samples, 5.21%)</title><rect x="1128.5" y="245" width="61.5" height="15.0" fill="rgb(215,48,11)" rx="2" ry="2" />
|
||||
<text x="1131.54" y="255.5" >__GI__..</text>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 36 KiB |
12
streamOpus.sh
Executable file
12
streamOpus.sh
Executable file
@@ -0,0 +1,12 @@
|
||||
#!/bin/bash
|
||||
|
||||
YTDLP_CMD=$1
|
||||
FFMPEG_CMD=$2
|
||||
URL=$3
|
||||
|
||||
$YTDLP_CMD -o - --quiet --ignore-errors -f bestaudio $URL 2>/dev/null | \
|
||||
$FFMPEG_CMD -hwaccel vaapi -i - -loglevel quiet -hide_banner -c:a copy -f opus - || \
|
||||
$YTDLP_CMD -o - --quiet --ignore-errors -f bestaudio $URL 2>/dev/null | \
|
||||
$FFMPEG_CMD -hwaccel vaapi -i - -loglevel quiet -hide_banner -f opus -c:a libopus -b:a 128k -ar 48000 -ac 2 -
|
||||
|
||||
# -loglevel quiet
|
||||
4
systemStackCapture.sh
Executable file
4
systemStackCapture.sh
Executable file
@@ -0,0 +1,4 @@
|
||||
sudo echo recording...
|
||||
sudo perf record -F 99 -a -g -- sleep 60
|
||||
sudo perf script | ./stackcollapse-perf.pl | ./flamegraph.pl > stackflame.svg
|
||||
sudo rm perf.data
|
||||
Reference in New Issue
Block a user