bugfixes and review suggestions

rpatters1 · Oct 8, 2024 · 2910f54 · 2910f54
1 parent dcc2fd7
commit 2910f54
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/document_options_to_musescore.lua b/src/document_options_to_musescore.lua
@@ -791,7 +791,6 @@ function document_options_to_musescore()
             file:close()
             local files_to_process = {}
             for folder, filename in utils.eachfile(selected_directory, true) do
-                print(folder, filename)
                 if (filename:sub(-MUSX_EXTENSION:len()) == MUSX_EXTENSION) or (filename:sub(-MUS_EXTENSION:len()) == MUS_EXTENSION) then
                     table.insert(files_to_process, {name = filename, folder = folder})
                 end

diff --git a/src/library/utils.lua b/src/library/utils.lua
@@ -481,12 +481,23 @@ function utils.split_file_path(full_path)
     local path_name = finale.FCString()
     local file_name = finale.FCString()
     local file_path = finale.FCString(full_path)
-    file_path:SplitToPathAndFile(path_name, file_name)
+    -- work around bug in SplitToPathAndFile when path is not specified
+    if file_path:FindFirst("/") >= 0 or (finenv.UI():IsOnWindows() and file_path:FindFirst("\\") >= 0) then
+        file_path:SplitToPathAndFile(path_name, file_name)
+    else
+        file_name.LuaString = full_path
+    end
     -- do not use FCString.ExtractFileExtension() because it has a hard-coded limit of 7 characters (!)
     local extension = file_name.LuaString:match("^.+(%..+)$")
     extension = extension or ""
     if #extension > 0 then
-        file_name:TruncateAt(file_name:FindLast(extension))
+        -- FCString.FindLast is unsafe if extension is not ASCII, so avoid using it
+        local truncate_pos = file_name.Length - finale.FCString(extension).Length
+        if truncate_pos > 0 then
+            file_name:TruncateAt(truncate_pos)
+        else
+            extension = ""
+        end
     end
     path_name:AssureEndingPathDelimiter()
     return path_name.LuaString, file_name.LuaString, extension

diff --git a/src/musicxml_massage_export.lua b/src/musicxml_massage_export.lua
@@ -474,7 +474,7 @@ function process_one_file(input_file)
         return false
     end
 
-    log_message("***** START OF PROCESSING *****")
+    log_message("\n\n***** START OF PROCESSING *****")
     remove_processing_instructions(input_file, output_file)
     local musicxml <close> = tinyxml2.XMLDocument()
     local result = musicxml:LoadFile(output_file)