[cli] Simplify parsing of default values

Author: Breakthrough

scenedetect/_cli/__init__.py

@@ -1060,7 +1060,7 @@ def list_scenes_command(
     assert isinstance(ctx, CliContext)
 
     no_output_file = no_output_file or ctx.config.get_value("list-scenes", "no-output-file")
-    scene_list_dir = ctx.config.get_value("list-scenes", "output", output, ignore_default=True)
+    scene_list_dir = ctx.config.get_value("list-scenes", "output", output)
     scene_list_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()],
@@ -1243,7 +1243,7 @@ def split_video_command(
     split_video_args = {
         "name_format": ctx.config.get_value("split-video", "filename", filename),
         "use_mkvmerge": mkvmerge,
-        "output_dir": ctx.config.get_value("split-video", "output", output, ignore_default=True),
+        "output_dir": ctx.config.get_value("split-video", "output", output),
         "show_output": not quiet,
         "ffmpeg_args": args,
     }
@@ -1420,7 +1420,7 @@ def save_images_command(
         ]
         logger.debug("\n".join(error_strs))
         raise click.BadParameter("\n".join(error_strs), param_hint="save-images")
-    output = ctx.config.get_value("save-images", "output", output, ignore_default=True)
+    output = ctx.config.get_value("save-images", "output", output)
 
     save_images_args = {
         "encoder_param": compression if png else quality,

scenedetect/_cli/config.py

@@ -306,7 +306,7 @@ def format(self, timecode: FrameTimecode) -> str:
         "display-cuts": True,
         "display-scenes": True,
         "filename": "$VIDEO_NAME-Scenes.csv",
-        "output": "",
+        "output": None,
         "no-output-file": False,
         "quiet": False,
         "skip-cuts": False,
@@ -320,7 +320,7 @@ def format(self, timecode: FrameTimecode) -> str:
         "frame-skip": 0,
         "merge-last-scene": False,
         "min-scene-len": TimecodeValue("0.6s"),
-        "output": "",
+        "output": None,
         "verbosity": "info",
     },
     "save-images": {
@@ -330,7 +330,7 @@ def format(self, timecode: FrameTimecode) -> str:
         "frame-margin": 1,
         "height": 0,
         "num-images": 3,
-        "output": "",
+        "output": None,
         "quality": RangeValue(_PLACEHOLDER, min_val=0, max_val=100),
         "scale": 1.0,
         "scale-method": "linear",
@@ -342,7 +342,7 @@ def format(self, timecode: FrameTimecode) -> str:
         "filename": "$VIDEO_NAME-Scene-$SCENE_NUMBER",
         "high-quality": False,
         "mkvmerge": False,
-        "output": "",
+        "output": None,
         "preset": "veryfast",
         "quiet": False,
         "rate-factor": RangeValue(22, min_val=0, max_val=100),
@@ -580,7 +580,6 @@ def get_value(
         command: str,
         option: str,
         override: Optional[ConfigValue] = None,
-        ignore_default: bool = False,
     ) -> ConfigValue:
         """Get the current setting or default value of the specified command option."""
         assert command in CONFIG_MAP and option in CONFIG_MAP[command]
@@ -590,8 +589,6 @@ def get_value(
             value = self._config[command][option]
         else:
             value = CONFIG_MAP[command][option]
-            if ignore_default:
-                return None
         if issubclass(type(value), ValidatedValue):
             return value.value
         return value

scenedetect/_cli/context.py

@@ -187,7 +187,7 @@ def handle_options(
             init_failure = not self.config.initialized
             init_log = self.config.get_init_log()
             quiet = not init_failure and quiet
-            self._initialize_logging(quiet=quiet, verbosity=verbosity, logfile=logfile)
+            self._initialize_logging(quiet, verbosity, logfile)
 
             # Configuration file was specified via CLI argument -c/--config.
             if config and not init_failure:
@@ -229,20 +229,16 @@ def handle_options(
                 param_hint="frame skip + stats file",
             )
 
-        # Handle the case where -i/--input was not specified (e.g. for the `help` command).
+        # Handle case where -i/--input was not specified (e.g. for the `help` command).
         if input_path is None:
             return
 
-        # Have to load the input video to obtain a time base before parsing timecodes.
-        self._open_video_stream(
-            input_path=input_path,
-            framerate=framerate,
-            backend=self.config.get_value("global", "backend", backend, ignore_default=True),
-        )
+        # Load the input video to obtain a time base for parsing timecodes.
+        self._open_video_stream(input_path, framerate, backend)
 
-        self.output_dir = output if output else self.config.get_value("global", "output")
+        self.output_dir = self.config.get_value("global", "output", output)
         if self.output_dir:
-            logger.info("Output directory set:\n  %s", self.output_dir)
+            logger.debug("Output directory set:\n  %s", self.output_dir)
 
         self.min_scene_len = self.parse_timecode(
             min_scene_len
@@ -507,7 +503,10 @@ def _initialize_logging(
         init_logger(log_level=curr_verbosity, show_stdout=not self.quiet_mode, log_file=logfile)
 
     def _open_video_stream(
-        self, input_path: ty.AnyStr, framerate: ty.Optional[float], backend: ty.Optional[str]
+        self,
+        input_path: ty.AnyStr,
+        framerate: ty.Optional[float],
+        backend: ty.Optional[str],
     ):
         if "%" in input_path and backend != "opencv":
             raise click.BadParameter(
@@ -517,14 +516,13 @@ def _open_video_stream(
         if framerate is not None and framerate < MAX_FPS_DELTA:
             raise click.BadParameter("Invalid framerate specified!", param_hint="-f/--framerate")
         try:
-            if backend is None:
-                backend = self.config.get_value("global", "backend")
-            else:
-                if backend not in AVAILABLE_BACKENDS:
-                    raise click.BadParameter(
-                        "Specified backend %s is not available on this system!" % backend,
-                        param_hint="-b/--backend",
-                    )
+            backend = self.config.get_value("global", "backend", backend)
+            if backend not in AVAILABLE_BACKENDS:
+                raise click.BadParameter(
+                    "Specified backend %s is not available on this system!" % backend,
+                    param_hint="-b/--backend",
+                )
+
             # Open the video with the specified backend, loading any required config settings.
             if backend == "pyav":
                 self.video_stream = open_video(