자잘한 에디터 버그 픽스

.vscode/launch.json

@@ -5,7 +5,7 @@
             "name": "Debug",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/build/BumbleCee",
+            "program": "/home/happytanuki/BumbleCee/build/BumbleCee",
             "stopAtEntry": false,
             "cwd": "${fileDirname}",
             "environment": [],

src/Commands/CommandType.cpp

@@ -6,14 +6,11 @@ commands::ICommand::ICommand(std::shared_ptr<dpp::cluster> 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;
+    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;
+    (*queueMap)[queueID.guild_id] = std::make_shared<MusicQueue>(queueID, botCluster);
+    
+    return queueMap->find(queueID.guild_id)->second;
 }

src/MusicQueue.cpp

@@ -10,7 +10,7 @@ MusicQueue::MusicQueue(FMusicQueueID id, std::shared_ptr<dpp::cluster> botCluste
     repeat = false;
     this->botCluster = botCluster;
 
-    botCluster->on_voice_track_marker([this, botCluster](const dpp::voice_track_marker_t &marker)
+    botCluster->on_voice_track_marker([this](const dpp::voice_track_marker_t &marker)
     {
         std::cout << marker.track_meta << " Marker reached.\n";
 
@@ -18,6 +18,7 @@ MusicQueue::MusicQueue(FMusicQueueID id, std::shared_ptr<dpp::cluster> botCluste
         {
             std::cout << "Queue ended\n";
             playMutex.unlock();
+            this->botCluster->get_shard(this->getId().shard_id)->disconnect_voice(this->getId().guild_id);
             return;
         }
 
@@ -111,12 +112,20 @@ FMusicQueueID MusicQueue::getId()
 
 void MusicQueue::markerCallback()
 {
+    if (!dpp::find_guild(id.guild_id)->voice_members.size())
+    {
+        std::cout << "voicechat is empty.";
+        playMutex.unlock();
+        return;
+    }
+
     std::cout << "Music play started\n";
 
     dpp::discord_client* joinedShard = botCluster->get_shard(id.shard_id);
     if (!joinedShard)
     {
         std::cout << "No shard\n";
+        playMutex.unlock();
         return;
     }
 
@@ -133,6 +142,7 @@ void MusicQueue::markerCallback()
     if (!v || !v->voiceclient || !v->voiceclient->is_ready())
     {
         std::cout << "not in voicechat. quit musicplay";
+        playMutex.unlock();
         return;
     }
 
@@ -186,6 +196,7 @@ void MusicQueue::markerCallback()
     v->voiceclient->insert_marker(music.fileName + " end");
 
     std::cout << "audio sending complete\n";
+    playMutex.unlock();
 }
 
 void MusicQueue::play()

src/out

@@ -1 +1 @@
-{"id": "koi", "title": "koi", "_type": "playlist", "entries": [{"id": "OSeStDEAZJQ", "title": "Koi", "formats": [{"format_id": "sb3", "format_note": "storyboard", "ext": "mhtml", "protocol": "mhtml", "acodec": "none", "vcodec": "none", "url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L0/default.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLCj9aS8qMoa45SrN_Akjm5ZfxrdBw", "width": 48, "height": 27, "fps": 0.398406374501992, "rows": 10, "columns": 10, "fragments": [{"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L0/default.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLCj9aS8qMoa45SrN_Akjm5ZfxrdBw", "duration": 251.0}], "resolution": "48x27", "aspect_ratio": 1.78, "http_headers": {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.17 Safari/537.36", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Accept-Language": "en-us,en;q=0.5", "Sec-Fetch-Mode": "navigate"}, "audio_ext": "none", "video_ext": "none", "vbr": 0, "abr": 0, "tbr": null, "format": "sb3 - 48x27 (storyboard)"}, {"format_id": "sb2", "format_note": "storyboard", "ext": "mhtml", "protocol": "mhtml", "acodec": "none", "vcodec": "none", "url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L1/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLBf-VzmA_hFOHwGTw3ne0znvf8IVg", "width": 45, "height": 45, "fps": 0.5059760956175299, "rows": 10, "columns": 10, "fragments": [{"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L1/M0.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLBf-VzmA_hFOHwGTw3ne0znvf8IVg", "duration": 197.63779527559055}, {"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L1/M1.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLBf-VzmA_hFOHwGTw3ne0znvf8IVg", "duration": 53.36220472440945}], "resolution": "45x45", "aspect_ratio": 1.0, "http_headers": {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.17 Safari/537.36", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Accept-Language": "en-us,en;q=0.5", "Sec-Fetch-Mode": "navigate"}, "audio_ext": "none", "video_ext": "none", "vbr": 0, "abr": 0, "tbr": null, "format": "sb2 - 45x45 (storyboard)"}, {"format_id": "sb1", "format_note": "storyboard", "ext": "mhtml", "protocol": "mhtml", "acodec": "none", "vcodec": "none", "url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L2/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDZ0rCSXxixAhQZNbtZtvIVKWnppQ", "width": 90, "height": 90, "fps": 0.5059760956175299, "rows": 5, "columns": 5, "fragments": [{"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L2/M0.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDZ0rCSXxixAhQZNbtZtvIVKWnppQ", "duration": 49.40944881889764}, {"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L2/M1.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDZ0rCSXxixAhQZNbtZtvIVKWnppQ", "duration": 49.40944881889764}, {"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L2/M2.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDZ0rCSXxixAhQZNbtZtvIVKWnppQ", "duration": 49.40944881889764}, {"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L2/M3.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDZ0rCSXxixAhQZNbtZtvIVKWnppQ", "duration": 49.40944881889764}, {"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L2/M4.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDZ0rCSXxixAhQZNbtZtvIVKWnppQ", "duration": 49.40944881889764}, {"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L2/M5.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDZ0rCSXxixAhQZNbtZtvIVKWnppQ", "duration": 3.9527559055118218}], "resolution": "90x90", "aspect_ratio": 1.0, "http_headers": {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.17 Safari/537.36", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Accept-Language": "en-us,en;q=0.5", "Sec-Fetch-Mode": "navigate"}, "audio_ext": "none", "video_ext": "none", "vbr": 0, "abr": 0, "tbr": null, "format": "sb1 - 90x90 (storyboard)"}, {"format_id": "sb0", "format_note": "storyboard", "ext": "mhtml", "protocol": "mhtml", "acodec": "none", "vcodec": "none", "url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L3/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDpW7CGPwbX0yY_sYme0COaFZIzSg", "width": 180, "height": 180, "fps": 0.5059760956175299, "rows": 3, "columns": 3, "fragments": [{"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L3/M0.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgigktipBg==&sigh=rs$AOn4CLDpW7CGPwbX0yY_sYme0COaFZIzSg", "duration": 17.78740157480315}, {"url": "https://i.ytimg.com/sb/OSeStDEAZJQ/storyboard3_L3/M1.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzLine truncated
+{"id": "RNvuREAJWGU", "title": "\u300e\uc0b4\uae30\ud798\ub4e0 \uc0ac\ub78c\ub4e4\uc5d0\uac8c\u300f : \ucf67\uce58\ub178\ucf04\ud1a0 - \ub124 \uae30\uaebc\uc774(\u306f\u3044\u3088\u308d\u3053\u3093\u3067) [\uac00\uc0ac/lyrics]", "formats": [{"format_id": "sb3", "format_note": "storyboard", "ext": "mhtml", "protocol": "mhtml", "acodec": "none", "vcodec": "none", "url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L0/default.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLDPdq9VqXUSDgrh5Wi3zYuuxZisPw", "width": 48, "height": 27, "fps": 0.6289308176100629, "rows": 10, "columns": 10, "fragments": [{"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L0/default.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLDPdq9VqXUSDgrh5Wi3zYuuxZisPw", "duration": 159.0}], "resolution": "48x27", "aspect_ratio": 1.78, "filesize_approx": null, "http_headers": {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Accept-Language": "en-us,en;q=0.5", "Sec-Fetch-Mode": "navigate"}, "audio_ext": "none", "video_ext": "none", "vbr": 0, "abr": 0, "tbr": null, "format": "sb3 - 48x27 (storyboard)"}, {"format_id": "sb2", "format_note": "storyboard", "ext": "mhtml", "protocol": "mhtml", "acodec": "none", "vcodec": "none", "url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L1/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLAG2ZwKjA5ux21TnHlUUN2TWF3JFQ", "width": 80, "height": 45, "fps": 0.5094339622641509, "rows": 10, "columns": 10, "fragments": [{"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L1/M0.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLAG2ZwKjA5ux21TnHlUUN2TWF3JFQ", "duration": 159.0}], "resolution": "80x45", "aspect_ratio": 1.78, "filesize_approx": null, "http_headers": {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Accept-Language": "en-us,en;q=0.5", "Sec-Fetch-Mode": "navigate"}, "audio_ext": "none", "video_ext": "none", "vbr": 0, "abr": 0, "tbr": null, "format": "sb2 - 80x45 (storyboard)"}, {"format_id": "sb1", "format_note": "storyboard", "ext": "mhtml", "protocol": "mhtml", "acodec": "none", "vcodec": "none", "url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L2/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLAU2uGZ24escoBZxOCafW_UyVtvMg", "width": 160, "height": 90, "fps": 0.5094339622641509, "rows": 5, "columns": 5, "fragments": [{"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L2/M0.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLAU2uGZ24escoBZxOCafW_UyVtvMg", "duration": 49.07407407407407}, {"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L2/M1.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLAU2uGZ24escoBZxOCafW_UyVtvMg", "duration": 49.07407407407407}, {"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L2/M2.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLAU2uGZ24escoBZxOCafW_UyVtvMg", "duration": 49.07407407407407}, {"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L2/M3.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLAU2uGZ24escoBZxOCafW_UyVtvMg", "duration": 11.7777777777778}], "resolution": "160x90", "aspect_ratio": 1.78, "filesize_approx": null, "http_headers": {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Accept-Language": "en-us,en;q=0.5", "Sec-Fetch-Mode": "navigate"}, "audio_ext": "none", "video_ext": "none", "vbr": 0, "abr": 0, "tbr": null, "format": "sb1 - 160x90 (storyboard)"}, {"format_id": "sb0", "format_note": "storyboard", "ext": "mhtml", "protocol": "mhtml", "acodec": "none", "vcodec": "none", "url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L3/M$M.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLCAmlcEx_ZPD523gKittCQ3RrUDyA", "width": 320, "height": 180, "fps": 0.5094339622641509, "rows": 3, "columns": 3, "fragments": [{"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L3/M0.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLCAmlcEx_ZPD523gKittCQ3RrUDyA", "duration": 17.666666666666668}, {"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L3/M1.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLCAmlcEx_ZPD523gKittCQ3RrUDyA", "duration": 17.666666666666668}, {"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L3/M2.jpg?sqp=-oaymwENSDfyq4qpAwVwAcABBqLzl_8DBgih4OqzBg==&sigh=rs$AOn4CLCAmlcEx_ZPD523gKittCQ3RrUDyA", "duration": 17.666666666666668}, {"url": "https://i.ytimg.com/sb/RNvuREAJWGU/storyboard3_L3/M3.jpg?sqp=-oaymwENSDfyq4qpAwVwAcALine truncated

src/test.py

@@ -0,0 +1,20 @@
+import yt_dlp
+import json
+import sys
+
+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)
+    with open("out", "w") as f:
+        f.write(json.dumps(ydl.sanitize_info(info)))