gigidsss/Plex-Bot-Music
1
0
Fork 0
mirror of https://github.com/jarulsamy/Plex-Bot.git synced 2024-08-19 15:01:55 +02:00
Code Issues Projects Releases Wiki Activity

added basic functionality for looping queues

Browse Source
This commit is contained in:
Carsten Burgard 2022-04-15 15:41:50 +02:00
parent 2f17494ebd
commit 280cbaed92
1 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
PlexBot/bot.py
View File

@ -37,7 +37,9 @@ Plex:
q - Print the current queue (This can take very long!) q - Print the current queue (This can take very long!)
stop - Halt playback and leave vc. stop - Halt playback and leave vc.
loop - Loop the current song. loop - Loop the current song.
unloop - Disable looping. loopq - Loop the current queue.
unloop - Disable looping the current track.
unloopq - Disable looping the current queue.
pause - Pause playback. pause - Pause playback.
resume - Resume playback. resume - Resume playback.
skip - Skip the current song. Give a number as argument to skip more than 1. skip - Skip the current song. Give a number as argument to skip more than 1.
@ -206,6 +208,7 @@ class Plex(commands.Cog):
self.voice_channel = None self.voice_channel = None
self.current_track = None self.current_track = None
self.is_looping = False self.is_looping = False
self.loop_queue = None
self.np_message_id = None self.np_message_id = None
self.show_queue_message_ids = [] self.show_queue_message_ids = []
self.ctx = None self.ctx = None
@ -322,6 +325,14 @@ class Plex(commands.Cog):
self.current_track = await self.play_queue.get() self.current_track = await self.play_queue.get()
except asyncio.exceptions.CancelledError: except asyncio.exceptions.CancelledError:
bot_log.debug("failed to pop queue") bot_log.debug("failed to pop queue")
if not self.current_track and self.loop_queue:
try:
self.current_track = await self.loop_queue.get()
except asyncio.exceptions.CancelledError:
bot_log.debug("failed to pop queue")
self.play_queue = self.loop_queue
self.loop_queue = asyncio.Queue()
async def _audio_player_task(self): async def _audio_player_task(self):
@ -377,6 +388,8 @@ class Plex(commands.Cog):
Raises: Raises:
None None
""" """
if self.loop_queue:
self.bot.loop.call_soon_threadsafe(self.loop_queue.put,self.current_track)
self.current_track = None self.current_track = None
self.bot.loop.call_soon_threadsafe(self.play_next_event.set) self.bot.loop.call_soon_threadsafe(self.play_next_event.set)
@ -776,6 +789,23 @@ class Plex(commands.Cog):
bot_log.debug("Looping "+str(self.current_track)) bot_log.debug("Looping "+str(self.current_track))
self.is_looping = self.current_track self.is_looping = self.current_track
@command()
async def loopq(self, ctx):
"""
User command to activate looping the current queue
Args:
ctx: discord.ext.commands.Context message context from command
Returns:
None
Raises:
None
"""
bot_log.debug("Looping current queue")
self.loop_queue = asyncio.Queue()
@command() @command()
async def unloop(self, ctx): async def unloop(self, ctx):
""" """
@ -790,8 +820,25 @@ class Plex(commands.Cog):
Raises: Raises:
None None
""" """
bot_log.debug("Unlooping") bot_log.debug("Looping current queue")
self.is_looping = False self.is_looping = False
@command()
async def unloopq(self, ctx):
"""
User command to deactivate looping the current queue
Args:
ctx: discord.ext.commands.Context message context from command
Returns:
None
Raises:
None
"""
bot_log.debug("Unlooping")
self.loop_queue = None
@command() @command()
@ -942,6 +989,7 @@ class Plex(commands.Cog):
None None
""" """
self.play_queue = asyncio.Queue() self.play_queue = asyncio.Queue()
self.loop_queue = None
bot_log.debug("Cleared queue") bot_log.debug("Cleared queue")
await ctx.send(":boom: Queue cleared.") await ctx.send(":boom: Queue cleared.")