ekzyis
/
musicube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '21-add-more-logging' into 'develop' 

Resolve "Add more logging"

Closes #21

See merge request ekzyis/musicube!21
This commit is contained in:
Ramdip Gill 2021-11-04 00:47:01 +00:00
parent 6d805e11be 7905d7d3ed
commit c6f045a96e
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bot.py
View File

@ -70,6 +70,7 @@ class Music(commands.Cog):
def _next(self): def _next(self):
"""Trigger playback of next song.""" """Trigger playback of next song."""
self.logger.info("Song finished. Triggering playback of next song")
self._queue.task_done() self._queue.task_done()
self._current_skip_message = None self._current_skip_message = None
if self._queue_lock.locked(): if self._queue_lock.locked():
@ -79,12 +80,16 @@ class Music(commands.Cog):
async def _handle_playback(self): async def _handle_playback(self):
while True: while True:
try: try:
self.logger.info("Waiting for queue lock to acquire ...")
await self._queue_lock.acquire() await self._queue_lock.acquire()
self.logger.info("Queue lock acquired! Waiting for song queue to return a song ...")
ctx, song = await self._queue.get() ctx, song = await self._queue.get()
self.logger.info("Queue returned a song!")
if ctx.voice_client is None: if ctx.voice_client is None:
# Bot is no longer in a voice channel. # Bot is no longer in a voice channel.
# This could be the case because a stop command was issued. # This could be the case because a stop command was issued.
# We will skip this (and possibly all remaining songs) in the queue # We will skip this (and possibly all remaining songs) in the queue
self.logger.info('Bot is no longer in a voice channel. Skipping song "%s"', song.title)
self._next() self._next()
continue continue
audio = discord.FFmpegPCMAudio(song.audio_url, **self._ffmpeg_options) audio = discord.FFmpegPCMAudio(song.audio_url, **self._ffmpeg_options)
@ -93,6 +98,7 @@ class Music(commands.Cog):
if err: if err:
self.logger.error("Player error: %s", err) self.logger.error("Player error: %s", err)
self._next() self._next()
self.logger.info('Now playing song "%s"', song.title)
ctx.voice_client.play(audio, after=after) ctx.voice_client.play(audio, after=after)
embed = NowPlayingMessage(title=song.title, url=song.webpage_url) embed = NowPlayingMessage(title=song.title, url=song.webpage_url)
msg = await ctx.send(embed=embed) msg = await ctx.send(embed=embed)
@ -133,6 +139,7 @@ class Music(commands.Cog):
audio_url=data.get('url'), audio_url=data.get('url'),
webpage_url=data.get('webpage_url') webpage_url=data.get('webpage_url')
) )
self.logger.info('Qeueing song: title="%s", audio_url=%s, webpage_url=%s', song.title, song.audio_url, song.webpage_url)
await self._queue.put((ctx, song)) await self._queue.put((ctx, song))
if ctx.voice_client.is_playing(): if ctx.voice_client.is_playing():
embed = QueuedMessage(title=song.title, url=song.webpage_url) embed = QueuedMessage(title=song.title, url=song.webpage_url)
@ -144,6 +151,7 @@ class Music(commands.Cog):
raise commands.CommandError("No song playing") raise commands.CommandError("No song playing")
# This skips to next song because the bot does not differentiate between # This skips to next song because the bot does not differentiate between
# a song stopping because it is finished or because it was manually stopped. # a song stopping because it is finished or because it was manually stopped.
self.logger.info("Skipping song")
voice_client.stop() voice_client.stop()
@commands.command() @commands.command()
@ -153,13 +161,16 @@ class Music(commands.Cog):
@commands.command() @commands.command()
async def stop(self, ctx): async def stop(self, ctx):
self.logger.info("Stopping playback")
await ctx.voice_client.disconnect() await ctx.voice_client.disconnect()
@play.before_invoke @play.before_invoke
async def ensure_voice(self, ctx): async def ensure_voice(self, ctx):
if ctx.voice_client is None: if ctx.voice_client is None:
if ctx.author.voice: if ctx.author.voice:
self.logger.info("Connecting to voice channel ...")
await ctx.author.voice.channel.connect() await ctx.author.voice.channel.connect()
self.logger.info("Connected")
else: else:
raise commands.CommandError("Author not connected to a voice channel") raise commands.CommandError("Author not connected to a voice channel")

3
src/error.py
View File

@ -14,7 +14,9 @@ class ErrorHandler(commands.Cog):
@commands.Cog.listener() @commands.Cog.listener()
async def on_command_error(self, ctx: commands.Context, error: commands.CommandError): async def on_command_error(self, ctx: commands.Context, error: commands.CommandError):
command_name = ctx.command.name
if isinstance(error, commands.CommandNotFound): if isinstance(error, commands.CommandNotFound):
self.logger.error(error)
return return
if isinstance(error, commands.MissingPermissions): if isinstance(error, commands.MissingPermissions):
message = "You are missing the required permissions to run this command!" message = "You are missing the required permissions to run this command!"
@ -25,6 +27,7 @@ class ErrorHandler(commands.Cog):
else: else:
message = "Oh no! Something went wrong while running the command!" message = "Oh no! Something went wrong while running the command!"
self.logger.error('Error during command "%s": %s', command_name, message)
embed = ErrorMessage(message) embed = ErrorMessage(message)
await ctx.send(embed=embed) await ctx.send(embed=embed)