Code to read needed options from kitty.conf in a kitten

This commit is contained in:
Kovid Goyal
2023-02-22 16:09:26 +05:30
parent 0614c63966
commit 907a51c99c
4 changed files with 48 additions and 1 deletions

View File

@@ -171,6 +171,7 @@ type connection_data struct {
func run_ssh(ssh_args, server_args, found_extra_args []string) (rc int, err error) {
go Data()
go RelevantKittyOpts()
cmd := append([]string{SSHExe()}, ssh_args...)
cd := connection_data{remote_args: server_args[1:]}
hostname := server_args[0]

View File

@@ -5,8 +5,11 @@ package ssh
import (
"fmt"
"io"
"kitty"
"kitty/tools/config"
"kitty/tools/utils"
"os/exec"
"path/filepath"
"regexp"
"strconv"
"strings"
@@ -219,3 +222,23 @@ var GetSSHVersion = (&utils.Once[SSHVersion]{Run: func() SSHVersion {
}
return SSHVersion{}
}}).Get
type KittyOpts struct {
Term, Shell_integration string
}
var RelevantKittyOpts = (&utils.Once[KittyOpts]{Run: func() KittyOpts {
ans := KittyOpts{Term: kitty.KittyConfigDefaults.Term, Shell_integration: kitty.KittyConfigDefaults.Shell_integration}
handle_line := func(key, val string) error {
switch key {
case "term":
ans.Term = strings.TrimSpace(val)
case "shell_integration":
ans.Shell_integration = strings.TrimSpace(val)
}
return nil
}
cp := config.ConfigParser{LineHandler: handle_line}
cp.ParseFiles(filepath.Join(utils.ConfigDir(), "kitty.conf"))
return ans
}}).Get

View File

@@ -4,8 +4,11 @@ package ssh
import (
"fmt"
"os"
"path/filepath"
"testing"
"kitty/tools/utils"
"kitty/tools/utils/shlex"
"github.com/google/go-cmp/cmp"
@@ -51,3 +54,17 @@ func TestParseSSHArgs(t *testing.T) {
p(`-46p23 -S/moose -W x:6 -- localhost sh -c "a b"`, `-4 -6 -p 23 -S /moose -W x:6`, `localhost sh -c "a b"`, ``, false)
p(`--kitten=abc -np23 --kitten xyz host`, `-n -p 23`, `host`, `--kitten abc --kitten xyz`, true)
}
func TestRelevantKittyOpts(t *testing.T) {
tdir := t.TempDir()
orig := utils.ConfigDir
utils.ConfigDir = func() string { return tdir }
defer func() { utils.ConfigDir = orig }()
os.WriteFile(filepath.Join(tdir, "kitty.conf"), []byte("term XXX\nshell_integration changed\nterm abcd"), 0o600)
if RelevantKittyOpts().Term != "abcd" {
t.Fatalf("Unexpected TERM: %s", RelevantKittyOpts().Term)
}
if RelevantKittyOpts().Shell_integration != "changed" {
t.Fatalf("Unexpected shell_integration: %s", RelevantKittyOpts().Shell_integration)
}
}