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

Merge branch 'master' into qol

Browse Source
This commit is contained in:
Lari 2018-06-18 17:34:08 +03:00 committed by GitHub
commit 01e3c9d549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configuration.default.ini
View File

@ -1,4 +1,11 @@
[server]
host = 127.0.0.1
port = 64738
password =
channel =
[bot] [bot]
username = botamusique
comment = Hi, I'm here to play radio, local music or youtube/soundcloud music. Have fun ! comment = Hi, I'm here to play radio, local music or youtube/soundcloud music. Have fun !
volume = 0.1 volume = 0.1
admin = User1;User2; # Allow user to kill the bot admin = User1;User2; # Allow user to kill the bot

32
mumbleBot.py
View File

@ -69,7 +69,25 @@ class MumbleBot:
tt.daemon = True tt.daemon = True
tt.start() tt.start()
self.mumble = pymumble.Mumble(args.host, user=args.user, port=args.port, password=args.password, if args.host:
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.user:
user = args.user
else:
user = var.config.get("bot", "user")
self.mumble = pymumble.Mumble(host, user=user, port=port, password=password,
debug=var.config.getboolean('debug', 'mumbleConnection')) debug=var.config.getboolean('debug', 'mumbleConnection'))
self.mumble.callbacks.set_callback("text_received", self.message_received) self.mumble.callbacks.set_callback("text_received", self.message_received)
@ -369,14 +387,14 @@ if __name__ == '__main__':
parser.add_argument("-q", "--quiet", dest="quiet", action="store_true", help="Only Error logs") parser.add_argument("-q", "--quiet", dest="quiet", action="store_true", help="Only Error logs")
# Mumble arguments # Mumble arguments
parser.add_argument("-s", "--server", dest="host", type=str, required=True, help="Hostname of the Mumble server") parser.add_argument("-s", "--server", dest="host", type=str, help="Hostname of the Mumble server")
parser.add_argument("-u", "--user", dest="user", type=str, required=True, help="Username for the bot, Default=abot") parser.add_argument("-u", "--user", dest="user", type=str, help="Username for the bot")
parser.add_argument("-P", "--password", dest="password", type=str, default="", help="Server password, if required") parser.add_argument("-P", "--password", dest="password", type=str, help="Server password, if required")
parser.add_argument("-p", "--port", dest="port", type=int, default=64738, help="Port for the Mumble server") parser.add_argument("-p", "--port", dest="port", type=int, help="Port for the Mumble server")
parser.add_argument("-c", "--channel", dest="channel", type=str, default="", help="Default channel for the bot") parser.add_argument("-c", "--channel", dest="channel", type=str, help="Default channel for the bot")
args = parser.parse_args() args = parser.parse_args()
config = configparser.ConfigParser(interpolation=None) config = configparser.ConfigParser(interpolation=None, allow_no_value=True)
parsed_configs = config.read(['configuration.default.ini', args.config], encoding='latin-1') parsed_configs = config.read(['configuration.default.ini', args.config], encoding='latin-1')
if len(parsed_configs) == 0: if len(parsed_configs) == 0: