Skip to content

Commit

Permalink
corrects attribution of 'harmony_version' column, adds 'composed_sour…
Browse files Browse the repository at this point in the history
…ce' to default column order
  • Loading branch information
johentsch committed Dec 18, 2022
1 parent 36b127c commit 80c67f1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/ms3/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"""


Expand All @@ -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',
Expand Down

0 comments on commit 80c67f1

Please sign in to comment.