diff options
author | Devaev Maxim <[email protected]> | 2019-10-24 02:42:19 +0300 |
---|---|---|
committer | Devaev Maxim <[email protected]> | 2019-10-24 02:42:19 +0300 |
commit | 096064cfbc2428a7e276ff5b5c09ecdd0badbb35 (patch) | |
tree | 218e338990ee9a939c246eb6f4a873ac93d55fef /kvmd | |
parent | 97e2d9128c37805ba649807f5f923d1d1e92907f (diff) |
changed some defaults
Diffstat (limited to 'kvmd')
-rw-r--r-- | kvmd/apps/__init__.py | 22 | ||||
-rw-r--r-- | kvmd/plugins/__init__.py | 2 | ||||
-rw-r--r-- | kvmd/plugins/atx/__init__.py | 2 | ||||
-rw-r--r-- | kvmd/plugins/msd/__init__.py | 2 |
4 files changed, 15 insertions, 13 deletions
diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py index c4b0b0bc..57bd7eb9 100644 --- a/kvmd/apps/__init__.py +++ b/kvmd/apps/__init__.py @@ -185,8 +185,8 @@ def _get_config_scheme() -> Dict: "host": Option("localhost", type=valid_ip_or_host), "port": Option(0, type=valid_port), "unix": Option("", type=valid_abs_path, only_if="!port", unpack_as="unix_path"), - "unix_rm": Option(False, type=valid_bool), - "unix_mode": Option(0, type=valid_unix_mode), + "unix_rm": Option(True, type=valid_bool), + "unix_mode": Option(0o660, type=valid_unix_mode), "heartbeat": Option(3.0, type=valid_float_f01), "sync_chunk_size": Option(65536, type=(lambda arg: valid_number(arg, min=1024))), "access_log_format": Option("[%P / %{X-Real-IP}i] '%r' => %s; size=%b ---" @@ -201,7 +201,7 @@ def _get_config_scheme() -> Dict: }, "external": { - "type": Option(""), + "type": Option("", type=(lambda arg: str(arg).strip())), }, }, @@ -211,17 +211,17 @@ def _get_config_scheme() -> Dict: }, "hid": { - "type": Option("serial"), + "type": Option("", type=(lambda arg: str(arg).strip())), # Dynamic content }, "atx": { - "type": Option("gpio"), + "type": Option("", type=(lambda arg: str(arg).strip())), # Dynamic content }, "msd": { - "type": Option("relay"), + "type": Option("", type=(lambda arg: str(arg).strip())), # Dynamic content }, @@ -229,15 +229,15 @@ def _get_config_scheme() -> Dict: "cap_pin": Option(-1, type=valid_gpio_pin_optional), "conv_pin": Option(-1, type=valid_gpio_pin_optional), - "sync_delay": Option(1.0, type=valid_float_f0), - "init_delay": Option(3.0, type=valid_float_f0), + "sync_delay": Option(0.0, type=valid_float_f0), + "init_delay": Option(1.0, type=valid_float_f0), "init_restart_after": Option(0.0, type=valid_float_f0), "shutdown_delay": Option(10.0, type=valid_float_f01), "state_poll": Option(1.0, type=valid_float_f01), - "quality": Option(80, type=valid_stream_quality), - "desired_fps": Option(0, type=valid_stream_fps), - "max_fps": Option(120, type=valid_stream_fps), + "quality": Option(80, type=valid_stream_quality), + "desired_fps": Option(30, type=valid_stream_fps), + "max_fps": Option(60, type=valid_stream_fps), "host": Option("localhost", type=valid_ip_or_host), "port": Option(0, type=valid_port), diff --git a/kvmd/plugins/__init__.py b/kvmd/plugins/__init__.py index cdd683ff..ebdeaf0b 100644 --- a/kvmd/plugins/__init__.py +++ b/kvmd/plugins/__init__.py @@ -50,6 +50,8 @@ class BasePlugin: @functools.lru_cache() def get_plugin_class(sub: str, name: str) -> Type[BasePlugin]: + assert sub + assert name try: module = importlib.import_module(f"kvmd.plugins.{sub}.{name}") except ModuleNotFoundError: diff --git a/kvmd/plugins/atx/__init__.py b/kvmd/plugins/atx/__init__.py index f05cef78..a593929e 100644 --- a/kvmd/plugins/atx/__init__.py +++ b/kvmd/plugins/atx/__init__.py @@ -82,4 +82,4 @@ class BaseAtx(BasePlugin): # ===== def get_atx_class(name: str) -> Type[BaseAtx]: - return get_plugin_class("atx", (name or "disabled")) # type: ignore + return get_plugin_class("atx", name) # type: ignore diff --git a/kvmd/plugins/msd/__init__.py b/kvmd/plugins/msd/__init__.py index dc6fbd51..899b6f47 100644 --- a/kvmd/plugins/msd/__init__.py +++ b/kvmd/plugins/msd/__init__.py @@ -119,4 +119,4 @@ class BaseMsd(BasePlugin): # ===== def get_msd_class(name: str) -> Type[BaseMsd]: - return get_plugin_class("msd", (name or "disabled")) # type: ignore + return get_plugin_class("msd", name) # type: ignore |