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

Allow music_folder to not have trailing /

Browse Source
This commit is contained in:
Kyle Robbertze 2021-02-01 22:46:07 +02:00 committed by Terry Geng
parent 49779c20ae
commit 6bc9a9a8e0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mumbleBot.py
View File

@ -821,6 +821,9 @@ if __name__ == '__main__':
DatabaseMigration(var.db, var.music_db).migrate()
var.music_folder = util.solve_filepath(var.config.get('bot', 'music_folder'))
if not var.music_folder.endswith(os.sep):
# The file searching logic assumes that the music folder ends in a /
var.music_folder = var.music_folder + os.sep
var.tmp_folder = util.solve_filepath(var.config.get('bot', 'tmp_folder'))
# ======================

2
util.py
View File

@ -40,8 +40,6 @@ def get_recursive_file_list_sorted(path):
relroot = root.replace(path, '', 1)
if relroot != '' and relroot in var.config.get('bot', 'ignored_folders'):
continue
if len(relroot):
relroot += '/'
for file in files:
if file in var.config.get('bot', 'ignored_files'):
continue