Changing View in Queue message and creating new handler to jump to music

Handlers/HandlerResponse.py

@@ -2,7 +2,7 @@ from typing import Union
 from discord.ext.commands import Context
 from Config.Exceptions import VulkanError
 from discord import Embed, Interaction
-from discord.ui import View
+from UI.Views.AbstractView import AbstractView
 
 
 class HandlerResponse:
@@ -22,7 +22,7 @@ class HandlerResponse:
         return self.__embed
 
     @property
-    def view(self) -> View:
+    def view(self) -> AbstractView:
         return self.__view
 
     def error(self) -> Union[VulkanError, None]:

Handlers/JumpMusicHandler.py

@@ -0,0 +1,80 @@
+from typing import Union
+from Config.Exceptions import BadCommandUsage, InvalidInput, NumberRequired, UnknownError, VulkanError
+from Handlers.AbstractHandler import AbstractHandler
+from discord.ext.commands import Context
+from discord import Interaction
+from Handlers.HandlerResponse import HandlerResponse
+from Music.Playlist import Playlist
+from Music.VulkanBot import VulkanBot
+from Parallelism.Commands import VCommands, VCommandsType
+
+
+class JumpMusicHandler(AbstractHandler):
+    """Move a music from a specific position and play it directly"""
+
+    def __init__(self, ctx: Union[Context, Interaction], bot: VulkanBot) -> None:
+        super().__init__(ctx, bot)
+
+    async def run(self, musicPos: str) -> HandlerResponse:
+        processManager = self.config.getProcessManager()
+        processInfo = processManager.getRunningPlayerInfo(self.guild)
+        if not processInfo:
+            embed = self.embeds.NOT_PLAYING()
+            error = BadCommandUsage()
+            return HandlerResponse(self.ctx, embed, error)
+
+        processLock = processInfo.getLock()
+        acquired = processLock.acquire(timeout=self.config.ACQUIRE_LOCK_TIMEOUT)
+        if acquired:
+            # Try to convert input to int
+            error = self.__validateInput(musicPos)
+            if error:
+                embed = self.embeds.ERROR_EMBED(error.message)
+                processLock.release()
+                return HandlerResponse(self.ctx, embed, error)
+
+            # Sanitize the input
+            playlist: Playlist = processInfo.getPlaylist()
+            musicPos = self.__sanitizeInput(playlist, musicPos)
+
+            # Validate the position
+            if not playlist.validate_position(musicPos):
+                error = InvalidInput()
+                embed = self.embeds.PLAYLIST_RANGE_ERROR()
+                processLock.release()
+                return HandlerResponse(self.ctx, embed, error)
+            try:
+                # Move the selected song
+                playlist.move_songs(musicPos, 1)
+
+                # Send a command to the player to skip the music
+                command = VCommands(VCommandsType.SKIP, None)
+                queue = processInfo.getQueueToPlayer()
+                queue.put(command)
+
+                processLock.release()
+                return HandlerResponse(self.ctx)
+            except:
+                # Release the acquired Lock
+                processLock.release()
+                embed = self.embeds.ERROR_MOVING()
+                error = UnknownError()
+                return HandlerResponse(self.ctx, embed, error)
+        else:
+            processManager.resetProcess(self.guild, self.ctx)
+            embed = self.embeds.PLAYER_RESTARTED()
+            return HandlerResponse(self.ctx, embed)
+
+    def __validateInput(self, position: str) -> Union[VulkanError, None]:
+        try:
+            position = int(position)
+        except:
+            return NumberRequired(self.messages.ERROR_NUMBER)
+
+    def __sanitizeInput(self, playlist: Playlist, position: int) -> int:
+        position = int(position)
+
+        if position == -1:
+            position = len(playlist.getSongs())
+
+        return position

Handlers/QueueHandler.py

@@ -2,6 +2,7 @@ from discord.ext.commands import Context
 from Config.Exceptions import InvalidIndex
 from Handlers.AbstractHandler import AbstractHandler
 from Handlers.HandlerResponse import HandlerResponse
+from Handlers.JumpMusicHandler import JumpMusicHandler
 from Messages.MessagesCategory import MessagesCategory
 from UI.Views.BasicView import BasicView
 from Utils.Utils import Utils
@@ -11,6 +12,7 @@ from Music.Playlist import Playlist
 from typing import List, Union
 from discord import Button, Interaction
 from UI.Buttons.EmptyButton import CallbackButton
+from UI.Buttons.PlaylistDropdown import PlaylistDropdown
 from Config.Emojis import VEmojis
 
 
@@ -38,6 +40,12 @@ class QueueHandler(AbstractHandler):
                 processLock.release()  # Release the Lock
                 return HandlerResponse(self.ctx, embed)
 
+            allSongs = playlist.getSongs()
+            if len(allSongs) == 0:
+                embed = self.embeds.EMPTY_QUEUE()
+                processLock.release()  # Release the Lock
+                return HandlerResponse(self.ctx, embed)
+
             songsPages = playlist.getSongsPages()
             if pageNumber < 0 or pageNumber >= len(songsPages):
                 embed = self.embeds.INVALID_INDEX()
@@ -45,16 +53,11 @@ class QueueHandler(AbstractHandler):
                 processLock.release()  # Release the Lock
                 return HandlerResponse(self.ctx, embed, error)
 
-            allSongs = playlist.getSongs()
-            if len(allSongs) == 0:
-                embed = self.embeds.EMPTY_QUEUE()
-                processLock.release()  # Release the Lock
-                return HandlerResponse(self.ctx, embed)
-
             # Select the page in queue to be printed
             songs = songsPages[pageNumber]
             # Create view for this embed
             buttons = self.__createViewButtons(songsPages, pageNumber)
+            buttons.extend(self.__createViewJumpButtons(playlist))
             queueView = BasicView(self.bot, buttons, self.config.QUEUE_VIEW_TIMEOUT)
 
             if playlist.isLoopingAll():
@@ -96,3 +99,6 @@ class QueueHandler(AbstractHandler):
                                           self.guild.id, MessagesCategory.QUEUE, "Next Page", pageNumber=nextPageNumber))
 
         return buttons
+
+    def __createViewJumpButtons(self, playlist: Playlist) -> List[Button]:
+        return [PlaylistDropdown(self.bot, JumpMusicHandler, playlist, self.ctx.channel, self.guild.id, MessagesCategory.PLAYER)]

Handlers/SkipHandler.py

@@ -26,12 +26,6 @@ class SkipHandler(AbstractHandler):
                 embed = self.embeds.NOT_PLAYING()
                 return HandlerResponse(self.ctx, embed)
 
-            playlist = processInfo.getPlaylist()
-            if playlist.isLoopingOne():
-                embed = self.embeds.ERROR_DUE_LOOP_ONE_ON()
-                error = BadCommandUsage()
-                return HandlerResponse(self.ctx, embed, error)
-
             # Send a command to the player process to skip the music
             command = VCommands(VCommandsType.SKIP, None)
             queue = processInfo.getQueueToPlayer()