Update app.py

app.py

@@ -37,87 +37,37 @@ def find_midi(search_string, search_options):
     search_data = []
     
     for A in AUX_DATA:
-        data = []
+        data = ''
         if 'Titles' in search_options:
-            data.append(A[1])
+            data += A[1] + '\n\n'
         if 'Lyrics' in search_options:
-            data.append(A[2])
+            data += A[2] + '\n\n'
         if 'Summaries' in search_options:
-            data.append(A[3])
+            data += A[3] + '\n\n'
 
         search_data.append(data)
     
     print('Searching titles...Please wait...')
     
-    
-    
-    search_match = process.extract(query=search_string, choices=titles_index, limit=1)
-    search_index = titles_index.index(search_match[0][0])
+    search_match_data = TMIDIX.ascii_texts_search(search_data, search_string)
+    search_match_text = search_match_data[0]
+    search_match_ratio = search_match_data[1]
+    search_match_index = search_data.index(search_match_text)
     
     print('Done!')
     print('=' * 70)
-    print('Selected title:', AUX_DATA[search_index][0])
+    print('Selected file/title:', AUX_DATA[search_match_index][:2])
     print('=' * 70)
 
-    outy = AUX_DATA[search_index][1]
+    fn = AUX_DATA[search_match_index][0]
+    raw_score = AUX_DATA[search_match_index][4]
+    single_track_score_notes = TMIDIX.advanced_score_processor(raw_score, 
+                                                               return_score_analysis=False, 
+                                                               return_enhanced_score_notes=True)[0]
 
-    print('Sample INTs', outy[:12])
+    print('Sample INTs', outy[1][:5])
     print('=' * 70)
-    
-    if len(outy) != 0:
-    
-      song = outy
-      song_f = []
-    
-      time = 0
-      dur = 0
-      vel = 90
-      pitch = 0
-      channel = 0
-    
-      patches = [-1] * 16
-    
-      channels = [0] * 16
-      channels[9] = 1
-    
-      for ss in song:
-    
-          if 0 <= ss < 256:
-    
-              time += ss * 16
-    
-          if 256 <= ss < 2304:
-    
-              dur = ((ss-256) // 8) * 16
-              vel = (((ss-256) % 8)+1) * 15
-    
-          if 2304 <= ss < 18945:
-    
-              patch = (ss-2304) // 129
-    
-              if patch < 128:
-    
-                  if patch not in patches:
-                    if 0 in channels:
-                        cha = channels.index(0)
-                        channels[cha] = 1
-                    else:
-                        cha = 15
-    
-                    patches[cha] = patch
-                    channel = patches.index(patch)
-                  else:
-                    channel = patches.index(patch)
-    
-              if patch == 128:
-                  channel = 9
-    
-              pitch = (ss-2304) % 129
-    
-              song_f.append(['note', time, dur, channel, pitch, vel, patch ])
-    
-
-    
+ 
     x = []
     y = []
     c = []
@@ -127,7 +77,7 @@ def find_midi(search_string, search_options):
             'gray', 'white', 'gold', 'silver',
             'lightgreen', 'indigo', 'maroon', 'turquoise']
     
-    for s in [m for m in song_f if m[0] == 'note']:
+    for s in single_track_score_notes:
         x.append(s[1])
         y.append(s[4])
         c.append(colors[s[3]])
@@ -141,41 +91,15 @@ def find_midi(search_string, search_options):
     plt.xlabel("Time in MIDI ticks")
     plt.ylabel("MIDI Pitch")
 
-    output_signature = AUX_DATA[search_index][0]
-    track_name = 'Project Los Angeles'
-    text_encoding = 'ISO-8859-1'
-
-    list_of_MIDI_patches=[0, 24, 32, 40, 42, 46, 56, 71, 73, 0, 53, 19, 0, 0, 0, 0]
-
-    output_header = [1000,
-                    [['set_tempo', 0, 1000000],
-                     ['time_signature', 0, 4, 2, 24, 8],
-                     ['track_name', 0, bytes(output_signature, text_encoding)]]]
-
-    patch_list = [['patch_change', 0, 0, list_of_MIDI_patches[0]], 
-                    ['patch_change', 0, 1, list_of_MIDI_patches[1]],
-                    ['patch_change', 0, 2, list_of_MIDI_patches[2]],
-                    ['patch_change', 0, 3, list_of_MIDI_patches[3]],
-                    ['patch_change', 0, 4, list_of_MIDI_patches[4]],
-                    ['patch_change', 0, 5, list_of_MIDI_patches[5]],
-                    ['patch_change', 0, 6, list_of_MIDI_patches[6]],
-                    ['patch_change', 0, 7, list_of_MIDI_patches[7]],
-                    ['patch_change', 0, 8, list_of_MIDI_patches[8]],
-                    ['patch_change', 0, 9, list_of_MIDI_patches[9]],
-                    ['patch_change', 0, 10, list_of_MIDI_patches[10]],
-                    ['patch_change', 0, 11, list_of_MIDI_patches[11]],
-                    ['patch_change', 0, 12, list_of_MIDI_patches[12]],
-                    ['patch_change', 0, 13, list_of_MIDI_patches[13]],
-                    ['patch_change', 0, 14, list_of_MIDI_patches[14]],
-                    ['patch_change', 0, 15, list_of_MIDI_patches[15]],
-                    ['track_name', 0, bytes(track_name, text_encoding)]]
-
-    output = output_header + [patch_list + song_f]
-
-    with open(f"MIDI-Search-Sample.mid", 'wb') as f:
-        f.write(MIDI.score2midi(output))
-    audio = synthesis(MIDI.score2opus(output), soundfont_path)
-    yield AUX_DATA[search_index][0], "MIDI-Search-Sample.mid", (44100, audio), plt
+    with open(fn+'.mid', 'wb') as f:
+        f.write(TMIDIX.score2midi(raw_score))
+    audio = midi_to_colab_audio(fn+'.mid', 
+                        soundfont_path=soundfont_path, 
+                        sample_rate=16000, # 44100
+                        volume_scale=10,
+                        output_for_gradio=True
+                        )
+    yield AUX_DATA[search_match_index][0], fn+'.mid', (16000, audio), plt
 
 #==========================================================================================================