CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-05-13 08:26:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Ensure icon cache is cleared at exit

Browse source
This commit is contained in:
Kovid Goyal 2024-07-29 15:24:18 +05:30
parent 7023e1506b
commit eb1bb493a7
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kittens/notify/main.go
View file

@ -237,7 +237,9 @@ func (p *parsed_data) load_image_data() (err error) {
}
defer f.Close()
_, imgfmt, err := image.DecodeConfig(f)
f.Seek(0, io.SeekStart)
if _, err = f.Seek(0, io.SeekStart); err != nil {
return err
}
if err == nil && imgfmt != "" && strings.Contains("jpeg jpg gif png", strings.ToLower(imgfmt)) {
p.image_data, err = io.ReadAll(f)
return

9
kitty/notifications.py
View file

@ -671,7 +671,8 @@ class NotificationManager:
channel: Channel = Channel(),
log: Log = Log(),
debug: bool = False,
base_cache_dir: str = ''
base_cache_dir: str = '',
cleanup_at_exit: bool = True,
):
global debug_desktop_integration
debug_desktop_integration = debug
@ -693,6 +694,9 @@ class NotificationManager:
except Exception as e:
self.log(f'Failed to load {script_path} with error: {e}')
self.reset()
if cleanup_at_exit:
import atexit
atexit.register(self.cleanup)
def reset(self) -> None:
self.icon_data_cache.clear()
@ -892,3 +896,6 @@ class NotificationManager:
parts = raw.split(';', 1)
n.title, n.body = parts[0], (parts[1] if len(parts) > 1 else '')
self.notify_with_command(n, channel_id)
def cleanup(self) -> None:
del self.icon_data_cache

2
kitty_tests/notifications.py
View file

@ -90,7 +90,7 @@ class NotificationManager(NotificationManager):
def do_test(self: 'TestNotifications', tdir: str) -> None:
di = DesktopIntegration(None)
ch = Channel()
nm = NotificationManager(di, ch, lambda *a, **kw: None, base_cache_dir=tdir)
nm = NotificationManager(di, ch, lambda *a, **kw: None, base_cache_dir=tdir, cleanup_at_exit=False)
di.notification_manager = nm
def reset():