[cli] Make config parser return Enums for overrides

Author: Breakthrough

scenedetect/_cli/__init__.py

@@ -35,7 +35,6 @@
     CONFIG_MAP,
     DEFAULT_JPG_QUALITY,
     DEFAULT_WEBP_QUALITY,
-    XmlFormat,
 )
 from scenedetect._cli.context import USER_CONFIG, CliContext, check_split_video_requirements
 from scenedetect.backends import AVAILABLE_BACKENDS
@@ -1668,11 +1667,9 @@ def save_xml_command(
     ctx = ctx.obj
     assert isinstance(ctx, CliContext)
 
-    # TODO: Change config parser so get_value returns enums directly.
-    format = XmlFormat[ctx.config.get_value("save-xml", "format", format).upper()]
     save_xml_args = {
         "filename": ctx.config.get_value("save-xml", "filename", filename),
-        "format": format,
+        "format": ctx.config.get_value("save-xml", "format", format),
         "output": ctx.config.get_value("save-xml", "output", output),
     }
     ctx.add_command(cli_commands.save_xml, save_xml_args)

scenedetect/_cli/config.py

@@ -450,8 +450,6 @@ class XmlFormat(Enum):
 The types of these values are used when decoding the configuration file. Valid choices for
 certain string options are stored in `CHOICE_MAP`."""
 
-# TODO: Use the fact that all enums derive from the Enum class to avoid duplicating their values
-# here in the choice map.
 CHOICE_MAP: ty.Dict[str, ty.Dict[str, ty.List[str]]] = {
     "backend-pyav": {
         "threading_mode": [mode.lower() for mode in PYAV_THREADING_MODES],
@@ -765,8 +763,10 @@ def get_value(
             value = self._config[command][option]
         else:
             value = CONFIG_MAP[command][option]
-        if issubclass(type(value), ValidatedValue):
+        if isinstance(value, ValidatedValue):
             return value.value
+        if isinstance(CONFIG_MAP[command][option], Enum) and isinstance(override, str):
+            return CONFIG_MAP[command][option].__class__[value.upper().strip()]
         return value
 
     def get_help_string(