storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: indent typo. update pymumble

Browse Source
This commit is contained in:
Terry Geng 2020-03-10 23:19:14 +08:00
parent 803d8d0fda
commit 83649dc776
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mumbleBot.py
View File

@ -412,16 +412,16 @@ class MumbleBot:
if not self.is_pause and (self.thread is None or not raw_music):
# ffmpeg thread has gone. indicate that last song has finished, or something is wrong.
if self.read_pcm_size < 481 and len(var.playlist) > 0 and var.playlist.current_index != -1:
if self.read_pcm_size < 481 and len(var.playlist) > 0 and var.playlist.current_index != -1 \
and self.last_ffmpeg_err:
current = var.playlist.current_item()
self.log.error("bot: cannot play music %s", current.format_debug_string())
if self.last_ffmpeg_err:
self.log.error("bot: with ffmpeg error: %s", self.last_ffmpeg_err)
self.last_ffmpeg_err = ""
self.log.error("bot: with ffmpeg error: %s", self.last_ffmpeg_err)
self.last_ffmpeg_err = ""
self.send_msg(constants.strings('unable', item=current.format_short_string()))
var.playlist.remove_by_id(current.id)
var.cache.free_and_delete(current.id)
self.send_msg(constants.strings('unable_play', item=current.format_short_string()))
var.playlist.remove_by_id(current.id)
var.cache.free_and_delete(current.id)
# move to the next song.
if not self.wait_for_downloading:

2
pymumble

@ -1 +1 @@
Subproject commit 3cfdaa0cf1a54290283cee656fdded6bb492c909
Subproject commit c95e53633f41f662ef03c4fdaf295fa819c26675