CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-08-04 06:36:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Allow closing notifications with the kitten

Browse source
This commit is contained in:
Kovid Goyal 2024-07-31 09:06:17 +05:30
parent b015a1fe8c
commit ad36c481af
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

29
kittens/notify/main.go
View file

@ -39,6 +39,7 @@ type parsed_data struct {
expire_time time.Duration
title, body, identifier string
image_data []byte
initial_msg string
}
func (p *parsed_data) create_metadata() string {
@ -119,6 +120,9 @@ func (p *parsed_data) run_loop() (err error) {
})
}
lp.OnInitialize = func() (string, error) {
if p.initial_msg != "" {
return p.initial_msg, nil
}
p.generate_chunks(func(x string) { lp.QueueWriteString(x) })
return "", nil
}
@ -255,9 +259,6 @@ func main(_ *cli.Command, opts *Options, args []string) (rc int, err error) {
var p parsed_data
p.opts = opts
p.title = args[0]
if len(p.title) == 0 {
return 1, fmt.Errorf("Must specify a non-empty TITLE for the notification")
}
if len(args) > 1 {
p.body = strings.Join(args[1:], " ")
}
@ -277,6 +278,28 @@ func main(_ *cli.Command, opts *Options, args []string) (rc int, err error) {
if !check_id_valid(opts.IconCacheId) {
return 1, bad_ident(opts.IconCacheId)
}
if len(p.title) == 0 {
if ident == "" {
return 1, fmt.Errorf("Must specify a non-empty TITLE for the notification or specify an identifier to close a notification.")
}
msg := ESC_CODE_PREFIX + "i=" + ident + ":p=close;" + ESC_CODE_SUFFIX
if opts.OnlyPrintEscapeCode {
_, err = os.Stdout.WriteString(msg)
} else if p.wait_till_closed {
p.initial_msg = msg
err = p.run_loop()
} else {
var term *tty.Term
if term, err = tty.OpenControllingTerm(); err != nil {
return 1, fmt.Errorf("Failed to open controlling terminal with error: %w", err)
}
if _, err = term.WriteString(msg); err != nil {
term.RestoreAndClose()
return 1, err
}
term.RestoreAndClose()
}
}
if p.expire_time, err = parse_duration(opts.ExpireTime); err != nil {
return 1, fmt.Errorf("Invalid expire time: %s with error: %w", opts.ExpireTime, err)
}

8
kittens/notify/main.py
View file

@ -83,6 +83,14 @@ if this kitten is being used inside a larger application, with --only-print-esca
help_text = '''\
Send notifications to the user that are displayed to them via the
desktop environment's notifications service. Works over SSH as well.
To update an existing notification, specify the identifier of the notification
with the --identifier option. The value should be the same as the identifier specified for
the notification you wish to update.
If no title is specified and an identifier is specified using the --identifier
option, then instead of creating a new notification, an existing notification
with the specified identifier is closed.
'''
usage = 'TITLE [BODY ...]'