Refactor settings

autocomplete.zsh

@@ -23,7 +23,7 @@ _shtab_musescore_manager_options=(
   "--compress[Save an uncompressed MuseScore file (\*.mscx) as a compressed file (\*.mscz).]"
   "(- : *)"{-V,--version}"[show program\'s version number and exit]"
   "*"{-v,--verbose}"[Make commands more verbose. You can specifiy multiple arguments (. g.\: -vvv) to make the command more verbose.]"
-  {-k,--color,--no-color}"[Colorize the command line print statements. (default\: True)]:general_color:"
+  {-k,--color,--no-color}"[Colorize the command line print statements. (default\: True)]:info_color:"
   "--diff[Show a diff of the XML file before and after the manipulation.]"
   "--print-xml[Print the XML markup of the score.]"
   {-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:"

mscxyz/cli.py

@@ -165,7 +165,7 @@ def setup_parser() -> argparse.ArgumentParser:
         "-v",
         "--verbose",
         action="count",
-        dest="general_verbose",
+        dest="info_verbose",
         default=0,
         help="Make commands more verbose. You can specifiy "
         "multiple arguments (. g.: -vvv) to make the command more "
@@ -176,22 +176,22 @@ def setup_parser() -> argparse.ArgumentParser:
         "-k",
         "--color",
         action=argparse.BooleanOptionalAction,
-        dest="general_color",
+        dest="info_color",
         default=True,
         help="Colorize the command line print statements.",
     )
 
     info_group.add_argument(
         "--diff",
         action="store_true",
-        dest="general_diff",
+        dest="info_diff",
         help="Show a diff of the XML file before and after the manipulation.",
     )
 
     info_group.add_argument(
         "--print-xml",
         action="store_true",
-        dest="general_print_xml",
+        dest="info_print_xml",
         help="Print the XML markup of the score.",
     )
 
@@ -976,10 +976,10 @@ def list_styles(version: int) -> None:
             if args.export_extension:
                 score.export.to_extension(args.export_extension)
 
-            if args.general_diff:
+            if args.info_diff:
                 score.print_diff()
 
-            if args.general_print_xml:
+            if args.info_print_xml:
                 print(score.xml_string)
 
             if not args.general_dry_run:

mscxyz/fields.py

@@ -331,7 +331,7 @@ def set(self, name: str, value: Any) -> None:
         setattr(obj, last, value)
 
     def diff(self, args: DefaultArguments) -> None:
-        if args.general_verbose == 0:
+        if args.info_verbose == 0:
             return
         pre = self.pre
 
@@ -341,7 +341,7 @@ def diff(self, args: DefaultArguments) -> None:
         for name in self.names:
             if name in pre and pre[name] or name in post and post[name]:
                 field = self.get_field(name)
-                if field.verbosity > args.general_verbose:
+                if field.verbosity > args.info_verbose:
                     continue
 
                 pre_value = None

mscxyz/settings.py

@@ -23,10 +23,6 @@ class DefaultArguments:
     general_catch_errors: bool = False
     general_mscore: bool = False
     general_executable: Optional[str] = None
-    general_verbose: int = 0
-    general_color: bool = True
-    general_diff: bool = False
-    general_print_xml: bool = False
 
     # Groups alphabetically
     # in groups related not alphabetically
@@ -36,6 +32,12 @@ class DefaultArguments:
     export_extension: Optional[str] = None
     export_compress: bool = False
 
+    # info
+    info_verbose: int = 0
+    info_color: bool = True
+    info_diff: bool = False
+    info_print_xml: bool = False
+
     # help
     help_markdown: bool = False
     help_rst: bool = False
@@ -165,7 +167,7 @@ def merge_config_into_args(
 
     for arg in [
         "general_backup",
-        "general_colorize",
+        "info_colorize",
         "general_dry_run",
         "general_mscore",
         "help_markdown",

mscxyz/utils.py

@@ -218,7 +218,7 @@ def colorize(
         color('“{}”'.format(post[field]), 'yellow')
     """
     settings = get_args()
-    if settings.general_color:
+    if settings.info_color:
         return termcolor.colored(text, color, on_color)
     else:
         return text

tests/test_cli.py

@@ -13,11 +13,11 @@ class TestArgparse:
     def test_args_general(self) -> None:
         args = get_args(["."])
         assert args.general_backup is False
-        assert args.general_color is True
+        assert args.info_color is True
         assert args.general_dry_run is False
         assert args.selection_glob == "*.msc[xz]"
         assert args.general_mscore is False
-        assert args.general_verbose == 0
+        assert args.info_verbose == 0
         assert args.path == ["."]
 
     def test_args_clean(self) -> None:
@@ -51,15 +51,15 @@ def test_args_general_rename(self) -> None:
 class TestVerbosity:
     def test_0(self) -> None:
         args = get_args([])
-        assert args.general_verbose == 0
+        assert args.info_verbose == 0
 
     def test_1(self) -> None:
         args = get_args(["-v"])
-        assert args.general_verbose == 1
+        assert args.info_verbose == 1
 
     def test_2(self) -> None:
         args = get_args(["-vv"])
-        assert args.general_verbose == 2
+        assert args.info_verbose == 2
 
 
 class TestCommandlineInterface: