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

Allow sending icon data without an identifier

Browse Source
This commit is contained in:
Kovid Goyal
2024-07-29 10:41:05 +05:30
parent a38153c890
commit 6e35289f8e
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
kitty/notifications.py
View File

@@ -25,7 +25,8 @@ class IconDataCache:
def __init__(self, base_cache_dir: str = '', max_cache_size: int = 128 * 1024 * 1024): def __init__(self, base_cache_dir: str = '', max_cache_size: int = 128 * 1024 * 1024):
self.max_cache_size = max_cache_size self.max_cache_size = max_cache_size
self.key_map: 'OrderedDict[str, str]' = OrderedDict() self.key_map: Dict[str, str] = {}
self.hash_map: 'OrderedDict[str, Set[str]]' = OrderedDict()
self.base_cache_dir = base_cache_dir self.base_cache_dir = base_cache_dir
self.cache_dir = '' self.cache_dir = ''
self.total_size = 0 self.total_size = 0
@@ -61,31 +62,36 @@ class IconDataCache:
with open(path, 'wb') as f: with open(path, 'wb') as f:
f.write(data) f.write(data)
self.total_size += len(data) self.total_size += len(data)
self.key_map.pop(key, None) # mark this key as being used recently self.hash_map[data_hash] = self.hash_map.pop(data_hash, set()) | {key} # mark this data as being used recently
if key:
self.key_map[key] = data_hash self.key_map[key] = data_hash
self.prune() self.prune()
return path return path
def get_icon(self, key: str) -> str: def get_icon(self, key: str) -> str:
self._ensure_state() self._ensure_state()
data_hash = self.key_map.pop(key, None) data_hash = self.key_map.get(key)
if data_hash: if data_hash:
self.key_map[key] = data_hash # mark this key as being used recently self.hash_map[data_hash] = self.hash_map.pop(data_hash, set()) | {key} # mark this data as being used recently
return os.path.join(self.cache_dir, data_hash) return os.path.join(self.cache_dir, data_hash)
return '' return ''
def clear(self) -> None: def clear(self) -> None:
while self.key_map: while self.hash_map:
key, data_hash = self.key_map.popitem(False) data_hash, keys = self.hash_map.popitem(False)
self._remove_data_hash(data_hash) for key in keys:
self.key_map.pop(key, None)
self._remove_data_file(data_hash)
def prune(self) -> None: def prune(self) -> None:
self._ensure_state() self._ensure_state()
while self.total_size > self.max_cache_size and self.key_map: while self.total_size > self.max_cache_size and self.hash_map:
key, data_hash = self.key_map.popitem(False) data_hash, keys = self.hash_map.popitem(False)
self._remove_data_hash(data_hash) for key in keys:
self.key_map.pop(key, None)
self._remove_data_file(data_hash)
def _remove_data_hash(self, data_hash: str) -> None: def _remove_data_file(self, data_hash: str) -> None:
path = os.path.join(self.cache_dir, data_hash) path = os.path.join(self.cache_dir, data_hash)
with suppress(FileNotFoundError): with suppress(FileNotFoundError):
sz = os.path.getsize(path) sz = os.path.getsize(path)
@@ -96,7 +102,9 @@ class IconDataCache:
self._ensure_state() self._ensure_state()
data_hash = self.key_map.pop(key, None) data_hash = self.key_map.pop(key, None)
if data_hash: if data_hash:
self._remove_data_hash(data_hash) for key in self.hash_map.pop(data_hash, set()):
self.key_map.pop(key, None)
self._remove_data_file(data_hash)
class Urgency(Enum): class Urgency(Enum):
@@ -366,12 +374,9 @@ class NotificationCommand:
if truncated: if truncated:
self.log('Ignoring too long notification icon data') self.log('Ignoring too long notification icon data')
else: else:
if self.icon_data_key:
icd = self.icon_data_cache_ref() icd = self.icon_data_cache_ref()
if icd: if icd:
self.icon_path = icd.add_icon(self.icon_data_key, data) self.icon_path = icd.add_icon(self.icon_data_key, data)
else:
self.log('Ignoring notification icon data because no icon data key specified')
def finalise(self) -> None: def finalise(self) -> None:
if self.current_payload_buffer: if self.current_payload_buffer:

2
kitty_tests/notifications.py
View File

@@ -306,6 +306,8 @@ def do_test(self: 'TestNotifications', tdir: str) -> None:
self.ae(di.notifications[-1], n(icon_name='moose', icon_path=dc.hash(b'1'))) self.ae(di.notifications[-1], n(icon_name='moose', icon_path=dc.hash(b'1')))
send_with_icon(g='gid2', data='2') send_with_icon(g='gid2', data='2')
self.ae(di.notifications[-1], n(icon_path=dc.hash(b'2'))) self.ae(di.notifications[-1], n(icon_path=dc.hash(b'2')))
send_with_icon(data='3')
self.ae(di.notifications[-1], n(icon_path=dc.hash(b'3')))
reset() reset()