@craftsamo/whatsapp-tools 0.1.0 → 0.1.2

package/src/hermes/whatsapp_tools_hermes/settings.py

@@ -24,64 +24,6 @@ def _names(key: str, value: Any) -> str | None:
     return ",".join(value) or None
 
 
-def _directory_flags(ctx: PluginContext, key: str, flag: str) -> list[str]:
-    """Read the directory setting ``key`` and return ``[flag, value]``, or ``[]`` when absent.
-
-    Raises:
-        SettingsError: the setting is present but not a non-empty string.
-    """
-    value = ctx.get_config(key)
-    if value is None:
-        return []
-    if not isinstance(value, str) or not value.strip():
-        raise SettingsError(f'setting "{key}" must be a path')
-    return [flag, value]
-
-
-def state_dir_flags(ctx: PluginContext) -> list[str]:
-    """Read ``state_dir`` and return ``["--state-dir", value]``, or ``[]`` when absent.
-
-    Raises:
-        SettingsError: the setting is present but not a non-empty string.
-    """
-    return _directory_flags(ctx, "state_dir", "--state-dir")
-
-
-def download_dir_flags(ctx: PluginContext) -> list[str]:
-    """Read ``download_dir`` and return ``["--download-dir", value]``, or ``[]`` when absent.
-
-    Raises:
-        SettingsError: the setting is present but not a non-empty string.
-    """
-    return _directory_flags(ctx, "download_dir", "--download-dir")
-
-
-def _is_path_item(item: Any) -> bool:
-    """Whether ``item`` is a non-empty string that survives the flag's comma-separated form whole."""
-    return isinstance(item, str) and bool(item.strip()) and "," not in item
-
-
-def send_dirs_flags(ctx: PluginContext) -> list[str]:
-    """Read ``send_dirs`` and return ``["--send-dirs", "a,b"]``, or ``[]`` when absent or empty.
-
-    The flag is comma-separated, so a path holding a comma is refused rather than split in two.
-
-    Raises:
-        SettingsError: the setting is present but not a list of non-empty strings without commas.
-    """
-    value = ctx.get_config("send_dirs")
-    if value is None:
-        return []
-    if not isinstance(value, list) or not all(_is_path_item(item) for item in value):
-        raise SettingsError('setting "send_dirs" must be a list of paths without commas')
-    return ["--send-dirs", ",".join(value)] if value else []
-
-
-def directory_flags(ctx: PluginContext) -> list[str]:
-    """The flags of the directory settings, which is all the ``target`` command takes."""
-    return state_dir_flags(ctx) + download_dir_flags(ctx) + send_dirs_flags(ctx)
-
-
 def language_setting(ctx: PluginContext) -> str | None:
     """The ``language`` setting, stripped; ``None`` when it is absent, blank or not a string.
 
@@ -105,11 +47,13 @@ def emoji_setting(ctx: PluginContext, defaults: Mapping[str, str] | None = None)
     return merged
 
 
-def _option_flag(name: str, kind: str, value: Any) -> list[str]:
+def _option_flag(name: str, declaration: str | dict[str, object], value: Any) -> list[str]:
+    kind = declaration["type"] if isinstance(declaration, dict) else declaration
     flag = f"--{name.replace('_', '-')}"
-    if kind == "text":
+    if kind in ("text", "path"):
         if not isinstance(value, str):
-            raise SettingsError(f'setting "{name}" must be text')
+            expected = "a path" if kind == "path" else "text"
+            raise SettingsError(f'setting "{name}" must be {expected}')
         return [flag, text] if (text := value.strip()) else []
     if kind == "boolean":
         if not isinstance(value, bool):
@@ -119,21 +63,25 @@ def _option_flag(name: str, kind: str, value: Any) -> list[str]:
         if isinstance(value, bool) or not isinstance(value, (int, float)) or not math.isfinite(value):
             raise SettingsError(f'setting "{name}" must be a finite number')
         return [flag, str(value)]
-    if kind == "list":
+    if kind in ("list", "paths"):
         if not isinstance(value, list) or not all(isinstance(item, str) and "," not in item for item in value):
-            raise SettingsError(f'setting "{name}" must be a list of strings without commas')
+            expected = "paths" if kind == "paths" else "strings"
+            raise SettingsError(f'setting "{name}" must be a list of {expected} without commas')
         items = [item.strip() for item in value if item.strip()]
         return [flag, ",".join(items)] if items else []
     raise SettingsError(f'unknown option type "{kind}" for "{name}"')
 
 
-def option_flags(ctx: PluginContext, options: Mapping[str, str] | None = None) -> list[str]:
-    """The package's tool options as flags, with absent settings left to the command line's environment."""
+def option_flags(ctx: PluginContext, options: Mapping[str, str | dict[str, object]] | None = None) -> list[str]:
+    """The package's tool options as flags, with absent settings left to the command line's environment.
+
+    Bounds and path absoluteness are checked by the command line, not here.
+    """
     flags: list[str] = []
-    for name, kind in (project.OPTIONS if options is None else options).items():
+    for name, declaration in (project.OPTIONS if options is None else options).items():
         value = ctx.get_config(name)
         if value is not None:
-            flags += _option_flag(name, kind, value)
+            flags += _option_flag(name, declaration, value)
     return flags
 
 
@@ -166,6 +114,4 @@ def settings_flags(ctx: PluginContext) -> list[str]:
         if value is not None and (names := _names(key, value)):
             flags += [flag, names]
 
-    flags += directory_flags(ctx)
-
     return [*flags, *option_flags(ctx)]