dandri/NomadNet
1
0
Fork 0
mirror of https://github.com/markqvist/NomadNet.git synced 2026-06-05 03:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run UI-side message cleaning with hub lock

Browse Source
This commit is contained in:
Mark Qvist
2026-05-22 11:48:36 +02:00
parent a1b1aea83d
commit d661ba0531
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nomadnet/RRC.py
+5 -3
View File
@@ -815,9 +815,11 @@ class RRCHub:
self._append_history(target_room, msg)
self._clean_history()
def get_messages(self, room):
with self._lock:
buf = list(self.messages.get(room, []))
def get_messages(self, room, take_lock=True):
if take_lock:
with self._lock: buf = list(self.messages.get(room, []))
else: buf = list(self.messages.get(room, []))
return buf
def _on_packet(self, data):
nomadnet/ui/textui/Channels.py
+14 -13
View File
@@ -773,20 +773,21 @@ class RoomWidget(urwid.WidgetWrap):
if self.hub.clean_last_removed > self.last_history_clean:
try:
hub_msgs = self.hub.get_messages(self.room) if (self.hub is not None and self.room is not None) else []
self.last_history_clean = time.time()
c = self.messagelist.body_len()
old = set()
for i in range(0, c):
msg = None
w = self.messagelist.get_item(i)
if hasattr(w, "_original_widget"): o = w._original_widget
else: o = None
if hasattr(o, "msg"): msg = o.msg
elif hasattr(w, "msg"): msg = w.msg
if msg and not msg in hub_msgs: old.add(i)
with self.hub._lock:
hub_msgs = self.hub.get_messages(self.room, take_lock=False) if (self.hub is not None and self.room is not None) else []
self.last_history_clean = time.time()
c = self.messagelist.body_len()
old = set()
for i in range(0, c):
msg = None
w = self.messagelist.get_item(i)
if hasattr(w, "_original_widget"): o = w._original_widget
else: o = None
if hasattr(o, "msg"): msg = o.msg
elif hasattr(w, "msg"): msg = w.msg
if msg and not msg in hub_msgs: old.add(i)
for i in reversed(list(old)): self.messagelist.delete_position(i)
for i in reversed(list(old)): self.messagelist.delete_position(i)
except Exception as e:
RNS.log("Error while cleaning room history", RNS.LOG_ERROR)