mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-04 22:03:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Couple more options

Browse Source
This commit is contained in:
Kovid Goyal
2025-05-19 10:21:53 +05:30
parent f591ca151d
commit 6be57e4316
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kittens/desktop_ui/main.go
View File

@@ -80,9 +80,18 @@ func EntryPoint(root *cli.Command) {
})
ss.Add(cli.OptionSpec{
Name: "--as-json",
Dest: "As_json",
Help: "Show the settings as JSON for machine consumption",
Type: "bool-set",
})
ss.Add(cli.OptionSpec{
Name: "--in-namespace",
Help: "Show only settings in the specified names. Can be specified multiple times. When unspecified all namespaces are returned.",
Type: "list",
})
ss.Add(cli.OptionSpec{
Name: "--allow-other-backends",
Help: "Normally, after printing the settings, if the settings did not come from the desktop-ui kitten the command prints an error and exits. This prevents that.",
Type: "bool-set",
})
}

26
kittens/desktop_ui/portal.go
View File

@@ -197,7 +197,9 @@ func ParseValue(value string) (dbus.Variant, error) {
}
type ShowSettingsOptions struct {
As_json bool
AsJson bool
AllowOtherBackends bool
InNamespace []string
}
func show_settings(opts *ShowSettingsOptions) (err error) {
@@ -209,13 +211,17 @@ func show_settings(opts *ShowSettingsOptions) (err error) {
path := "/" + strings.ToLower(strings.ReplaceAll(DESKTOP_PORTAL_NAME, ".", "/"))
obj := conn.Object(DESKTOP_PORTAL_NAME, dbus.ObjectPath(path))
interface_name := strings.ReplaceAll(DESKTOP_PORTAL_NAME, "Desktop", "Settings")
call := obj.Call(interface_name+".ReadAll", dbus.FlagNoAutoStart, []string{""})
namespaces := opts.InNamespace
if len(namespaces) == 0 {
namespaces = append(namespaces, "")
}
call := obj.Call(interface_name+".ReadAll", dbus.FlagNoAutoStart, namespaces)
var response ReadAllType
if err = call.Store(&response); err != nil {
return fmt.Errorf("Failed to read response from ReadAll with error: %w", err)
}
if opts.As_json {
if opts.AsJson {
unwrapped := make(map[string]map[string]any, len(response))
for ns, m := range response {
w := make(map[string]any, len(m))
@@ -237,12 +243,14 @@ func show_settings(opts *ShowSettingsOptions) (err error) {
}
}
}
is_running_self := false
if m, found := response[SETTINGS_CANARY_NAMESPACE]; found {
_, is_running_self = m[SETTINGS_CANARY_KEY]
}
if !is_running_self {
err = fmt.Errorf("the settings did not come from the desktop-ui kitten. Some other portal backend is providing the service.")
if !opts.AllowOtherBackends {
is_running_self := false
if m, found := response[SETTINGS_CANARY_NAMESPACE]; found {
_, is_running_self = m[SETTINGS_CANARY_KEY]
}
if !is_running_self {
err = fmt.Errorf("the settings did not come from the desktop-ui kitten. Some other portal backend is providing the service.")
}
}
return
}