Already Client-side check if updates make a difference.

diff --git a/ircplom/client.py b/ircplom/client.py
index 0c393fe3f04482f20ac8a79da3e5ce54f0bdb457..7e7f56454963f931d66be676788a659c9bae21e3 100644 (file)
--- a/ircplom/client.py
+++ b/ircplom/client.py
@@ -187,23 +187,44 @@ class _CompletableStringsOrdered(_Clearable, _CompletableStringsCollection):
 
 class IntoEndnodeUpdatesMixin(AutoAttrMixin):
     'Provides .into_endnode_updates exportable for module-external consumers.'
+    _cache: dict[tuple[str, ...], Any] = {}
 
-    def into_endnode_updates(self, path: tuple[str, ...]
+    def into_endnode_updates(self,
+                             client_id: str,
+                             path: tuple[str, ...]
                              ) -> list[tuple[tuple[str, ...], Any]]:
         'Return path-value pairs for any update-worthy sub-elements.'
+
+        def update_unless_cached(path: tuple[str, ...], val: Any):
+            steps_so_far: list[str] = []
+            for step in path[:-1]:
+                cache_path = tuple(client_id) + tuple(steps_so_far)
+                if cache_path in self._cache:
+                    del self._cache[cache_path]
+                steps_so_far += [step]
+            cache_path = tuple(client_id) + path
+            if cache_path not in self._cache or val != self._cache[cache_path]:
+                self._cache[cache_path] = val
+                return [(path, val)]
+            return []
+
         if isinstance(self, _Completable):
-            return ([(path, self._completed)] if self._completed is not None
-                    else [])
+            if self._completed is not None:
+                return update_unless_cached(path, self._completed)
+            return []
+
         if isinstance(self, Dict) and not self._dict:
-            return [(path, None)]
+            return update_unless_cached(path, None)
+
         updates = []
         for key, val in (self._dict.items() if isinstance(self, Dict)
                          else ((k, getattr(self, k))
                                for k in self._deep_annotations())):
             p = path + (key,)
-            updates += (val.into_endnode_updates(p)
-                        if isinstance(val, IntoEndnodeUpdatesMixin)
-                        else [(p, val)])
+            if isinstance(val, IntoEndnodeUpdatesMixin):
+                updates += val.into_endnode_updates(client_id, p)
+            else:
+                updates += update_unless_cached(p, val)
         return updates
 
 
@@ -668,11 +689,10 @@ class _CapsManager(_Clearable):
                  ) -> None:
         self._dict = caps_dict
         self._send = lambda *args: sender('CAP', *args)
-        self.clear(first_run=True)
+        self.clear()
 
-    def clear(self, first_run=False) -> None:
-        if not first_run:
-            self._dict.clear()
+    def clear(self) -> None:
+        self._dict.clear()
         self._ls = _CompletableStringsSet()
         self._list = _CompletableStringsSet()
         self._list_expectations: dict[str, set[str]] = {
@@ -724,7 +744,6 @@ class _CapsManager(_Clearable):
 class Client(ABC, ClientQueueMixin):
     'Abstracts socket connection, loop over it, and handling messages from it.'
     conn: Optional[IrcConnection] = None
-    _caps: _CapsManager
     _cls_conn: type[IrcConnection] = IrcConnection
 
     def __init__(self, conn_setup: IrcConnSetup, **kwargs) -> None:

diff --git a/ircplom/client_tui.py b/ircplom/client_tui.py
index 96110690c6d7d576ecee9c2983c165b702abedb2..9b41e9579d2e0ff33f6ae67ab489095967c83545 100644 (file)
--- a/ircplom/client_tui.py
+++ b/ircplom/client_tui.py
@@ -513,7 +513,7 @@ class ClientKnowingTui(Client):
         value = ((parent[last_step] if last_step in parent.keys()
                   else None) if isinstance(parent, Dict)
                  else getattr(parent, last_step))
-        for path, value in (value.into_endnode_updates(path)
+        for path, value in (value.into_endnode_updates(self.client_id, path)
                             if isinstance(value, IntoEndnodeUpdatesMixin)
                             else [(path, value)]):
             self._client_tui_trigger('update_db', update=_Update(path, value))

diff --git a/test.txt b/test.txt
index 5efd5e6fb3a2784843e3c448b0350280253f68cc..5b1577f09924744b9163b4d9e7ead7b2e3344ca6 100644 (file)
--- a/test.txt
+++ b/test.txt
@@ -58,7 +58,6 @@
 1,2 $ ?!?@? renames ?
 1,2 $ users:me:user set to: [plom]
 1,2 $ connection_state set to: [connected]
-1,2 $ caps cleared
 
 2 > CAP LS :302
 2 > USER plom 0 * :baz
@@ -185,7 +184,6 @@
 2 < :bazbaz!~baz@baz.baz PART :#test
 4 $ bazbaz!~baz@baz.baz parts
 1,2 $ users:2 cleared
-, $ ?!?@? renames ?
 2 < :bazbaz!~baz@baz.baz JOIN :#test
 , $ ?!?@? renames ?
 , $ ?!?@? renames bazbaz
@@ -196,7 +194,6 @@
 4 $ bazbaz!~baz@baz.baz quits: Client Quit
 1,2 $ users:2 cleared
 1,2 $ users:3 cleared
-, $ ?!?@? renames ?
 2 < :foo!~plom@baz.bar.foo PART :#test
 1,2,3,4 $ foo!~plom@baz.bar.foo parts
 1,2 $ users:3 cleared
@@ -225,7 +222,6 @@
 1,2,3,4 $ ?!?@? renames ?
 1,2 $ users:me:user set to: [plom]
 1,2,3,4 $ connection_state set to: [connected]
-1,2 $ caps cleared
 2 > CAP LS :302
 2 > USER plom 0 * :baz
 2 > NICK :foo
@@ -246,7 +242,6 @@
 1,2 $ caps:bar:data set to: []
 1,2 $ caps:baz:data set to: []
 1,2 $ caps:foo:data set to: []
-1,2 $ caps:sasl:data set to: []
 1,2 $ caps:sasl:data set to: [PLAIN,EXTERNAL]
 1,2 $ caps:sasl:enabled set to: [True]
 1,2 $ sasl_auth_state set to: [attempting]