Adding a queue for player send commands to Main process

Config/Configs.py

@@ -30,3 +30,9 @@ def __init__(self) -> None:
 
             self.MY_ERROR_BAD_COMMAND = 'This string serves to verify if some error was raised by myself on purpose'
             self.INVITE_URL = 'https://discordapp.com/oauth2/authorize?client_id={}&scope=bot'
+
+    def getProcessManager(self):
+        return self.__manager
+
+    def setProcessManager(self, newManager):
+        self.__manager = newManager

DiscordCogs/MusicCog.py

@@ -19,6 +19,8 @@
 from UI.Responses.EmbedCogResponse import EmbedCommandResponse
 from UI.Views.PlayerView import PlayerView
 from Music.VulkanBot import VulkanBot
+from Config.Configs import VConfigs
+from Parallelism.ProcessManager import ProcessManager
 
 helper = Helper()
 
@@ -32,6 +34,7 @@ class MusicCog(Cog):
 
     def __init__(self, bot: VulkanBot) -> None:
         self.__bot: VulkanBot = bot
+        VConfigs().setProcessManager(ProcessManager(bot))
 
     @command(name="play", help=helper.HELP_PLAY, description=helper.HELP_PLAY_LONG, aliases=['p', 'tocar'])
     async def play(self, ctx: Context, *args) -> None:

Handlers/ClearHandler.py

@@ -4,7 +4,6 @@
 from Music.VulkanBot import VulkanBot
 from Handlers.AbstractHandler import AbstractHandler
 from Handlers.HandlerResponse import HandlerResponse
-from Parallelism.ProcessManager import ProcessManager
 
 
 class ClearHandler(AbstractHandler):
@@ -13,7 +12,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
 
     async def run(self) -> HandlerResponse:
         # Get the current process of the guild
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if processInfo:
             # Clear the playlist

Handlers/HistoryHandler.py

@@ -4,7 +4,6 @@
 from Handlers.HandlerResponse import HandlerResponse
 from Utils.Utils import Utils
 from typing import Union
-from Parallelism.ProcessManager import ProcessManager
 from discord import Interaction
 
 
@@ -14,7 +13,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
 
     async def run(self) -> HandlerResponse:
         # Get the current process of the guild
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if processInfo:
             processLock = processInfo.getLock()

Handlers/LoopHandler.py

@@ -3,7 +3,6 @@
 from Handlers.AbstractHandler import AbstractHandler
 from Handlers.HandlerResponse import HandlerResponse
 from Config.Exceptions import BadCommandUsage
-from Parallelism.ProcessManager import ProcessManager
 from typing import Union
 from discord import Interaction
 
@@ -14,7 +13,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
 
     async def run(self, args: str) -> HandlerResponse:
         # Get the current process of the guild
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if not processInfo:
             embed = self.embeds.NOT_PLAYING()

Handlers/MoveHandler.py

@@ -5,7 +5,6 @@
 from Handlers.HandlerResponse import HandlerResponse
 from Config.Exceptions import BadCommandUsage, VulkanError, InvalidInput, NumberRequired, UnknownError
 from Music.Playlist import Playlist
-from Parallelism.ProcessManager import ProcessManager
 from typing import Union
 from discord import Interaction
 
@@ -15,7 +14,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
         super().__init__(ctx, bot)
 
     async def run(self, pos1: str, pos2: str) -> HandlerResponse:
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if not processInfo:
             embed = self.embeds.NOT_PLAYING()

Handlers/NowPlayingHandler.py

@@ -3,7 +3,6 @@
 from Handlers.HandlerResponse import HandlerResponse
 from Music.VulkanBot import VulkanBot
 from Utils.Cleaner import Cleaner
-from Parallelism.ProcessManager import ProcessManager
 from typing import Union
 from discord import Interaction
 
@@ -15,7 +14,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
 
     async def run(self) -> HandlerResponse:
         # Get the current process of the guild
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if not processInfo:
             embed = self.embeds.NOT_PLAYING()

Handlers/PauseHandler.py

@@ -1,7 +1,6 @@
 from discord.ext.commands import Context
 from Handlers.AbstractHandler import AbstractHandler
 from Handlers.HandlerResponse import HandlerResponse
-from Parallelism.ProcessManager import ProcessManager
 from Parallelism.Commands import VCommands, VCommandsType
 from Music.VulkanBot import VulkanBot
 from typing import Union
