fix: get_recursive_file_list_sorted not completed replaced in other files

diff --git a/command.py b/command.py
index 3721529640ca6c89820da79f669a4a5b6b758c49..3bb411e6016b1ca1d5ff0191a34d1845f7da09b8 100644 (file)
--- a/command.py
+++ b/command.py
@@ -157,7 +157,7 @@ def cmd_play_file(bot, user, text, command, parameter):
 
     # if parameter is {index}
     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):
             filename = files[int(parameter)].replace(var.music_folder, '')
             music = {'type': 'file',
@@ -192,7 +192,7 @@ def cmd_play_file(bot, user, text, command, parameter):
             else:
                 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)
             for file in files:
                 music_library.add_file(file)
@@ -217,7 +217,7 @@ def cmd_play_file(bot, user, text, command, parameter):
 
         else:
             # 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()]
             if len(matches) == 0:
                 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
     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')]
         count = 0
         try:
@@ -621,7 +621,7 @@ def cmd_list_file(bot, user, text, command, parameter):
 
     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>" ]
     try:
         count = 0

diff --git a/interface.py b/interface.py
index 4632a1dc0490139c5c00775516943ea19975feae..2bfbc2c45fd7e0faaee91164200646c04edd5732 100644 (file)
--- a/interface.py
+++ b/interface.py
@@ -96,7 +96,7 @@ def requires_auth(f):
 @requires_auth
 def index():
     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)
     for file in files:
         music_library.add_file(file)
@@ -191,7 +191,7 @@ def post():
 
             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)
                 for file in files:
                     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))
         if '../' not in requested_file:
             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:
                 filepath = os.path.join(folder_path, requested_file)