diff --git a/configuration.default.ini b/configuration.default.ini index 4128aab..b23f8b1 100644 --- a/configuration.default.ini +++ b/configuration.default.ini @@ -3,6 +3,7 @@ host = 127.0.0.1 port = 64738 password = channel = +certificate = [bot] username = botamusique diff --git a/mumbleBot.py b/mumbleBot.py index 21b74a3..9960a49 100644 --- a/mumbleBot.py +++ b/mumbleBot.py @@ -70,22 +70,29 @@ class MumbleBot: host = args.host else: host = var.config.get("server", "host") + if args.port: port = args.port else: port = var.config.getint("server", "port") + if args.password: password = args.password else: password = var.config.get("server", "password") + if args.certificate: + certificate = args.certificate + else: + certificate = var.config.get("server", "certificate") + if args.user: self.username = args.user else: self.username = var.config.get("bot", "username") self.mumble = pymumble.Mumble(host, user=self.username, port=port, password=password, - debug=var.config.getboolean('debug', 'mumbleConnection'), certfile=args.certificate) + debug=var.config.getboolean('debug', 'mumbleConnection'), certfile=certificate) self.mumble.callbacks.set_callback("text_received", self.message_received) self.mumble.set_codec_profile("audio")