Work on porting config file parsing to Go

kittens/ssh/main.py

@@ -36,7 +36,6 @@ from ..tui.utils import kitty_opts, running_in_tmux
 from .config import init_config
 from .copy import CopyInstruction
 from .options.types import Options as SSHOptions
-from .options.utils import DELETE_ENV_VAR
 from .utils import create_shared_memory, get_ssh_cli, is_extra_arg, passthrough_args
 
 

kittens/ssh/options/definition.py

@@ -13,7 +13,7 @@ remote. Directories are copied recursively. If absolute paths are used, they are
 copied as is.'''
 
 definition = Definition(
-    'kittens.ssh',
+    '!kittens.ssh',
 )
 
 agr = definition.add_group
@@ -22,7 +22,7 @@ opt = definition.add_option
 
 agr('bootstrap', 'Host bootstrap configuration')  # {{{
 
-opt('hostname', '*', option_type='hostname', long_text='''
+opt('hostname', '*', long_text='''
 The hostname that the following options apply to. A glob pattern to match
 multiple hosts can be used. Multiple hostnames can also be specified, separated
 by spaces. The hostname can include an optional username in the form
@@ -44,7 +44,7 @@ The location on the remote host where the files needed for this kitten are
 installed. Relative paths are resolved with respect to :code:`$HOME`.
 ''')
 
-opt('+copy', '', option_type='copy', add_to_default=False, long_text=f'''
+opt('+copy', '', add_to_default=False, long_text=f'''
 {copy_message} For example::
 
     copy .vimrc .zshrc .config/some-dir
@@ -80,7 +80,7 @@ The login shell to execute on the remote host. By default, the remote user
 account's login shell is used.
 ''')
 
-opt('+env', '', option_type='env', add_to_default=False, long_text='''
+opt('+env', '', add_to_default=False, long_text='''
 Specify the environment variables to be set on the remote host. Using the
 name with an equal sign (e.g. :code:`env VAR=`) will set it to the empty string.
 Specifying only the name (e.g. :code:`env VAR`) will remove the variable from

kittens/ssh/options/types.py

@@ -1,93 +0,0 @@
-# generated by gen-config.py DO NOT edit
-
-# isort: skip_file
-import typing
-import kittens.ssh.copy
-
-if typing.TYPE_CHECKING:
-    choices_for_askpass = typing.Literal['unless-set', 'ssh', 'native']
-    choices_for_remote_kitty = typing.Literal['if-needed', 'no', 'yes']
-else:
-    choices_for_askpass = str
-    choices_for_remote_kitty = str
-
-option_names = (  # {{{
- 'askpass',
- 'color_scheme',
- 'copy',
- 'cwd',
- 'env',
- 'hostname',
- 'interpreter',
- 'login_shell',
- 'remote_dir',
- 'remote_kitty',
- 'share_connections',
- 'shell_integration')  # }}}
-
-
-class Options:
-    askpass: choices_for_askpass = 'unless-set'
-    color_scheme: str = ''
-    cwd: str = ''
-    hostname: str = '*'
-    interpreter: str = 'sh'
-    login_shell: str = ''
-    remote_dir: str = '.local/share/kitty-ssh-kitten'
-    remote_kitty: choices_for_remote_kitty = 'if-needed'
-    share_connections: bool = True
-    shell_integration: str = 'inherited'
-    copy: typing.Dict[str, kittens.ssh.copy.CopyInstruction] = {}
-    env: typing.Dict[str, str] = {}
-    config_paths: typing.Tuple[str, ...] = ()
-    config_overrides: typing.Tuple[str, ...] = ()
-
-    def __init__(self, options_dict: typing.Optional[typing.Dict[str, typing.Any]] = None) -> None:
-        if options_dict is not None:
-            null = object()
-            for key in option_names:
-                val = options_dict.get(key, null)
-                if val is not null:
-                    setattr(self, key, val)
-
-    @property
-    def _fields(self) -> typing.Tuple[str, ...]:
-        return option_names
-
-    def __iter__(self) -> typing.Iterator[str]:
-        return iter(self._fields)
-
-    def __len__(self) -> int:
-        return len(self._fields)
-
-    def _copy_of_val(self, name: str) -> typing.Any:
-        ans = getattr(self, name)
-        if isinstance(ans, dict):
-            ans = ans.copy()
-        elif isinstance(ans, list):
-            ans = ans[:]
-        return ans
-
-    def _asdict(self) -> typing.Dict[str, typing.Any]:
-        return {k: self._copy_of_val(k) for k in self}
-
-    def _replace(self, **kw: typing.Any) -> "Options":
-        ans = Options()
-        for name in self:
-            setattr(ans, name, self._copy_of_val(name))
-        for name, val in kw.items():
-            setattr(ans, name, val)
-        return ans
-
-    def __getitem__(self, key: typing.Union[int, str]) -> typing.Any:
-        k = option_names[key] if isinstance(key, int) else key
-        try:
-            return getattr(self, k)
-        except AttributeError:
-            pass
-        raise KeyError(f"No option named: {k}")
-
-
-defaults = Options()
-defaults.copy = {}
-defaults.env = {}

kittens/ssh/options/utils.py

@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-# License: GPLv3 Copyright: 2022, Kovid Goyal <kovid at kovidgoyal.net>
-
-from typing import Any, Dict, Iterable, Optional, Tuple
-
-from ..copy import CopyInstruction, parse_copy_instructions
-
-DELETE_ENV_VAR = '_delete_this_env_var_'
-
-
-def env(val: str, current_val: Dict[str, str]) -> Iterable[Tuple[str, str]]:
-    val = val.strip()
-    if val:
-        if '=' in val:
-            key, v = val.split('=', 1)
-            key, v = key.strip(), v.strip()
-            if key:
-                yield key, v
-        else:
-            yield val, DELETE_ENV_VAR
-
-
-def copy(val: str, current_val: Dict[str, str]) -> Iterable[Tuple[str, CopyInstruction]]:
-    yield from parse_copy_instructions(val, current_val)
-
-
-def init_results_dict(ans: Dict[str, Any]) -> Dict[str, Any]:
-    ans['hostname'] = '*'
-    ans['per_host_dicts'] = {}
-    return ans
-
-
-def get_per_hosts_dict(results_dict: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
-    ans: Dict[str, Dict[str, Any]] = results_dict.get('per_host_dicts', {}).copy()
-    h = results_dict['hostname']
-    hd = {k: v for k, v in results_dict.items() if k != 'per_host_dicts'}
-    ans[h] = hd
-    return ans
-
-
-first_seen_positions: Dict[str, int] = {}
-
-
-def hostname(val: str, dict_with_parse_results: Optional[Dict[str, Any]] = None) -> str:
-    if dict_with_parse_results is not None:
-        ch = dict_with_parse_results['hostname']
-        if val != ch:
-            from .parse import create_result_dict
-            phd = get_per_hosts_dict(dict_with_parse_results)
-            dict_with_parse_results.clear()
-            dict_with_parse_results.update(phd.pop(val, create_result_dict()))
-            dict_with_parse_results['per_host_dicts'] = phd
-            dict_with_parse_results['hostname'] = val
-            if val not in first_seen_positions:
-                first_seen_positions[val] = len(first_seen_positions)
-    return val