@@ -13,12 +12,12 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
         super().__init__(ctx, bot)
 
     async def run(self) -> HandlerResponse:
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if processInfo:
             # Send Pause command to be execute by player process
             command = VCommands(VCommandsType.PAUSE, None)
-            queue = processInfo.getQueue()
+            queue = processInfo.getQueueToPlayer()
             queue.put(command)
 
             return HandlerResponse(self.ctx)

Handlers/PlayHandler.py

@@ -8,7 +8,6 @@
 from Music.Downloader import Downloader
 from Music.Searcher import Searcher
 from Music.Song import Song
-from Parallelism.ProcessManager import ProcessManager
 from Parallelism.ProcessInfo import ProcessInfo
 from Parallelism.Commands import VCommands, VCommandsType
 from Music.VulkanBot import VulkanBot
@@ -38,7 +37,7 @@ async def run(self, args: str) -> HandlerResponse:
                 raise InvalidInput(self.messages.INVALID_INPUT, self.messages.ERROR_TITLE)
 
             # Get the process context for the current guild
-            processManager = ProcessManager()
+            processManager = self.config.getProcessManager()
             processInfo = processManager.getPlayerInfo(self.guild, self.ctx)
             playlist = processInfo.getPlaylist()
             process = processInfo.getProcess()
@@ -74,7 +73,7 @@ async def run(self, args: str) -> HandlerResponse:
                     playlist.add_song(song)
                     # Release the acquired Lock
                     processLock.release()
-                    queue = processInfo.getQueue()
+                    queue = processInfo.getQueueToPlayer()
                     playCommand = VCommands(VCommandsType.PLAY, None)
                     queue.put(playCommand)
                 else:
@@ -106,7 +105,7 @@ async def run(self, args: str) -> HandlerResponse:
 
     async def __downloadSongsAndStore(self, songs: List[Song], processInfo: ProcessInfo) -> None:
         playlist = processInfo.getPlaylist()
-        queue = processInfo.getQueue()
+        queue = processInfo.getQueueToPlayer()
         playCommand = VCommands(VCommandsType.PLAY, None)
         # Trigger a task for each song to be downloaded
         tasks: List[asyncio.Task] = []
