[cli] Decode enum types directly in config parser

Author: Breakthrough

scenedetect/_cli/__init__.py

@@ -34,7 +34,6 @@
     CONFIG_MAP,
     DEFAULT_JPG_QUALITY,
     DEFAULT_WEBP_QUALITY,
-    TimecodeFormat,
 )
 from scenedetect._cli.context import USER_CONFIG, CliContext, check_split_video_requirements
 from scenedetect.backends import AVAILABLE_BACKENDS
@@ -46,7 +45,6 @@
     ThresholdDetector,
 )
 from scenedetect.platform import get_cv2_imwrite_params, get_system_version_info
-from scenedetect.scene_manager import Interpolation
 
 _PROGRAM_VERSION = scenedetect.__version__
 """Used to avoid name conflict with named `scenedetect` command below."""
@@ -1068,7 +1066,7 @@ def list_scenes_command(
     output_dir = ctx.config.get_value("list-scenes", "output", output)
     name_format = ctx.config.get_value("list-scenes", "filename", filename)
     list_scenes_args = {
-        "cut_format": TimecodeFormat[ctx.config.get_value("list-scenes", "cut-format").upper()],
+        "cut_format": ctx.config.get_value("list-scenes", "cut-format"),
         "display_scenes": ctx.config.get_value("list-scenes", "display-scenes"),
         "display_cuts": ctx.config.get_value("list-scenes", "display-cuts"),
         "scene_list_output": create_file,
@@ -1407,7 +1405,7 @@ def save_images_command(
         scale = ctx.config.get_value("save-images", "scale")
         height = ctx.config.get_value("save-images", "height")
         width = ctx.config.get_value("save-images", "width")
-    scale_method = Interpolation[ctx.config.get_value("save-images", "scale-method").upper()]
+    scale_method = ctx.config.get_value("save-images", "scale-method")
     quality = (
         (DEFAULT_WEBP_QUALITY if webp else DEFAULT_JPG_QUALITY)
         if ctx.config.is_default("save-images", "quality")

scenedetect/_cli/config.py

@@ -268,7 +268,7 @@ def format(self, timecode: FrameTimecode) -> str:
         "weights": ScoreWeightsValue(ContentDetector.DEFAULT_COMPONENT_WEIGHTS),
     },
     "detect-content": {
-        "filter-mode": "merge",
+        "filter-mode": FlashFilter.Mode.MERGE,
         "kernel-size": KernelSizeValue(-1),
         "luma-only": False,
         "min-scene-len": TimecodeValue(0),
@@ -302,7 +302,7 @@ def format(self, timecode: FrameTimecode) -> str:
         "no-images": False,
     },
     "list-scenes": {
-        "cut-format": "timecode",
+        "cut-format": TimecodeFormat.TIMECODE,
         "display-cuts": True,
         "display-scenes": True,
         "filename": "$VIDEO_NAME-Scenes.csv",
@@ -315,7 +315,7 @@ def format(self, timecode: FrameTimecode) -> str:
         "backend": "opencv",
         "default-detector": "detect-adaptive",
         "downscale": 0,
-        "downscale-method": "linear",
+        "downscale-method": Interpolation.LINEAR,
         "drop-short-scenes": False,
         "frame-skip": 0,
         "merge-last-scene": False,
@@ -333,7 +333,7 @@ def format(self, timecode: FrameTimecode) -> str:
         "output": None,
         "quality": RangeValue(_PLACEHOLDER, min_val=0, max_val=100),
         "scale": 1.0,
-        "scale-method": "linear",
+        "scale-method": Interpolation.LINEAR,
         "width": 0,
     },
     "split-video": {
@@ -442,6 +442,27 @@ def _parse_config(config: ConfigParser) -> Tuple[ConfigDict, List[str]]:
                         value_type = "number"
                         out_map[command][option] = config.getfloat(command, option)
                         continue
+                    elif isinstance(CONFIG_MAP[command][option], Enum):
+                        config_value = (
+                            config.get(command, option).replace("\n", " ").strip().upper()
+                        )
+                        try:
+                            parsed = CONFIG_MAP[command][option].__class__[config_value]
+                            out_map[command][option] = parsed
+                        except TypeError:
+                            errors.append(
+                                "Invalid [%s] value for %s: %s. Must be one of: %s."
+                                % (
+                                    command,
+                                    option,
+                                    config.get(command, option),
+                                    ", ".join(
+                                        str(choice) for choice in CHOICE_MAP[command][option]
+                                    ),
+                                )
+                            )
+                        continue
+
                 except ValueError as _:
                     errors.append(
                         "Invalid [%s] value for %s: %s is not a valid %s."

scenedetect/_cli/context.py

@@ -286,9 +286,8 @@ def handle_options(
             except ValueError as ex:
                 logger.debug(str(ex))
                 raise click.BadParameter(str(ex), param_hint="downscale factor") from None
-        scene_manager.interpolation = Interpolation[
-            self.config.get_value("global", "downscale-method").upper()
-        ]
+        scene_manager.interpolation = self.config.get_value("global", "downscale-method")
+
         self.scene_manager = scene_manager
 
     #
@@ -328,9 +327,7 @@ def get_detect_content_params(
             "luma_only": luma_only or self.config.get_value("detect-content", "luma-only"),
             "min_scene_len": min_scene_len,
             "threshold": self.config.get_value("detect-content", "threshold", threshold),
-            "filter_mode": FlashFilter.Mode[
-                self.config.get_value("detect-content", "filter-mode", filter_mode).upper()
-            ],
+            "filter_mode": self.config.get_value("detect-content", "filter-mode", filter_mode),
         }
 
     def get_detect_adaptive_params(