mirror of
https://github.com/HappyTanuki/BumbleCee.git
synced 2025-10-26 01:45:15 +00:00
와! 소리가 나요! 근데 도당체 코루틴은 왜 안 되는데;
This commit is contained in:
@@ -37,11 +37,13 @@ endif()
|
|||||||
target_include_directories(${BOT_NAME} PUBLIC
|
target_include_directories(${BOT_NAME} PUBLIC
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||||
${OPENSSL_INCLUDE_DIR}
|
${OPENSSL_INCLUDE_DIR}
|
||||||
|
/usr/include/opus
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(${BOT_NAME}
|
target_link_libraries(${BOT_NAME}
|
||||||
dl
|
dl
|
||||||
dpp
|
dpp
|
||||||
|
opus
|
||||||
oggz
|
oggz
|
||||||
mariadbcpp
|
mariadbcpp
|
||||||
${CMAKE_THREAD_LIBS_INIT}
|
${CMAKE_THREAD_LIBS_INIT}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
class IBot {
|
class IBot {
|
||||||
public:
|
public:
|
||||||
IBot(std::string token, std::string DBURL, std::string DBID, std::string DBPassword, int clusterCount = 0);
|
IBot(std::string token, int clusterCount = 0);
|
||||||
virtual void start();
|
virtual void start();
|
||||||
virtual void onCommand(const dpp::slashcommand_t &event);
|
virtual void onCommand(const dpp::slashcommand_t &event);
|
||||||
virtual void onReady(const dpp::ready_t &event);
|
virtual void onReady(const dpp::ready_t &event);
|
||||||
@@ -24,9 +24,4 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
dpp::loglevel logLevel = dpp::ll_debug;
|
dpp::loglevel logLevel = dpp::ll_debug;
|
||||||
|
|
||||||
protected:
|
|
||||||
sql::Driver* DBDriver;
|
|
||||||
std::shared_ptr<sql::SQLString> DBURL;
|
|
||||||
std::shared_ptr<sql::Properties> DBProperties;
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,10 +9,18 @@
|
|||||||
class BumbleCeepp : public IBot {
|
class BumbleCeepp : public IBot {
|
||||||
public:
|
public:
|
||||||
BumbleCeepp(std::string token, std::string DBURL, std::string DBID, std::string DBPassword, int clusterCount = 0);
|
BumbleCeepp(std::string token, std::string DBURL, std::string DBID, std::string DBPassword, int clusterCount = 0);
|
||||||
|
~BumbleCeepp();
|
||||||
|
|
||||||
void enqueueMusic(FQueueElement item, dpp::discord_voice_client* vc);
|
void enqueueMusic(FQueueElement item, dpp::discord_voice_client* vc);
|
||||||
dpp::embed findEmbed(std::string musicID);
|
std::shared_ptr<dpp::embed> findEmbed(std::string musicID);
|
||||||
dpp::embed makeEmbed(
|
bool insertDB(
|
||||||
|
std::string webpage_url,
|
||||||
|
std::string title,
|
||||||
|
std::string uploader,
|
||||||
|
std::string id,
|
||||||
|
std::string thumbnail,
|
||||||
|
time_t duration);
|
||||||
|
std::shared_ptr<dpp::embed> makeEmbed(
|
||||||
std::string webpage_url,
|
std::string webpage_url,
|
||||||
std::string title,
|
std::string title,
|
||||||
std::string uploader,
|
std::string uploader,
|
||||||
@@ -26,5 +34,5 @@ public:
|
|||||||
private:
|
private:
|
||||||
//<guild_id, queueMutex> 쌍임.
|
//<guild_id, queueMutex> 쌍임.
|
||||||
std::unordered_map<dpp::snowflake, std::mutex> enqueuingMutexMap;
|
std::unordered_map<dpp::snowflake, std::mutex> enqueuingMutexMap;
|
||||||
std::unordered_map<std::string, dpp::embed> musicEmbedMap;
|
sql::Connection* conn;
|
||||||
};
|
};
|
||||||
@@ -9,5 +9,6 @@ public:
|
|||||||
Play(dpp::snowflake botID, BumbleCeepp* Bot);
|
Play(dpp::snowflake botID, BumbleCeepp* Bot);
|
||||||
|
|
||||||
void operator()(const dpp::slashcommand_t& event);
|
void operator()(const dpp::slashcommand_t& event);
|
||||||
|
void on_DLCompleted(std::string musicID, dpp::embed embed, const dpp::slashcommand_t& event);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
10
src/Bot.cpp
10
src/Bot.cpp
@@ -1,16 +1,8 @@
|
|||||||
#include <Bot.hpp>
|
#include <Bot.hpp>
|
||||||
#include <Commands/CommandType.hpp>
|
#include <Commands/CommandType.hpp>
|
||||||
|
|
||||||
IBot::IBot(std::string token, std::string DBURL, std::string DBID, std::string DBPassword, int clusterCount)
|
IBot::IBot(std::string token, int clusterCount)
|
||||||
{
|
{
|
||||||
this->DBURL = std::make_shared<sql::SQLString>(DBURL);
|
|
||||||
sql::Properties pro({
|
|
||||||
{"user", DBID},
|
|
||||||
{"password", DBPassword}
|
|
||||||
});
|
|
||||||
this->DBProperties = std::make_shared<sql::Properties>(pro);
|
|
||||||
DBDriver = sql::mariadb::get_driver_instance();
|
|
||||||
|
|
||||||
botCluster = std::make_shared<dpp::cluster>(token, dpp::i_default_intents, clusterCount);
|
botCluster = std::make_shared<dpp::cluster>(token, dpp::i_default_intents, clusterCount);
|
||||||
|
|
||||||
botCluster->on_log(logger());
|
botCluster->on_log(logger());
|
||||||
|
|||||||
@@ -5,15 +5,21 @@
|
|||||||
#include <oggz/oggz.h>
|
#include <oggz/oggz.h>
|
||||||
|
|
||||||
BumbleCeepp::BumbleCeepp(std::string token, std::string DBURL, std::string DBID, std::string DBPassword, int clusterCount)
|
BumbleCeepp::BumbleCeepp(std::string token, std::string DBURL, std::string DBID, std::string DBPassword, int clusterCount)
|
||||||
: IBot(token, DBURL, DBID, DBPassword, clusterCount)
|
: IBot(token, clusterCount)
|
||||||
{
|
{
|
||||||
|
sql::Properties pro({
|
||||||
|
{"user", DBID},
|
||||||
|
{"password", DBPassword}
|
||||||
|
});
|
||||||
|
|
||||||
|
conn = sql::mariadb::get_driver_instance()->connect(DBURL, pro);
|
||||||
|
|
||||||
commandsArray.push_back(std::make_shared<commands::Play>(botCluster->me.id, this));
|
commandsArray.push_back(std::make_shared<commands::Play>(botCluster->me.id, this));
|
||||||
commandsArray.push_back(std::make_shared<commands::Repeat>(botCluster->me.id, this));
|
// commandsArray.push_back(std::make_shared<commands::Repeat>(botCluster->me.id, this));
|
||||||
commandsArray.push_back(std::make_shared<commands::Queue>(botCluster->me.id, this));
|
// commandsArray.push_back(std::make_shared<commands::Queue>(botCluster->me.id, this));
|
||||||
commandsArray.push_back(std::make_shared<commands::Skip>(botCluster->me.id, this));
|
// commandsArray.push_back(std::make_shared<commands::Skip>(botCluster->me.id, this));
|
||||||
commandsArray.push_back(std::make_shared<commands::Leave>(botCluster->me.id, this));
|
// commandsArray.push_back(std::make_shared<commands::Leave>(botCluster->me.id, this));
|
||||||
commandsArray.push_back(std::make_shared<commands::Delete>(botCluster->me.id, this));
|
// commandsArray.push_back(std::make_shared<commands::Delete>(botCluster->me.id, this));
|
||||||
|
|
||||||
botCluster->on_voice_track_marker([&](const dpp::voice_track_marker_t &marker)
|
botCluster->on_voice_track_marker([&](const dpp::voice_track_marker_t &marker)
|
||||||
{
|
{
|
||||||
@@ -37,7 +43,7 @@ BumbleCeepp::BumbleCeepp(std::string token, std::string DBURL, std::string DBID,
|
|||||||
marker.voice_client->log(dpp::loglevel::ll_debug, "Playing " + marker.track_meta + "on channel id " + marker.voice_client->channel_id.str() + ".");
|
marker.voice_client->log(dpp::loglevel::ll_debug, "Playing " + marker.track_meta + "on channel id " + marker.voice_client->channel_id.str() + ".");
|
||||||
|
|
||||||
int remainingSongsCount = marker.voice_client->get_tracks_remaining();
|
int remainingSongsCount = marker.voice_client->get_tracks_remaining();
|
||||||
marker.voice_client->log(dpp::loglevel::ll_trace, "Marker count : " + remainingSongsCount);
|
marker.voice_client->log(dpp::loglevel::ll_debug, "Marker count : " + remainingSongsCount);
|
||||||
|
|
||||||
if (remainingSongsCount <= 1 && !marker.voice_client->is_playing())
|
if (remainingSongsCount <= 1 && !marker.voice_client->is_playing())
|
||||||
{
|
{
|
||||||
@@ -50,14 +56,33 @@ BumbleCeepp::BumbleCeepp(std::string token, std::string DBURL, std::string DBID,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (repeat)
|
if (repeat) {
|
||||||
enqueueMusic({nowPlayingMusic, findEmbed(nowPlayingMusic)}, marker.voice_client);
|
std::shared_ptr<dpp::embed> embed;
|
||||||
|
if (nowPlayingMusic == "") {
|
||||||
|
nowPlayingMusic = marker.track_meta;
|
||||||
|
}
|
||||||
|
embed = findEmbed(nowPlayingMusic);
|
||||||
|
nowPlayingMusic = marker.track_meta;
|
||||||
|
|
||||||
|
|
||||||
|
if (!embed) {
|
||||||
|
botCluster->log(dpp::loglevel::ll_error, std::string("알 수 없는 오류 발생!"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
enqueueMusic({nowPlayingMusic, *embed}, marker.voice_client);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// cluster->on_voice_ready([&](const dpp::voice_ready_t& Voice){ queue->play(); });
|
// cluster->on_voice_ready([&](const dpp::voice_ready_t& Voice){ queue->play(); });
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BumbleCeepp::~BumbleCeepp()
|
||||||
|
{
|
||||||
|
conn->close();
|
||||||
|
}
|
||||||
|
|
||||||
void BumbleCeepp::enqueueMusic(FQueueElement item, dpp::discord_voice_client* vc)
|
void BumbleCeepp::enqueueMusic(FQueueElement item, dpp::discord_voice_client* vc)
|
||||||
{
|
{
|
||||||
vc->insert_marker(item.ID);
|
vc->insert_marker(item.ID);
|
||||||
@@ -111,31 +136,59 @@ void BumbleCeepp::enqueueMusic(FQueueElement item, dpp::discord_voice_client* vc
|
|||||||
vc->log(dpp::loglevel::ll_debug, "Enqueued " + item.ID + "on channel id " + vc->channel_id.str() + ".");
|
vc->log(dpp::loglevel::ll_debug, "Enqueued " + item.ID + "on channel id " + vc->channel_id.str() + ".");
|
||||||
}
|
}
|
||||||
|
|
||||||
dpp::embed BumbleCeepp::findEmbed(std::string musicID)
|
std::shared_ptr<dpp::embed> BumbleCeepp::findEmbed(std::string musicID)
|
||||||
{
|
{
|
||||||
auto iter = musicEmbedMap.find(musicID);
|
sql::ResultSet* res;
|
||||||
if (iter != musicEmbedMap.end())
|
std::shared_ptr<dpp::embed> returnValue;
|
||||||
return iter->second;
|
try {
|
||||||
|
std::unique_ptr<sql::PreparedStatement> stmnt(conn->prepareStatement("SELECT * FROM songs_info WHERE ID = ?"));
|
||||||
std::unique_ptr<sql::Connection> conn(DBDriver->connect(*this->DBURL, *DBProperties));
|
stmnt->setString(1, musicID);
|
||||||
std::unique_ptr<sql::PreparedStatement> stmnt(conn->prepareStatement("SELECT embed FROM songs_info WHERE ID = ?"));
|
res = stmnt->executeQuery();
|
||||||
stmnt->setString(1, musicID);
|
|
||||||
std::unique_ptr<sql::ResultSet> res(stmnt->executeQuery());
|
|
||||||
|
|
||||||
dpp::embed returnValue = makeEmbed(
|
|
||||||
res->getString("webpage_url").c_str(),
|
|
||||||
res->getString("title").c_str(),
|
|
||||||
res->getString("uploader").c_str(),
|
|
||||||
musicID,
|
|
||||||
res->getString("thumbnail").c_str(),
|
|
||||||
res->getInt("duration"));
|
|
||||||
|
|
||||||
musicEmbedMap[musicID] = returnValue;
|
if (!res->next()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
returnValue = makeEmbed(
|
||||||
|
res->getString("webpage_url").c_str(),
|
||||||
|
res->getString("title").c_str(),
|
||||||
|
res->getString("uploader").c_str(),
|
||||||
|
musicID,
|
||||||
|
res->getString("thumbnail").c_str(),
|
||||||
|
res->getInt("duration"));
|
||||||
|
}
|
||||||
|
catch(sql::SQLException& e){
|
||||||
|
botCluster->log(dpp::loglevel::ll_error, std::string("SQLError: ") + e.what());
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
return returnValue;
|
return returnValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
dpp::embed BumbleCeepp::makeEmbed(std::string webpage_url, std::string title, std::string uploader, std::string id, std::string thumbnail, time_t duration)
|
bool BumbleCeepp::insertDB(
|
||||||
|
std::string webpage_url, std::string title, std::string uploader, std::string id, std::string thumbnail, time_t duration)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
std::unique_ptr<sql::PreparedStatement> stmnt(
|
||||||
|
conn->prepareStatement("REPLACE INTO songs_info (ID, webpage_url, title, uploader, thumbnail, duration) VALUE (?, ?, ?, ?, ?, ?)"));
|
||||||
|
stmnt->setString(1, id);
|
||||||
|
stmnt->setString(2, webpage_url);
|
||||||
|
stmnt->setString(3, title);
|
||||||
|
stmnt->setString(4, uploader);
|
||||||
|
stmnt->setString(5, thumbnail);
|
||||||
|
stmnt->setInt(6, duration);
|
||||||
|
stmnt->executeQuery();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch(sql::SQLException& e){
|
||||||
|
botCluster->log(dpp::loglevel::ll_debug, std::string("SQLError: ") + e.what());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::shared_ptr<dpp::embed> BumbleCeepp::makeEmbed(
|
||||||
|
std::string webpage_url, std::string title, std::string uploader, std::string id, std::string thumbnail, time_t duration)
|
||||||
{
|
{
|
||||||
char SongLengthStr[10];
|
char SongLengthStr[10];
|
||||||
tm t;
|
tm t;
|
||||||
@@ -157,16 +210,7 @@ dpp::embed BumbleCeepp::makeEmbed(std::string webpage_url, std::string title, st
|
|||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
|
||||||
std::unique_ptr<sql::Connection> conn(DBDriver->connect(*this->DBURL, *DBProperties));
|
insertDB(webpage_url, title, uploader, id, thumbnail, duration);
|
||||||
std::unique_ptr<sql::PreparedStatement> stmnt(
|
|
||||||
conn->prepareStatement("REPLACE INTO songs_info (ID, webpage_url, title, uploader, thumbnail, duration) VALUE (?, ?, ?, ?, ?, ?)"));
|
|
||||||
stmnt->setString(1, id);
|
|
||||||
stmnt->setString(2, webpage_url);
|
|
||||||
stmnt->setString(3, title);
|
|
||||||
stmnt->setString(4, uploader);
|
|
||||||
stmnt->setString(5, thumbnail);
|
|
||||||
stmnt->setInt(6, duration);
|
|
||||||
stmnt->executeQuery();
|
|
||||||
|
|
||||||
return returnValue;
|
return std::make_shared<dpp::embed>(returnValue);
|
||||||
}
|
}
|
||||||
@@ -37,7 +37,7 @@ void commands::Delete::operator()(const dpp::slashcommand_t& event)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
dpp::embed embed = Bot->findEmbed(queuedSongs[index - 1])
|
dpp::embed embed = (*Bot->findEmbed(queuedSongs[index - 1]))
|
||||||
.set_timestamp(time(0));
|
.set_timestamp(time(0));
|
||||||
|
|
||||||
dpp::message msg(event.command.channel_id, "다음 항목을 큐에서 삭제했습니다!:");
|
dpp::message msg(event.command.channel_id, "다음 항목을 큐에서 삭제했습니다!:");
|
||||||
|
|||||||
@@ -7,6 +7,21 @@
|
|||||||
|
|
||||||
using json = nlohmann::json;
|
using json = nlohmann::json;
|
||||||
|
|
||||||
|
std::string getResultFromCommand(std::string cmd) {
|
||||||
|
std::string result;
|
||||||
|
FILE* stream;
|
||||||
|
const int maxBuffer = 256; // 버퍼의 크기는 적당하게
|
||||||
|
char buffer[maxBuffer];
|
||||||
|
cmd.append(" 2>&1"); // 표준에러를 표준출력으로 redirect
|
||||||
|
|
||||||
|
stream = popen(cmd.c_str(), "r"); // 주어진 command를 shell로 실행하고 파이프 연결 (fd 반환)
|
||||||
|
if (stream) {
|
||||||
|
while (fgets(buffer, maxBuffer, stream) != NULL) result.append(buffer); // fgets: fd (stream)를 길이 (maxBuffer)만큼 읽어 버퍼 (buffer)에 저장
|
||||||
|
pclose(stream); // 파이프 닫는 것 잊지 마시고요!
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
commands::Play::Play(dpp::snowflake botID, BumbleCeepp* Bot)
|
commands::Play::Play(dpp::snowflake botID, BumbleCeepp* Bot)
|
||||||
: ICommand(botID, Bot)
|
: ICommand(botID, Bot)
|
||||||
{
|
{
|
||||||
@@ -30,99 +45,106 @@ void commands::Play::operator()(const dpp::slashcommand_t& event)
|
|||||||
/* Attempt to connect to a voice channel, returns false if we fail to connect. */
|
/* Attempt to connect to a voice channel, returns false if we fail to connect. */
|
||||||
if (!event.from->get_voice(event.command.guild_id))
|
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))
|
dpp::guild* g = dpp::find_guild(event.command.guild_id);
|
||||||
|
bool memberIsInVoice = g->connect_member_voice(event.command.get_issuing_user().id);
|
||||||
|
if (!memberIsInVoice)
|
||||||
{
|
{
|
||||||
return event.reply("노래를 재생할 음성 채팅방에 먼저 참가하고 신청해야 합니다!");
|
event.reply("노래를 재생할 음성 채팅방에 먼저 참가하고 신청해야 합니다!");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string Query = std::get<std::string>(event.get_parameter("query"));
|
std::string Query = std::get<std::string>(event.get_parameter("query"));
|
||||||
|
|
||||||
dpp::detail::co_await_resolve(event.co_thinking());
|
event.thinking();
|
||||||
|
|
||||||
event.from->log(dpp::loglevel::ll_debug, "음악 ID 쿼리");
|
event.from->log(dpp::loglevel::ll_debug, "음악 ID 쿼리: " + Query);
|
||||||
dpp::utility::exec("python3 youtube-search.py", {Query}, [&](const std::string& output) -> void
|
|
||||||
|
std::string musicIDs = getResultFromCommand(("python3 youtube-search.py \"" + Query + "\" & wait").c_str());
|
||||||
|
|
||||||
|
if (!musicIDs.length())
|
||||||
{
|
{
|
||||||
if (!output.length())
|
event.from->log(dpp::loglevel::ll_debug, "유튜브 검색 결과 없음");
|
||||||
{
|
event.edit_response("검색 결과가 없습니다.");
|
||||||
event.from->log(dpp::loglevel::ll_debug, "검색 결과 없음");
|
return;
|
||||||
event.edit_response("검색 결과가 없습니다.");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
std::system(("python3 youtube-search.py \"" + Query + "\" & wait").c_str());
|
|
||||||
|
|
||||||
event.from->log(dpp::loglevel::ll_debug, "음악 다운로드 시작");
|
|
||||||
std::system(("python3 yt-download.py \"" + Query + "\" & wait").c_str());
|
|
||||||
event.from->log(dpp::loglevel::ll_debug, "음악 다운로드 완료");
|
|
||||||
|
|
||||||
std::ifstream infofile, idfile;
|
|
||||||
json document;
|
|
||||||
std::string ID;
|
|
||||||
std::queue<FQueueElement> RequestedMusic;
|
|
||||||
idfile.open("Temp/CurMusic");
|
|
||||||
while (std::getline(idfile, ID))
|
|
||||||
{
|
|
||||||
event.from->log(dpp::loglevel::ll_trace, "Red ID : " + ID);
|
|
||||||
infofile.open("Music/" + ID + ".info.json");
|
|
||||||
infofile >> document;
|
|
||||||
infofile.close();
|
|
||||||
|
|
||||||
FQueueElement Data = {
|
|
||||||
ID,
|
|
||||||
Bot->makeEmbed(
|
|
||||||
document["webpage_url"],
|
|
||||||
document["title"],
|
|
||||||
document["uploader"],
|
|
||||||
document["id"],
|
|
||||||
document["thumbnail"],
|
|
||||||
int(document["duration"]))
|
|
||||||
};
|
|
||||||
|
|
||||||
RequestedMusic.push(Data);
|
|
||||||
}
|
}
|
||||||
idfile.close();
|
event.from->log(dpp::loglevel::ll_debug, "musicIDs: " + musicIDs);
|
||||||
std::system("rm -f Temp/CurMusic");
|
|
||||||
|
|
||||||
dpp::voiceconn* v = event.from->get_voice(event.command.guild_id);
|
std::stringstream sstream(musicIDs);
|
||||||
|
std::string musicID;
|
||||||
|
while (getline(sstream, musicID, '\n')) {
|
||||||
|
event.from->log(dpp::loglevel::ll_debug, "musicID: " + musicID);
|
||||||
|
event.from->log(dpp::loglevel::ll_debug, "DB쿼리 시도..");
|
||||||
|
std::shared_ptr<dpp::embed> embed = Bot->findEmbed(musicID);
|
||||||
|
|
||||||
/* If the voice channel was invalid, or there is an issue with it, then tell the user. */
|
if (embed == nullptr) {
|
||||||
if (v && v->voiceclient && v->voiceclient->is_ready())
|
event.from->log(dpp::loglevel::ll_debug, "DB쿼리 실패");
|
||||||
{
|
event.from->log(dpp::loglevel::ll_debug, "다운로드 시작");
|
||||||
auto _copiedQueue = RequestedMusic;
|
std::system(("python3 yt-download.py \"" + musicID + "\" & wait").c_str());
|
||||||
while (!_copiedQueue.empty())
|
|
||||||
{
|
event.from->log(dpp::loglevel::ll_debug, "musicID: " + musicID);
|
||||||
Bot->enqueueMusic(_copiedQueue.front(), v->voiceclient);
|
std::ifstream infofile;
|
||||||
_copiedQueue.pop();
|
infofile.open((std::string("Music/") + musicID + ".info.json").c_str());
|
||||||
|
event.from->log(dpp::loglevel::ll_debug, std::string("json file name: ") + "Music/" + musicID + ".info.json");
|
||||||
|
json document;
|
||||||
|
infofile >> document;
|
||||||
|
infofile.close();
|
||||||
|
|
||||||
|
embed = Bot->makeEmbed(
|
||||||
|
document["webpage_url"],
|
||||||
|
document["title"],
|
||||||
|
document["uploader"],
|
||||||
|
document["id"],
|
||||||
|
document["thumbnail"],
|
||||||
|
int(document["duration"]));
|
||||||
|
|
||||||
|
on_DLCompleted(musicID, *embed, event);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
event.from->log(dpp::loglevel::ll_debug, "DB쿼리 완료");
|
||||||
|
on_DLCompleted(musicID, *embed, event);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
return;
|
||||||
{
|
}
|
||||||
auto _copiedQueue = RequestedMusic;
|
|
||||||
event.from->creator->on_voice_ready([&](const dpp::voice_ready_t& Voice)
|
void commands::Play::on_DLCompleted(std::string musicID, dpp::embed embed, const dpp::slashcommand_t& event)
|
||||||
{
|
{
|
||||||
while (!_copiedQueue.empty())
|
static std::string raw_event;
|
||||||
{
|
if (raw_event != event.raw_event){
|
||||||
auto item = _copiedQueue.front();
|
raw_event = event.raw_event;
|
||||||
Bot->enqueueMusic(item, Voice.voice_client);
|
|
||||||
_copiedQueue.pop();
|
dpp::message msg(event.command.channel_id, "큐에 다음 곡을 추가했습니다:");
|
||||||
}
|
msg.add_embed(embed);
|
||||||
});
|
event.edit_response(msg);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
dpp::message msg(event.command.channel_id, "큐에 다음 곡을 추가했습니다:");
|
|
||||||
msg.add_embed(RequestedMusic.front().embed);
|
|
||||||
RequestedMusic.pop();
|
|
||||||
event.edit_original_response(msg);
|
|
||||||
|
|
||||||
while (!RequestedMusic.empty())
|
|
||||||
{
|
|
||||||
dpp::message followMsg(event.command.channel_id, "");
|
dpp::message followMsg(event.command.channel_id, "");
|
||||||
|
|
||||||
followMsg.add_embed(RequestedMusic.front().embed);
|
dpp::embed followEmbed = dpp::embed()
|
||||||
RequestedMusic.pop();
|
.add_field(
|
||||||
|
embed.title,
|
||||||
|
embed.description,
|
||||||
|
true
|
||||||
|
)
|
||||||
|
.add_field(
|
||||||
|
"",
|
||||||
|
""
|
||||||
|
);
|
||||||
|
|
||||||
|
followMsg.add_embed(followEmbed);
|
||||||
|
|
||||||
event.from->creator->message_create(followMsg);
|
event.from->creator->message_create(followMsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
auto voiceconn = event.from->get_voice(event.command.guild_id);
|
||||||
|
|
||||||
|
if (!voiceconn || !voiceconn->voiceclient || !voiceconn->voiceclient->is_ready()) {
|
||||||
|
event.from->creator->on_voice_ready([this, musicID, embed, voiceconn](const dpp::voice_ready_t& Voice){
|
||||||
|
this->Bot->enqueueMusic({musicID, embed}, voiceconn->voiceclient);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Bot->enqueueMusic({musicID, embed}, voiceconn->voiceclient);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ void commands::Queue::operator()(const dpp::slashcommand_t& event) {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
msg.set_content("지금 재생 중:");
|
msg.set_content("지금 재생 중:");
|
||||||
dpp::embed curMusicEmbed = Bot->findEmbed(Bot->nowPlayingMusic);
|
dpp::embed curMusicEmbed = *Bot->findEmbed(Bot->nowPlayingMusic);
|
||||||
msg.add_embed(curMusicEmbed);
|
msg.add_embed(curMusicEmbed);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ void commands::Queue::operator()(const dpp::slashcommand_t& event) {
|
|||||||
int j;
|
int j;
|
||||||
for (j = i; j < i + 5 && j < queuedSongs.size(); j++)
|
for (j = i; j < i + 5 && j < queuedSongs.size(); j++)
|
||||||
{
|
{
|
||||||
dpp::embed originalEmbed = Bot->findEmbed(queuedSongs[j]);
|
dpp::embed originalEmbed = *Bot->findEmbed(queuedSongs[j]);
|
||||||
|
|
||||||
followEmbed.add_field(
|
followEmbed.add_field(
|
||||||
std::to_string(j + 1),
|
std::to_string(j + 1),
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ int main()
|
|||||||
std::ifstream configfile("config.json");
|
std::ifstream configfile("config.json");
|
||||||
configfile >> configdocument;
|
configfile >> configdocument;
|
||||||
|
|
||||||
// setvbuf(stdout, NULL, _IONBF, 0);
|
|
||||||
|
|
||||||
std::shared_ptr<BumbleCeepp> bumbleBee = std::make_shared<BumbleCeepp>(
|
std::shared_ptr<BumbleCeepp> bumbleBee = std::make_shared<BumbleCeepp>(
|
||||||
configdocument["token"], configdocument["dbURL"], configdocument["user"], configdocument["password"]);
|
configdocument["token"], configdocument["dbURL"], configdocument["user"], configdocument["password"]);
|
||||||
|
|
||||||
|
|||||||
@@ -12,11 +12,28 @@ def uri_validator(x):
|
|||||||
except AttributeError:
|
except AttributeError:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
#URL인 경우
|
||||||
if uri_validator(sys.argv[1]) == True:
|
if uri_validator(sys.argv[1]) == True:
|
||||||
exit()
|
result = urllib.parse.urlparse(sys.argv[1])
|
||||||
|
|
||||||
from youtube_search import YoutubeSearch
|
#플레이리스트인 경우
|
||||||
|
if result.path == '/playlist':
|
||||||
|
import re, requests
|
||||||
|
|
||||||
results = YoutubeSearch(sys.argv[1], max_results=10).to_dict()
|
response = requests.get("https://www.youtube.com/playlist?" + result.query)
|
||||||
|
|
||||||
print(results[0]["id"])
|
pattern = re.compile('"videoId":"(.{11})"')
|
||||||
|
|
||||||
|
list = set(pattern.findall(response.text))
|
||||||
|
for it in list:
|
||||||
|
print(it)
|
||||||
|
#영상인 경우
|
||||||
|
elif result.path == '/watch':
|
||||||
|
print(result.query[2:13])
|
||||||
|
else:
|
||||||
|
from youtube_search import YoutubeSearch
|
||||||
|
|
||||||
|
results = YoutubeSearch(sys.argv[1], max_results=10).to_dict()
|
||||||
|
|
||||||
|
#검색 결과가 없는 경우 확인 불가
|
||||||
|
print(results[0]["id"])
|
||||||
@@ -1,47 +1,19 @@
|
|||||||
import yt_dlp
|
import yt_dlp
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import json
|
|
||||||
|
|
||||||
if len(sys.argv) != 2:
|
if len(sys.argv) != 2:
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
ydl_opts = {
|
ydl_opts = {
|
||||||
'quiet': True,
|
'quiet': True,
|
||||||
'clean_infojson': False,
|
|
||||||
'default_search': 'ytsearch',
|
|
||||||
'format': '251',
|
'format': '251',
|
||||||
'outtmpl': {'default': 'Temp/%(id)s.temp'},
|
'outtmpl': {'default': 'Temp/' + sys.argv[1]},
|
||||||
'overwrites': False,
|
'writeinfojson': True
|
||||||
'writeinfojson': True }
|
}
|
||||||
|
|
||||||
with yt_dlp.YoutubeDL(ydl_opts) as ydl:
|
with yt_dlp.YoutubeDL(ydl_opts) as ydl:
|
||||||
info = ydl.extract_info(sys.argv[1], download=False)
|
info = ydl.extract_info("https://www.youtube.com/watch?v=" + sys.argv[1])
|
||||||
id = list()
|
os.system("yes n 2>/dev/null | ffmpeg -hide_banner -loglevel error -i \"" + "Temp/" + sys.argv[1] + "\" -c copy Music/" + sys.argv[1] + ".ogg > /dev/null 2> /dev/null")
|
||||||
with open("out", "w") as f:
|
os.system("mv Temp/" + sys.argv[1] + ".info.json Music/" + sys.argv[1] + ".info.json > /dev/null 2> /dev/null")
|
||||||
f.write(json.dumps(ydl.sanitize_info(info)))
|
os.system("rm -rf Temp/ > /dev/null 2> /dev/null")
|
||||||
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")
|
|
||||||
Reference in New Issue
Block a user