diff --git a/configuration.example.ini b/configuration.example.ini index 3ad7490..66302fd 100644 --- a/configuration.example.ini +++ b/configuration.example.ini @@ -98,8 +98,10 @@ port = 64738 #ducking_volume = 0.05 #ducking_threshold = 3000 -# 'auto_stop': If a user leaves and the bot is left alone, stop and clear the playlist -#auto_stop = False +# 'when_nobody_in_channel': should the music stop playing when everybody left the channel +# it should be one of "pause" (pause current song), "stop" (also clears playlist) or "nothing" (keep playing music) +# If a user leaves and the bot is left alone, stop and clear the playlist +#when_nobody_in_channel = nothing # [webinterface] stores settings related to the web interface. [webinterface] diff --git a/mumbleBot.py b/mumbleBot.py index 39cb012..00930bc 100644 --- a/mumbleBot.py +++ b/mumbleBot.py @@ -149,10 +149,13 @@ class MumbleBot: self.ducking_sound_received) self.mumble.set_receive_sound(True) - if not var.db.has_option("bot", "auto_stop") and var.config.getboolean("bot", "auto_stop", fallback=False)\ - or var.config.getboolean("bot", "auto_stop"): + if var.config.get("bot", "when_nobody_in_channel") in ['pause', 'stop', 'nothing']: + self.log.warn('Config "when_nobody_in_channel" is not on of "pause", "stop" or "nothing", falling back to "nothing".') + + if var.config.get("bot", "when_nobody_in_channel", fallback='nothing') in ['pause', 'stop']: self.mumble.callbacks.set_callback(pymumble.constants.PYMUMBLE_CLBK_USERREMOVED, self.users_changed) self.mumble.callbacks.set_callback(pymumble.constants.PYMUMBLE_CLBK_USERUPDATED, self.users_changed) + # Debug use self._loop_status = 'Idle' self._display_rms = False @@ -324,9 +327,15 @@ class MumbleBot: def users_changed(self, user, message): own_channel = self.mumble.channels[self.mumble.users.myself['channel_id']] + if len(own_channel.get_users()) > 1: + return + # if the bot is the only user left in the channel - if len(own_channel.get_users()) == 1: - self.log.info('Other users in the channel left. Stopping music now.') + self.log.info('bot: Other users in the channel left. Stopping music now.') + + if var.config.get("bot", "when_nobody_in_channel") == "pause": + self.pause() + else: self.clear() # =======================