From 5fe8b266c2e96c074978efcd8c7c95ee76dfa830 Mon Sep 17 00:00:00 2001 From: Terry Geng Date: Wed, 13 May 2020 22:39:49 +0800 Subject: [PATCH] feat: generate default settings db name according to bot name --- .gitignore | 2 +- mumbleBot.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c5b54af..fbe80b4 100644 --- a/.gitignore +++ b/.gitignore @@ -114,7 +114,7 @@ configuration.ini music_folder/ tmp/ -database.db +*.db # Pycharm .idea/ diff --git a/mumbleBot.py b/mumbleBot.py index 9109b8f..fc21e33 100644 --- a/mumbleBot.py +++ b/mumbleBot.py @@ -666,7 +666,7 @@ if __name__ == '__main__': parser.add_argument("--config", dest='config', type=str, default='configuration.ini', help='Load configuration from this file. Default: configuration.ini') parser.add_argument("--db", dest='db', type=str, - default=None, help='settings database file. Default: settings.db') + default=None, help='settings database file. Default: settings-{username_of_the_bot}.db') parser.add_argument("--music-db", dest='music_db', type=str, default=None, help='music library database file. Default: music.db') @@ -739,8 +739,14 @@ if __name__ == '__main__': # ====================== # Load Database # ====================== + if args.user: + username = args.user + else: + username = var.config.get("bot", "username") + + sanitized_username = "".join([x if x.isalnum() else "_" for x in username]) var.settings_db_path = args.db if args.db is not None else util.solve_filepath( - config.get("bot", "database_path", fallback="settings.db")) + config.get("bot", "database_path", fallback=f"settings-{sanitized_username}.db")) var.music_db_path = args.music_db if args.music_db is not None else util.solve_filepath( config.get("bot", "music_database_path", fallback="music.db")) @@ -775,7 +781,6 @@ if __name__ == '__main__': # ====================== # Create bot instance # ====================== - var.bot = MumbleBot(args) command.register_all_commands(var.bot)