From a9bcc3319a7aa47d3fc65a7c1e3e6dfe814a9148 Mon Sep 17 00:00:00 2001
From: Yury Shvedov <yury.shvedov@kaspersky.com>
Date: Wed, 4 Dec 2024 19:19:51 +0300
Subject: [PATCH] Cleanup command finish notifications

Currently notifications emitted with `notify_on_cmd_finish` and
unfocused left withing notification bar forever and user have to clear
them by hand. This patch automatically clears notification when emitted
window gained its focus back assuming that user is aware about action
and not needs for notification any more.

Change-Id: I8c9f58eeed696eb473aa4a966436aeb1a15fd3d6
---
 kitty/notifications.py |  3 +++
 kitty/window.py        | 23 ++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/kitty/notifications.py b/kitty/notifications.py
index d93586ffe..3efc7826e 100644
--- a/kitty/notifications.py
+++ b/kitty/notifications.py
@@ -1062,5 +1062,8 @@ class NotificationManager:
             n.title, n.body = parts[0], (parts[1] if len(parts) > 1 else '')
             self.notify_with_command(n, channel_id)
 
+    def close_notification(self, desktop_notification_id: int) -> None:
+        self.desktop_integration.close_notification(desktop_notification_id)
+
     def cleanup(self) -> None:
         del self.icon_data_cache
diff --git a/kitty/window.py b/kitty/window.py
index d0b130bdf..51d4752ef 100644
--- a/kitty/window.py
+++ b/kitty/window.py
@@ -629,6 +629,7 @@ class Window:
         self.current_mouse_event_button = 0
         self.current_clipboard_read_ask: Optional[bool] = None
         self.last_cmd_output_start_time = 0.
+        self.last_notification_id: Optional[int] = None
         self.open_url_handler: 'OpenUrlHandler' = None
         self.last_cmd_cmdline = ''
         self.last_cmd_exit_status = 0
@@ -1200,6 +1201,13 @@ class Window:
                 tab = self.tabref()
                 if tab is not None:
                     tab.relayout_borders()
+            if self.last_notification_id:
+                # Notification id is saved withing handle_cmd_end so it
+                # configured to be close upon focus is gained and visibility
+                # change. When window is focused, it is visible for sure.
+                nm = get_boss().notification_manager
+                nm.close_notification(self.last_notification_id)
+                self.last_notification_id = None
         elif self.os_window_id == current_focused_os_window_id():
             # Cancel IME composition after loses focus
             update_ime_position_for_window(self.id, False, -1)
@@ -1510,7 +1518,20 @@ class Window:
             if not nm.is_notification_allowed(cmd, self.id):
                 return
             if action == 'notify':
-                nm.notify_with_command(cmd, self.id)
+                # Notification id is saved, so configuration was checked on
+                # previous pass and saved to be cleared upon focus. But that
+                # action was missed somehow and we should clear it here.
+                if self.last_notification_id:
+                    nm.close_notification(self.last_notification_id)
+                    self.last_notification_id = None
+                notification_id = nm.notify_with_command(cmd, self.id)
+                # Saving notification id only when we are going to close it in
+                # future.
+                # TODO(Shvedov): We should close notification not only when
+                # gather focus, but when window become visible if `when` equals
+                # to "invisible".
+                if cmd.only_when is OnlyWhen.unfocused or cmd.only_when is OnlyWhen.invisible:
+                    self.last_notification_id = notification_id
             elif action == 'bell':
                 self.screen.bell()
             elif action == 'command':