Ensure icon cache is cleared at exit
This commit is contained in:
parent
7023e1506b
commit
eb1bb493a7
3 changed files with 12 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -671,7 +671,8 @@ def __init__(
|
|||
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 @@ def __init__(
|
|||
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 @@ def handle_notification_cmd(self, channel_id: int, osc_code: int, raw: str) -> N
|
|||
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
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ def filter_rules(self):
|
|||
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():
|
||||
|
|
|
|||
Loading…
Reference in a new issue