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

feat: generate default settings db name according to bot name

Browse Source
This commit is contained in:
Terry Geng 2020-05-13 22:39:49 +08:00
parent 40ea744e7f
commit 5fe8b266c2
No known key found for this signature in database
GPG Key ID: F982F8EA1DF720E7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -114,7 +114,7 @@ configuration.ini
music_folder/ music_folder/
tmp/ tmp/
database.db *.db
# Pycharm # Pycharm
.idea/ .idea/

11
mumbleBot.py
View File

@ -666,7 +666,7 @@ if __name__ == '__main__':
parser.add_argument("--config", dest='config', type=str, default='configuration.ini', parser.add_argument("--config", dest='config', type=str, default='configuration.ini',
help='Load configuration from this file. Default: configuration.ini') help='Load configuration from this file. Default: configuration.ini')
parser.add_argument("--db", dest='db', type=str, 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, parser.add_argument("--music-db", dest='music_db', type=str,
default=None, help='music library database file. Default: music.db') default=None, help='music library database file. Default: music.db')
@ -739,8 +739,14 @@ if __name__ == '__main__':
# ====================== # ======================
# Load Database # 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( 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( 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")) config.get("bot", "music_database_path", fallback="music.db"))
@ -775,7 +781,6 @@ if __name__ == '__main__':
# ====================== # ======================
# Create bot instance # Create bot instance
# ====================== # ======================
var.bot = MumbleBot(args) var.bot = MumbleBot(args)
command.register_all_commands(var.bot) command.register_all_commands(var.bot)