From 80c67f1c0530982864c279bf7931090f43e18119 Mon Sep 17 00:00:00 2001 From: johentsch Date: Sun, 18 Dec 2022 22:39:31 +0100 Subject: [PATCH] corrects attribution of 'harmony_version' column, adds 'composed_source' to default column order --- src/ms3/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ms3/utils.py b/src/ms3/utils.py index 86f36177..46615c24 100644 --- a/src/ms3/utils.py +++ b/src/ms3/utils.py @@ -36,10 +36,10 @@ LATEST_MUSESCORE_VERSION = '3.6.2' COMPUTED_METADATA_COLUMNS = ['TimeSig', 'KeySig', 'last_mc', 'last_mn', 'length_qb', 'last_mc_unfolded', 'last_mn_unfolded', 'length_qb_unfolded', 'volta_mcs', 'all_notes_qb', 'n_onsets', 'n_onset_positions', - 'guitar_chord_count', 'form_label_count', 'label_count', 'harmony_version', 'annotated_key', ] + 'guitar_chord_count', 'form_label_count', 'label_count', 'annotated_key', ] """Automatically computed columns""" -DCML_METADATA_COLUMNS = ['annotators', 'reviewers', 'score_integrity', 'composed_start', 'composed_end',] +DCML_METADATA_COLUMNS = ['harmony_version', 'annotators', 'reviewers', 'score_integrity', 'composed_start', 'composed_end', 'composed_source'] """Arbitrary column names used in the DCML corpus initiative""" @@ -61,7 +61,7 @@ AUTOMATIC_COLUMNS = COMPUTED_METADATA_COLUMNS + VERSION_COLUMNS + INSTRUMENT_RELATED_COLUMNS + OTHER_COLUMNS """This combination of column names is excluded when updating metadata fields in MuseScore files via ms3 metadata.""" -METADATA_COLUMN_ORDER = ['fname'] + COMPUTED_METADATA_COLUMNS + DCML_METADATA_COLUMNS + MUSESCORE_METADATA_FIELDS + VERSION_COLUMNS + MUSESCORE_HEADER_FIELDS + OTHER_COLUMNS + INSTRUMENT_RELATED_COLUMNS +METADATA_COLUMN_ORDER = ['fname'] + COMPUTED_METADATA_COLUMNS + DCML_METADATA_COLUMNS + MUSESCORE_METADATA_FIELDS + MUSESCORE_HEADER_FIELDS + VERSION_COLUMNS + OTHER_COLUMNS + INSTRUMENT_RELATED_COLUMNS STANDARD_COLUMN_ORDER = [ 'mc', 'mc_playthrough', 'mn', 'mn_playthrough', 'quarterbeats', 'mc_onset', 'mn_onset', 'beat',