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

fix: get_recursive_file_list_sorted not completed replaced in other files

Browse Source
This commit is contained in:
Terry Geng 2020-02-29 17:10:22 +08:00
parent b7b365e8b8
commit b71a6a0d4e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
command.py
View File

@ -157,7 +157,7 @@ def cmd_play_file(bot, user, text, command, parameter):
# if parameter is {index} # if parameter is {index}
if parameter.isdigit(): if parameter.isdigit():
files = util.get_recursive_filelist_sorted(var.music_folder) files = util.get_recursive_file_list_sorted(var.music_folder)
if int(parameter) < len(files): if int(parameter) < len(files):
filename = files[int(parameter)].replace(var.music_folder, '') filename = files[int(parameter)].replace(var.music_folder, '')
music = {'type': 'file', music = {'type': 'file',
@ -192,7 +192,7 @@ def cmd_play_file(bot, user, text, command, parameter):
else: else:
parameter = "" parameter = ""
files = util.get_recursive_filelist_sorted(var.music_folder) files = util.get_recursive_file_list_sorted(var.music_folder)
music_library = util.Dir(var.music_folder) music_library = util.Dir(var.music_folder)
for file in files: for file in files:
music_library.add_file(file) music_library.add_file(file)
@ -217,7 +217,7 @@ def cmd_play_file(bot, user, text, command, parameter):
else: else:
# try to do a partial match # try to do a partial match
files = util.get_recursive_filelist_sorted(var.music_folder) files = util.get_recursive_file_list_sorted(var.music_folder)
matches = [(index, file) for index, file in enumerate(files) if parameter.lower() in file.lower()] matches = [(index, file) for index, file in enumerate(files) if parameter.lower() in file.lower()]
if len(matches) == 0: if len(matches) == 0:
bot.send_msg(constants.strings('no_file'), text) bot.send_msg(constants.strings('no_file'), text)
@ -240,7 +240,7 @@ def cmd_play_file_match(bot, user, text, command, parameter):
music_folder = var.music_folder music_folder = var.music_folder
if parameter: if parameter:
files = util.get_recursive_filelist_sorted(music_folder) files = util.get_recursive_file_list_sorted(music_folder)
msgs = [ constants.strings('multiple_file_added')] msgs = [ constants.strings('multiple_file_added')]
count = 0 count = 0
try: try:
@ -621,7 +621,7 @@ def cmd_list_file(bot, user, text, command, parameter):
folder_path = var.music_folder folder_path = var.music_folder
files = util.get_recursive_filelist_sorted(folder_path) files = util.get_recursive_file_list_sorted(folder_path)
msgs = [ "<br> <b>Files available:</b>" if not parameter else "<br> <b>Matched files:</b>" ] msgs = [ "<br> <b>Files available:</b>" if not parameter else "<br> <b>Matched files:</b>" ]
try: try:
count = 0 count = 0

6
interface.py
View File

@ -96,7 +96,7 @@ def requires_auth(f):
@requires_auth @requires_auth
def index(): def index():
folder_path = var.music_folder folder_path = var.music_folder
files = util.get_recursive_filelist_sorted(var.music_folder) files = util.get_recursive_file_list_sorted(var.music_folder)
music_library = util.Dir(folder_path) music_library = util.Dir(folder_path)
for file in files: for file in files:
music_library.add_file(file) music_library.add_file(file)
@ -191,7 +191,7 @@ def post():
if os.path.isdir(var.music_folder + folder): if os.path.isdir(var.music_folder + folder):
files = util.get_recursive_filelist_sorted(var.music_folder) files = util.get_recursive_file_list_sorted(var.music_folder)
music_library = util.Dir(folder_path) music_library = util.Dir(folder_path)
for file in files: for file in files:
music_library.add_file(file) music_library.add_file(file)
@ -374,7 +374,7 @@ def download():
log.info('web: Download of file %s requested from %s:' % (requested_file, request.remote_addr)) log.info('web: Download of file %s requested from %s:' % (requested_file, request.remote_addr))
if '../' not in requested_file: if '../' not in requested_file:
folder_path = var.music_folder folder_path = var.music_folder
files = util.get_recursive_filelist_sorted(var.music_folder) files = util.get_recursive_file_list_sorted(var.music_folder)
if requested_file in files: if requested_file in files:
filepath = os.path.join(folder_path, requested_file) filepath = os.path.join(folder_path, requested_file)