@@ -115,7 +114,7 @@ async def __downloadSongsAndStore(self, songs: List[Song], processInfo: ProcessI
             tasks.append(task)
 
         # In the original order, await for the task and then if successfully downloaded add in the playlist
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         for index, task in enumerate(tasks):
             await task
             song = songs[index]

Handlers/PrevHandler.py

@@ -2,7 +2,6 @@
 from Handlers.AbstractHandler import AbstractHandler
 from Config.Exceptions import BadCommandUsage, ImpossibleMove
 from Handlers.HandlerResponse import HandlerResponse
-from Parallelism.ProcessManager import ProcessManager
 from Parallelism.Commands import VCommands, VCommandsType
 from Music.VulkanBot import VulkanBot
 from typing import Union
@@ -14,7 +13,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
         super().__init__(ctx, bot)
 
     async def run(self) -> HandlerResponse:
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getPlayerInfo(self.guild, self.ctx)
         if not processInfo:
             embed = self.embeds.NOT_PLAYING()
@@ -44,7 +43,7 @@ async def run(self) -> HandlerResponse:
 
         # Send a prev command, together with the user voice channel
         prevCommand = VCommands(VCommandsType.PREV, self.author.voice.channel.id)
-        queue = processInfo.getQueue()
+        queue = processInfo.getQueueToPlayer()
         queue.put(prevCommand)
         return HandlerResponse(self.ctx)
 

Handlers/QueueHandler.py

@@ -3,7 +3,6 @@
 from Handlers.HandlerResponse import HandlerResponse
 from Music.Downloader import Downloader
 from Utils.Utils import Utils
-from Parallelism.ProcessManager import ProcessManager
 from Music.VulkanBot import VulkanBot
 from typing import Union
 from discord import Interaction
@@ -16,7 +15,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
 
     async def run(self) -> HandlerResponse:
         # Retrieve the process of the guild
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if not processInfo:  # If no process return empty list
             embed = self.embeds.EMPTY_QUEUE()

Handlers/RemoveHandler.py

@@ -4,7 +4,6 @@
 from Handlers.HandlerResponse import HandlerResponse
 from Config.Exceptions import BadCommandUsage, VulkanError, ErrorRemoving, InvalidInput, NumberRequired
 from Music.Playlist import Playlist
-from Parallelism.ProcessManager import ProcessManager
 from Music.VulkanBot import VulkanBot
 from typing import Union
 from discord import Interaction
@@ -16,7 +15,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
 
     async def run(self, position: str) -> HandlerResponse:
         # Get the current process of the guild
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if not processInfo:
             # Clear the playlist

Handlers/ResetHandler.py

@@ -1,7 +1,6 @@
 from discord.ext.commands import Context
 from Handlers.AbstractHandler import AbstractHandler
 from Handlers.HandlerResponse import HandlerResponse
-from Parallelism.ProcessManager import ProcessManager
 from Parallelism.Commands import VCommands, VCommandsType
 from Music.VulkanBot import VulkanBot
 from typing import Union
@@ -14,11 +13,11 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
 
     async def run(self) -> HandlerResponse:
         # Get the current process of the guild
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if processInfo:
             command = VCommands(VCommandsType.RESET, None)
-            queue = processInfo.getQueue()
+            queue = processInfo.getQueueToPlayer()
             queue.put(command)
 
             return HandlerResponse(self.ctx)

Handlers/ResumeHandler.py

@@ -1,7 +1,6 @@
 from discord.ext.commands import Context
 from Handlers.AbstractHandler import AbstractHandler
 from Handlers.HandlerResponse import HandlerResponse
-from Parallelism.ProcessManager import ProcessManager
 from Parallelism.Commands import VCommands, VCommandsType
 from Music.VulkanBot import VulkanBot
 from typing import Union
@@ -13,12 +12,12 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
         super().__init__(ctx, bot)
 
     async def run(self) -> HandlerResponse:
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if processInfo:
             # Send Resume command to be execute by player process
             command = VCommands(VCommandsType.RESUME, None)
-            queue = processInfo.getQueue()
+            queue = processInfo.getQueueToPlayer()
             queue.put(command)
 
             return HandlerResponse(self.ctx)

Handlers/ShuffleHandler.py

@@ -2,7 +2,6 @@
 from Handlers.AbstractHandler import AbstractHandler
 from Handlers.HandlerResponse import HandlerResponse
 from Config.Exceptions import UnknownError
-from Parallelism.ProcessManager import ProcessManager
 from Music.VulkanBot import VulkanBot
 from typing import Union
 from discord import Interaction
@@ -13,7 +12,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
         super().__init__(ctx, bot)
 
     async def run(self) -> HandlerResponse:
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if processInfo:
             try:

Handlers/SkipHandler.py

@@ -3,7 +3,6 @@
 from Config.Exceptions import BadCommandUsage
 from Handlers.HandlerResponse import HandlerResponse
 from Music.VulkanBot import VulkanBot
-from Parallelism.ProcessManager import ProcessManager
 from Parallelism.Commands import VCommands, VCommandsType
 from typing import Union
 from discord import Interaction
@@ -14,7 +13,7 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
         super().__init__(ctx, bot)
 
     async def run(self) -> HandlerResponse:
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if processInfo:  # Verify if there is a running process
             playlist = processInfo.getPlaylist()
@@ -25,7 +24,7 @@ async def run(self) -> HandlerResponse:
 
             # Send a command to the player process to skip the music
             command = VCommands(VCommandsType.SKIP, None)
-            queue = processInfo.getQueue()
+            queue = processInfo.getQueueToPlayer()
             queue.put(command)
 
             return HandlerResponse(self.ctx)

Handlers/StopHandler.py

@@ -2,7 +2,6 @@
 from Handlers.AbstractHandler import AbstractHandler
 from Handlers.HandlerResponse import HandlerResponse
 from Music.VulkanBot import VulkanBot
-from Parallelism.ProcessManager import ProcessManager
 from Parallelism.Commands import VCommands, VCommandsType
 from typing import Union
 from discord import Interaction
@@ -13,12 +12,12 @@ def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
         super().__init__(ctx, bot)
 
     async def run(self) -> HandlerResponse:
-        processManager = ProcessManager()
+        processManager = self.config.getProcessManager()
         processInfo = processManager.getRunningPlayerInfo(self.guild)
         if processInfo:
             # Send command to player process stop
             command = VCommands(VCommandsType.STOP, None)
-            queue = processInfo.getQueue()
+            queue = processInfo.getQueueToPlayer()
             queue.put(command)
 
             return HandlerResponse(self.ctx)