nojhan/clibard
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fix duplicate messages and remove Rich's highlighting

Browse source
This commit is contained in:
Johann Dreo 2024-02-17 11:55:19 +01:00
commit b684ad2b2f
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/clibard/clibard.py
View file

@ -152,6 +152,13 @@ class Message:
for k in self.color: for k in self.color:
self._style[k] = f"color({self.color[k]})" self._style[k] = f"color({self.color[k]})"
def __eq__(self, other):
# Do not take date into account if it's already a duplicate.
return self.app == other.app \
and self.summary == other.summary \
and self.body == other.body \
and self.urgency == other.urgency
def style(self, key): def style(self, key):
if "reset" in key or "none" in key: if "reset" in key or "none" in key:
@ -235,9 +242,15 @@ class Broker:
if notification.get_member() == "Notify" and notification.get_interface() == 'org.freedesktop.Notifications': if notification.get_member() == "Notify" and notification.get_interface() == 'org.freedesktop.Notifications':
msg = Message(notification) msg = Message(notification)
mlen = msg.print_on(None) mlen = msg.print_on(None)
self.deck.append((msg, mlen)) if len(self.deck) == 0:
if len(self.deck) > self.max_msg: self.deck.append( (msg, mlen) )
del self.deck[0] else:
last_msg,last_mlen = self.deck.pop()
self.deck.append( (last_msg, last_mlen) )
if msg != last_msg: # We don't want duplicate in the last place.
self.deck.append( (msg, mlen) )
if len(self.deck) > self.max_msg:
self.deck.popleft()
self.print() self.print()
@ -250,7 +263,7 @@ class Broker:
def print(self): def print(self):
# print(len(self.deck),"message in deck") # print(len(self.deck),"message in deck")
console = Console() # Re-instantiate in case the terminal window changed. console = Console(highlight=False) # Re-instantiate in case the terminal window changed.
if len(self.bounds) == 2: if len(self.bounds) == 2:
console.print(f"\r{self.bounds[0]}", end="\r") console.print(f"\r{self.bounds[0]}", end="\r")
else: else: