Better articulation matching

Author: Kabraxist

UACC List.csv

@@ -1,4 +1,4 @@
-1,long,note-whole,Generic,Sustain,Long,,
+1,long,note-whole,Generic,Sustain,Long,Non Vib,
 2,long,alt-wave,Alternative,Air,,,
 3,long,note-whole,Octave,8ves,8va,,
 4,long,note-whole,Octave muted,,,,
@@ -13,7 +13,7 @@
 13,long,tremolo,Tremolo soft,Tremolo low,,,
 14,long,tremolo,Tremolo hard,Tremolo high,,,
 15,long,tremolo-sul-pont,Tremolo sul,Tremolo muted low,,,
-16,long,vibrato,Vibrato,Molto,Pulses,,
+16,long,vibrato,Vibrato,Molto,Pulses,Vib,
 17,long,sul-tasto,Higher,Sul Tasto,Bells Up,,
 18,long,sul-pont,Lower,Sul Ponticello,,,
 19,long,,Lower muted,,,,
@@ -74,12 +74,12 @@
 74,textured,trill-perf4,Trill perf 4th,Trill Perfect,,,
 75,textured,multitongued,Multitongue,Double Tongue,,,
 76,textured,multitongued,Multitongue muted,,,,
-77,,,,,,,
+77,textured,vibrato-molto,,Mordent,Ornament,,
 78,,,,,,,
 79,,,,,,,
-80,textured,phrase,Synced - 120bpm (trem/trill),Slow,,,
-81,textured,phrase,Synced - 150bpm (trem/trill),Medium,Phrase,,
-82,textured,phrase,Synced - 180bpm (trem/trill),Fast,,,
+80,textured,phrase,Synced - 120bpm (trem/trill),,,,
+81,textured,phrase,Synced - 150bpm (trem/trill),Medium,Phrase,bpm,
+82,textured,phrase,Synced - 180bpm (trem/trill),,,,
 83,,,,,,,
 84,,,,,,,
 85,,,,,,,

main.py

@@ -2,6 +2,8 @@
 from pathlib import Path, PurePath
 
 class ArticulationBank:
+    merged_result = ""
+
     def __init__(self, source_file_path) -> None:
         self.root = untangle.parse(source_file_path)
         self.articulation_list = []
@@ -11,6 +13,7 @@ def __init__(self, source_file_path) -> None:
 
     def GenerateHeader(self):
         header = f'//! g="Converted Maps" n="{self.bank_name}"\nBank * * {self.bank_name}\n'
+        ArticulationBank.merged_result += header
         return header
 
     def GenerateArticulations(self):
@@ -19,6 +22,7 @@ def GenerateArticulations(self):
             if (art.art_action is not None):
                 articulations += f'//! c={art.art_color} i={art.art_icon} o={art.art_action}\n{art.art_progchange} {art.art_name}\n'
 
+        ArticulationBank.merged_result += articulations + "\n"
         return articulations
 
     def ParseArticulations(self):
@@ -87,14 +91,21 @@ def FindUACC(art_name):
 
     def FindUACC2(art_name):
         pc, color, icon = "127", "default", "note-quarter"
+        match, match_candidate = "", ""
+        match_score, cur_match_score = 0, 0
 
         for i in UACCList.reader:
-            match = difflib.get_close_matches(art_name, i["names"])
+            match_candidate = difflib.get_close_matches(art_name, i["names"], cutoff=0.2)
+
+            if (len(match_candidate) > 0):
+                cur_match_score = difflib.SequenceMatcher(None, match_candidate[0], art_name).ratio()
+
+            if (cur_match_score > match_score):
+                match = match_candidate[0]
+                match_score = cur_match_score
+                cur_match_score = 0
 
-            if (len(match) > 0):
                 pc, color, icon = i["id"], i["color"], i["icon"]
-            else:
-                pass
 
         UACCList.uacc_file.seek(0)
         return pc, color, icon
@@ -118,9 +129,19 @@ def ConvertExpressionMaps():
 
             FileOps.ExportReabank(result, map)
 
+    def ExportMergedReabank():
+        export_path = PurePath(Path.cwd(), "Reabank Export", "Merged Export.reabank")
+        file = open(Path(export_path), "w")
+        file.write(ArticulationBank.merged_result)
+        file.close
+
     def FindExpressionMaps():
         FileOps.expression_maps = sorted(Path.cwd().rglob('*.expressionmap'))
+        print(str(len(FileOps.expression_maps))+" expression maps found...")
 
+print("EXPRESSIONMAP TO REATICULATE CONVERTER")
+print("Starting conversion...")
 FileOps.FindExpressionMaps()
 FileOps.ConvertExpressionMaps()
+#FileOps.ExportMergedReabank()
 input("Conversion complete. Press a key to continue...")