From 632d327e754bc984d9ba6ca9bcc716bca216b64d Mon Sep 17 00:00:00 2001 From: Shinrin Ouja Moriking Date: Fri, 4 Aug 2023 22:10:53 -0600 Subject: [PATCH] Fix keysound file search --- pms2bemani/pms2bemani/pms2bemani.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pms2bemani/pms2bemani/pms2bemani.py b/pms2bemani/pms2bemani/pms2bemani.py index 40b9e0d..91b1c31 100644 --- a/pms2bemani/pms2bemani/pms2bemani.py +++ b/pms2bemani/pms2bemani/pms2bemani.py @@ -540,6 +540,7 @@ def generate_preview(input_filename, output_filename, offset, duration): def get_real_keysound_filename(input_filename, keysounds_folder): + if not input_filename: return None @@ -548,13 +549,14 @@ def get_real_keysound_filename(input_filename, keysounds_folder): if os.path.exists(target_path): # The file exists already return target_path - + + extensions = [".wav",".ogg"] # The file doesn't exist, so try to match it with other extensions - target_path = os.path.join(keysounds_folder, "%s.*" % (os.path.splitext(input_filename)[0])) - found_files = insensitive_glob(target_path) - - if found_files: - return found_files[0] + for extension in extensions: + target_path = os.path.join(keysounds_folder, ("%s"+ extension) % (os.path.splitext(input_filename)[0])) + if os.path.exists(target_path): + # The file exists already + return target_path print("Couldn't find", input_filename)