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

end of playlist fix

Browse Source
This commit is contained in:
azlux 2018-07-12 20:50:27 +02:00
parent 3a6aba9545
commit fb03e8a67a
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mumbleBot.py
View File

@ -125,6 +125,7 @@ class MumbleBot:
parameter = '' parameter = ''
if len(message) > 1: if len(message) > 1:
parameter = message[1] parameter = message[1]
else: else:
return return
@ -171,8 +172,10 @@ class MumbleBot:
elif command == var.config.get('command', 'play_playlist') and parameter: elif command == var.config.get('command', 'play_playlist') and parameter:
offset = 1 offset = 1
if len(message) > 2: try:
offset = int(message[2]) offset = int(parameter.split(" ")[-1])
except ValueError:
pass
var.playlist.append(["playlist", parameter, user, var.config.getint('bot', 'max_track_playlist'), offset]) var.playlist.append(["playlist", parameter, user, var.config.getint('bot', 'max_track_playlist'), offset])
self.async_download_next() self.async_download_next()
@ -364,23 +367,30 @@ class MumbleBot:
path, title = self.download_music(url) path, title = self.download_music(url)
var.current_music["path"] = path var.current_music["path"] = path
audio = EasyID3(path) if os.path.isfile(path):
if audio["title"]: audio = EasyID3(path)
title = audio["title"][0] if audio["title"]:
title = audio["title"][0]
path_thumbnail = var.config.get('bot', 'tmp_folder') + hashlib.md5(path.encode()).hexdigest() + '.jpg' path_thumbnail = var.config.get('bot', 'tmp_folder') + hashlib.md5(path.encode()).hexdigest() + '.jpg'
thumbnail_html = "" thumbnail_html = ""
if os.path.isfile(path_thumbnail): if os.path.isfile(path_thumbnail):
im = Image.open(path_thumbnail) im = Image.open(path_thumbnail)
im.thumbnail((100, 100), Image.ANTIALIAS) im.thumbnail((100, 100), Image.ANTIALIAS)
buffer = BytesIO() buffer = BytesIO()
im.save(buffer, format="JPEG") im.save(buffer, format="JPEG")
thumbnail_base64 = base64.b64encode(buffer.getvalue()) thumbnail_base64 = base64.b64encode(buffer.getvalue())
thumbnail_html = '<img - src="data:image/PNG;base64,' + thumbnail_base64.decode() + '"/>' thumbnail_html = '<img - src="data:image/PNG;base64,' + thumbnail_base64.decode() + '"/>'
logging.debug(thumbnail_html) logging.debug(thumbnail_html)
if var.config.getboolean('bot', 'announce_current_music'): if var.config.getboolean('bot', 'announce_current_music'):
self.send_msg_channel(var.config.get('strings', 'now_playing') % (title, thumbnail_html)) self.send_msg_channel(var.config.get('strings', 'now_playing') % (title, thumbnail_html))
else:
if var.current_music["type"] == "playlist":
var.current_music['current_index'] = var.current_music['number_track_to_play']
if self.get_next():
self.launch_next()
self.async_download_next()
elif var.current_music["type"] == "file": elif var.current_music["type"] == "file":
path = var.config.get('bot', 'music_folder') + var.current_music["path"] path = var.config.get('bot', 'music_folder') + var.current_music["path"]