Skip to content

Commit

Permalink
Remove combined_* prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
Josef-Friedrich committed Feb 4, 2024
1 parent ff999bf commit ea503d7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 15 deletions.
9 changes: 4 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,9 @@ CLI Usage
comma separated list of fields, for example:
„field_one,field_two“.
-D, --delete-duplicates
Deletes combined_lyricist if this field is equal to
combined_composer. Deletes combined_subtitle if this field
is equal tocombined_title. Move combined_subtitle to
combimed_title if combined_title is empty.
Deletes lyricist if this field is equal to composer. Deletes
subtitle if this field is equal totitle. Move subtitle to
combimed_title if title is empty.
-i <source-fields> <format-string>, --distribute-fields <source-fields> <format-string>
Distribute source fields to target fields by applying a
format string on the source fields. It is possible to apply
Expand Down Expand Up @@ -784,7 +783,7 @@ Configuration file
colorize = True
[rename]
format = '$combined_title ($combined_composer)'
format = '$title ($composer)'
Other MuseScore related projects
================================
Expand Down
2 changes: 1 addition & 1 deletion README_template.rst
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ Configuration file
colorize = True
[rename]
format = '$combined_title ($combined_composer)'
format = '$title ($composer)'
Other MuseScore related projects
================================
Expand Down
2 changes: 1 addition & 1 deletion autocomplete.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ _shtab_musescore_manager_options=(
{-E,--export}"[Export the scores in a format defined by the extension. The exported file has the same path, only the file extension is different. Further information can be found at the MuseScore website\: https\:\/\/musescore.org\/en\/handbook\/2\/file-formats, https\:\/\/musescore.org\/en\/handbook\/3\/file-export, https\:\/\/musescore.org\/en\/handbook\/4\/file-export. MuseScore must be installed and the script must know the location of the binary file.]:export_extension:(mscz mscx spos mpos pdf svg png wav mp3 ogg flac mid midi kar musicxml xml mxl brf mei)"
"--compress[Save an uncompressed MuseScore file (\*.mscx) as a compressed file (\*.mscz).]"
{-c,--clean-meta}"[Clean the meta data fields. Possible values\: \„all\“ or a comma separated list of fields, for example\: \„field_one,field_two\“.]:meta_clean:"
{-D,--delete-duplicates}"[Deletes combined_lyricist if this field is equal to combined_composer. Deletes combined_subtitle if this field is equal tocombined_title. Move combined_subtitle to combimed_title if combined_title is empty.]"
{-D,--delete-duplicates}"[Deletes lyricist if this field is equal to composer. Deletes subtitle if this field is equal totitle. Move subtitle to combimed_title if title is empty.]"
"*"{-i,--distribute-fields}"[Distribute source fields to target fields by applying a format string on the source fields. It is possible to apply multiple --distribute-fields options. \<source-fields\> can be a single field or a comma separated list of fields\: field_one,field_two. The program tries first to match the \<format-string\> on the first source field. If thisfails, it tries the second source field ... and so on.]:meta_dist:"
{-j,--json}"[Write the meta data to a json file. The resulting file has the same path as the input file, only the extension is changed to \“json\”.]"
{-l,--log}"[Write one line per file to a text file. e. g. --log \/tmp\/musescore-manager.log \'\$title \$composer\']:meta_log:"
Expand Down
7 changes: 3 additions & 4 deletions docs/cli.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,9 @@ Comande line interface
comma separated list of fields, for example:
„field_one,field_two“.
-D, --delete-duplicates
Deletes combined_lyricist if this field is equal to
combined_composer. Deletes combined_subtitle if this field
is equal tocombined_title. Move combined_subtitle to
combimed_title if combined_title is empty.
Deletes lyricist if this field is equal to composer. Deletes
subtitle if this field is equal totitle. Move subtitle to
combimed_title if title is empty.
-i <source-fields> <format-string>, --distribute-fields <source-fields> <format-string>
Distribute source fields to target fields by applying a
format string on the source fields. It is possible to apply
Expand Down
8 changes: 4 additions & 4 deletions mscxyz/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ def _split_lines(self, text: typing.Text, width: int) -> typing.List[str]:
"--delete-duplicates",
dest="meta_delete",
action="store_true",
help="Deletes combined_lyricist if this field is equal to "
"combined_composer. Deletes combined_subtitle if this field is equal to"
"combined_title. Move combined_subtitle to combimed_title if "
"combined_title is empty.",
help="Deletes lyricist if this field is equal to "
"composer. Deletes subtitle if this field is equal to"
"title. Move subtitle to combimed_title if "
"title is empty.",
)

meta_group.add_argument(
Expand Down

0 comments on commit ea503d7

Please sign in to comment.