Merge branch 'master' of https://github.com/kijk2869/discodo

discodo/__main__.py

@@ -10,8 +10,8 @@
 from hypercorn.config import Config as hypercornConfig
 from websockets import auth
 
-from .config import Config
 from . import __version__
+from .config import Config
 
 log = logging.getLogger("discodo")
 
@@ -182,6 +182,27 @@ def is_valid_file(parser, args):
     help="seconds to cleanup player when connection of discord terminated (default: 300)",
 )
 
+extExtractorParser = parser.add_argument_group("Extra Extractor Option")
+
+extExtractorParser.add_argument(
+    "--enabled-extractor",
+    action="append",
+    default=[],
+    help="Extra extractors to enable (Support melon and spotify)",
+)
+extExtractorParser.add_argument(
+    "--spotify-id",
+    type=str,
+    default=None,
+    help="Spotify API id (default: None)",
+)
+extExtractorParser.add_argument(
+    "--spotify-secret",
+    type=str,
+    default=None,
+    help="Spotify API secret (default: None)",
+)
+
 logParser = parser.add_argument_group("Logging Option")
 
 logParser.add_argument(
@@ -204,6 +225,9 @@ def is_valid_file(parser, args):
     Config.DEFAULT_GAPLESS = args.default_gapless
     Config.BUFFERLIMIT = args.bufferlimit
     Config.VCTIMEOUT = args.timeout
+    Config.ENABLED_EXT_EXTRACTOR = args.enabled_extractor
+    Config.SPOTIFY_ID = args.spotify_id
+    Config.SPOTIFY_SECRET = args.spotify_secret
 else:
     verbose = args.config.pop("verbose", False)
 

discodo/client/voice_client.py

@@ -1,4 +1,5 @@
 import asyncio
+
 from ..utils import EventDispatcher
 
 
@@ -131,4 +132,4 @@ async def lyricsDone(Data):
         return Data
 
     async def destroy(self) -> dict:
-        return await self.query("VC_DESTROY", Event="VC_DESTROYED")
+        return await self.query("VC_DESTROY", Event="VC_DESTROYED")

discodo/server/events.py

@@ -1,6 +1,8 @@
 import asyncio
 import uuid
+
 from discodo.source import SubtitleSource
+
 from ..errors import NotConnected, NotPlaying
 from ..source import AudioData
 from ..status import getStatus
@@ -384,4 +386,4 @@ async def requestSubtitle(self, Data: dict) -> None:
                 "language": Data["language"],
             },
         }
-        return await self.sendJson(payload)
+        return await self.sendJson(payload)