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

feature #51

Browse Source 
Radio list and comments
This commit is contained in:
Azlux 2019-06-16 00:12:04 +02:00
parent 22744b3794
commit 145e3f9c32
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configuration.default.ini
View File

@ -72,11 +72,11 @@ url_unban = urlunban
reload = reload reload = reload
[radio] [radio]
ponyville = http://192.99.131.205:8000/stream.mp3 ponyville = http://192.99.131.205:8000/stream.mp3 "Here a command of !radio comment"
luna = http://radio.ponyvillelive.com:8002/stream luna = http://radio.ponyvillelive.com:8002/stream "calm and orchestra music"
radiobrony = http://62.210.138.34:8000/live radiobrony = http://62.210.138.34:8000/live "Borny music of a friend"
celestiaradio = http://celestia.aiverse.org:8000/mp3_256 celestiaradio = http://celestia.aiverse.org:8000/mp3_256
jazz = http://jazz-wr04.ice.infomaniak.ch/jazz-wr04-128.mp3 jazz = http://jazz-wr04.ice.infomaniak.ch/jazz-wr04-128.mp3 "Jazz Yeah !"
[strings] [strings]
current_volume = volume : %d%% current_volume = volume : %d%%
@ -87,6 +87,7 @@ not_playing = No music right now
bad_file = Bad file requested bad_file = Bad file requested
no_file = File not found no_file = File not found
bad_url = Bad URL requested bad_url = Bad URL requested
preconfigurated_radio = Preconfigurated Radio available
unable_download = Error while downloading the music... unable_download = Error while downloading the music...
multiple_matches = Track not found! Possible candidates: multiple_matches = Track not found! Possible candidates:
queue_contents = The next items in the queue are: queue_contents = The next items in the queue are:

27
mumbleBot.py
View File

@ -307,14 +307,25 @@ class MumbleBot:
if media.playlist.get_playlist_info(url=self.get_url_from_input(parameter), start_index=offset, user=user): if media.playlist.get_playlist_info(url=self.get_url_from_input(parameter), start_index=offset, user=user):
self.async_download_next() self.async_download_next()
elif command == var.config.get('command', 'play_radio') and parameter: elif command == var.config.get('command', 'play_radio'):
if var.config.has_option('radio', parameter): if not parameter:
parameter = var.config.get('radio', parameter) all_radio = var.config.items('radio')
music = {'type': 'radio', msg = var.config.get('strings', 'preconfigurated_radio') + " :<br />"
'url': self.get_url_from_input(parameter), for i in all_radio:
'user': user} comment = ""
var.playlist.append(music) if len(i[1].split(maxsplit=1)) == 2:
self.async_download_next() comment = " - " + i[1].split(maxsplit=1)[1]
msg += "<br />" + i[0] + comment
self.send_msg(msg)
else:
if var.config.has_option('radio', parameter):
parameter = var.config.get('radio', parameter)
parameter = parameter.split()[0]
music = {'type': 'radio',
'url': self.get_url_from_input(parameter),
'user': user}
var.playlist.append(music)
self.async_download_next()
elif command == var.config.get('command', 'help'): elif command == var.config.get('command', 'help'):
self.send_msg(var.config.get('strings', 'help'), text) self.send_msg(var.config.get('strings', 'help'), text)

2
pymumble

@ -1 +1 @@
Subproject commit 95945caf51b67919477d088b5d339087bb4397c5 Subproject commit 437d2ebec6e18b5ad69b77020596c250a5e1b785