Update src/music/pipeline/midi2processed.py

src/music/pipeline/midi2processed.py

@@ -91,62 +91,62 @@ def midi2processed(midi_path, processed_path=None, apply_filtering=True, verbose
         if verbose: print(' ' * (level + 2) + 'Processed midi file already exists.')
         return processed_path, ''
     error_msg = 'Error in scrubbing. '
-    try:
-        inst_error_msg = ''
-        # load mid file
-        error_msg += 'Error in midi loading?'
-        midi = pm.PrettyMIDI(midi_path)
-        error_msg += ' Nope. Removing invalid notes?'
-        midi.remove_invalid_notes()  # filter invalid notes
-        error_msg += ' Nope. Filtering instruments?'
-        # filter instruments
-        instruments = midi.instruments.copy()
-        new_instru = []
-        instruments_data = []
-        for i_inst, inst in enumerate(instruments):
-            if inst.program <= 7 and not inst.is_drum and len(inst.notes) > 5:
-                # inst is a piano
-                # check data
-                inst.notes = sort_notes(inst.notes)  # sort notes
-                inst.notes = delete_notes_end_after_start(inst.notes)  # delete invalid notes
-                nb_notes, start, end, duration, largest_gap = analyze_instrument(inst)
-                is_valid, err_msg = is_valid_inst(largest_gap=largest_gap, duration=duration, nb_notes=nb_notes, gap_counts='maestro' not in midi_path)
-                if is_valid or not apply_filtering:
-                    new_instru.append(inst)
-                    instruments_data.append([nb_notes, start, end, duration, largest_gap])
-                else:
-                    inst_error_msg += 'inst1: ' + err_msg + '\n'
-        instruments_data = np.array(instruments_data)
-        error_msg += ' Nope. Taking one instrument?'
-
-        if len(new_instru) == 0:
-            error_msg = f'No piano instrument. {inst_error_msg}'
-            assert False
-        elif len(new_instru) > 1:
-            # take instrument playing the most notes
-            instrument = new_instru[np.argmax(instruments_data[:, 0])]
-        else:
-            instrument = new_instru[0]
-        instrument.program = 0  # set the instrument to Grand Piano.
-        midi.instruments = [instrument]  # put instrument in midi file
-        error_msg += ' Nope. Removing blanks?'
-        # remove first and last REMOVE_FIRST_AND_LAST seconds (avoid clapping and jingles)
-        end_time = midi.get_end_time()
-        if apply_filtering: midi = remove_beginning_and_end(midi, end_time)
-
-        # remove beginning and end
-        midi = remove_blanks_beginning_and_end(midi)
-        error_msg += ' Nope. Saving?'
-
-        # save midi file
-        midi.write(processed_path)
-        error_msg += ' Nope.'
-        if verbose:
-            extra = f' Saved to {processed_path}' if midi_path else ''
-            print(' ' * (level + 2) + f'Success! {extra}')
-        return processed_path, ''
-    except:
-        if verbose: print(' ' * (level + 2) + 'Scrubbing failed.')
-        if os.path.exists(processed_path):
-            os.remove(processed_path)
-        return None, error_msg + ' Yes.'
+   # try:
+    inst_error_msg = ''
+    # load mid file
+    error_msg += 'Error in midi loading?'
+    midi = pm.PrettyMIDI(midi_path)
+    error_msg += ' Nope. Removing invalid notes?'
+    midi.remove_invalid_notes()  # filter invalid notes
+    error_msg += ' Nope. Filtering instruments?'
+    # filter instruments
+    instruments = midi.instruments.copy()
+    new_instru = []
+    instruments_data = []
+    for i_inst, inst in enumerate(instruments):
+        if inst.program <= 7 and not inst.is_drum and len(inst.notes) > 5:
+            # inst is a piano
+            # check data
+            inst.notes = sort_notes(inst.notes)  # sort notes
+            inst.notes = delete_notes_end_after_start(inst.notes)  # delete invalid notes
+            nb_notes, start, end, duration, largest_gap = analyze_instrument(inst)
+            is_valid, err_msg = is_valid_inst(largest_gap=largest_gap, duration=duration, nb_notes=nb_notes, gap_counts='maestro' not in midi_path)
+            if is_valid or not apply_filtering:
+                new_instru.append(inst)
+                instruments_data.append([nb_notes, start, end, duration, largest_gap])
+            else:
+                inst_error_msg += 'inst1: ' + err_msg + '\n'
+    instruments_data = np.array(instruments_data)
+    error_msg += ' Nope. Taking one instrument?'
+
+    if len(new_instru) == 0:
+        error_msg = f'No piano instrument. {inst_error_msg}'
+        assert False
+    elif len(new_instru) > 1:
+        # take instrument playing the most notes
+        instrument = new_instru[np.argmax(instruments_data[:, 0])]
+    else:
+        instrument = new_instru[0]
+    instrument.program = 0  # set the instrument to Grand Piano.
+    midi.instruments = [instrument]  # put instrument in midi file
+    error_msg += ' Nope. Removing blanks?'
+    # remove first and last REMOVE_FIRST_AND_LAST seconds (avoid clapping and jingles)
+    end_time = midi.get_end_time()
+    if apply_filtering: midi = remove_beginning_and_end(midi, end_time)
+
+    # remove beginning and end
+    midi = remove_blanks_beginning_and_end(midi)
+    error_msg += ' Nope. Saving?'
+
+    # save midi file
+    midi.write(processed_path)
+    error_msg += ' Nope.'
+    if verbose:
+        extra = f' Saved to {processed_path}' if midi_path else ''
+        print(' ' * (level + 2) + f'Success! {extra}')
+    return processed_path, ''
+    #except:
+     #   if verbose: print(' ' * (level + 2) + 'Scrubbing failed.')
+      #  if os.path.exists(processed_path):
+       #     os.remove(processed_path)
+      #  return None, error_msg + ' Yes.'