mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-18 06:25:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

DRYer

Browse Source
This commit is contained in:
Kovid Goyal
2024-07-27 00:01:41 +05:30
parent c18098d872
commit 8ba4e36ea4
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kitty/notifications.py
View File

@@ -215,7 +215,7 @@ class NotificationCommand:
# event callbacks # event callbacks
on_activation: Optional[Callable[['NotificationCommand'], None]] = None on_activation: Optional[Callable[['NotificationCommand'], None]] = None
def __init__(self, icon_data_cache: ReferenceType[IconDataCache], log: 'Log') -> None: def __init__(self, icon_data_cache: 'ReferenceType[IconDataCache]', log: 'Log') -> None:
self.icon_data_cache_ref = icon_data_cache self.icon_data_cache_ref = icon_data_cache
self.log = log self.log = log
@@ -613,11 +613,14 @@ class NotificationManager:
if n.close_response_requested: if n.close_response_requested:
self.send_closed_response(n.channel_id, n.identifier) self.send_closed_response(n.channel_id, n.identifier)
def create_notification_cmd(self) -> NotificationCommand:
return NotificationCommand(ref(self.icon_data_cache), self.log)
def send_test_notification(self) -> None: def send_test_notification(self) -> None:
boss = get_boss() boss = get_boss()
if w := boss.active_window: if w := boss.active_window:
from time import monotonic from time import monotonic
cmd = NotificationCommand(ref(self.icon_data_cache), self.log) cmd = self.create_notification_cmd()
now = monotonic() now = monotonic()
cmd.title = f'Test {now}' cmd.title = f'Test {now}'
cmd.body = f'At: {now}' cmd.body = f'At: {now}'
@@ -625,7 +628,7 @@ class NotificationManager:
self.notify_with_command(cmd, w.id) self.notify_with_command(cmd, w.id)
def send_new_version_notification(self, version: str) -> None: def send_new_version_notification(self, version: str) -> None:
cmd = NotificationCommand(ref(self.icon_data_cache), self.log) cmd = self.create_notification_cmd()
cmd.title = 'kitty update available!' cmd.title = 'kitty update available!'
cmd.body = f'kitty version {version} released' cmd.body = f'kitty version {version} released'
cmd.on_activation = self.desktop_integration.on_new_version_notification_activation cmd.on_activation = self.desktop_integration.on_new_version_notification_activation
@@ -668,7 +671,7 @@ class NotificationManager:
self, prev_cmd: NotificationCommand, channel_id: int, raw: str self, prev_cmd: NotificationCommand, channel_id: int, raw: str
) -> Optional[NotificationCommand]: ) -> Optional[NotificationCommand]:
metadata, payload = raw.partition(';')[::2] metadata, payload = raw.partition(';')[::2]
cmd = NotificationCommand(ref(self.icon_data_cache), self.log) cmd = self.create_notification_cmd()
try: try:
payload_type, payload_is_encoded = cmd.parse_metadata(metadata, prev_cmd) payload_type, payload_is_encoded = cmd.parse_metadata(metadata, prev_cmd)
except Exception: except Exception:
@@ -703,7 +706,7 @@ class NotificationManager:
def handle_notification_cmd(self, channel_id: int, osc_code: int, raw: str) -> None: def handle_notification_cmd(self, channel_id: int, osc_code: int, raw: str) -> None:
if osc_code == 99: if osc_code == 99:
cmd = self.pending_commands.pop(channel_id, None) or NotificationCommand(ref(self.icon_data_cache), self.log) cmd = self.pending_commands.pop(channel_id, None) or self.create_notification_cmd()
q = self.parse_notification_cmd(cmd, channel_id, raw) q = self.parse_notification_cmd(cmd, channel_id, raw)
if q is not None: if q is not None:
if q.done: if q.done:
@@ -711,11 +714,11 @@ class NotificationManager:
else: else:
self.pending_commands[channel_id] = q self.pending_commands[channel_id] = q
elif osc_code == 9: elif osc_code == 9:
n = NotificationCommand(ref(self.icon_data_cache), self.log) n = self.create_notification_cmd()
n.title = raw n.title = raw
self.notify_with_command(n, channel_id) self.notify_with_command(n, channel_id)
elif osc_code == 777: elif osc_code == 777:
n = NotificationCommand(ref(self.icon_data_cache), self.log) n = self.create_notification_cmd()
parts = raw.split(';', 1) parts = raw.split(';', 1)
n.title, n.body = parts[0], (parts[1] if len(parts) > 1 else '') n.title, n.body = parts[0], (parts[1] if len(parts) > 1 else '')
self.notify_with_command(n, channel_id) self.notify_with_command(n, channel_id)

6
kitty/window.py
View File

@@ -1472,13 +1472,13 @@ class Window:
when, duration, action, notify_cmdline = opts.notify_on_cmd_finish when, duration, action, notify_cmdline = opts.notify_on_cmd_finish
if last_cmd_output_duration >= duration and when != 'never': if last_cmd_output_duration >= duration and when != 'never':
from .notifications import NotificationCommand, OnlyWhen from .notifications import OnlyWhen
cmd = NotificationCommand() nm = get_boss().notification_manager
cmd = nm.create_notification_cmd()
cmd.title = 'kitty' cmd.title = 'kitty'
s = self.last_cmd_cmdline.replace('\\\n', ' ') s = self.last_cmd_cmdline.replace('\\\n', ' ')
cmd.body = f'Command {s} finished with status: {exit_status}.\nClick to focus.' cmd.body = f'Command {s} finished with status: {exit_status}.\nClick to focus.'
cmd.only_when = OnlyWhen(when) cmd.only_when = OnlyWhen(when)
nm = get_boss().notification_manager
if not nm.is_notification_allowed(cmd, self.id): if not nm.is_notification_allowed(cmd, self.id):
return return
if action == 'notify': if action == 'notify':