Просмотр исходного кода

remove updating views from binding

Falko Schindler 2 лет назад
Родитель
Сommit
adfb658bf2
1 измененных файлов с 3 добавлено и 33 удалено
  1. 3 33
      nicegui/binding.py

+ 3 - 33
nicegui/binding.py

@@ -5,10 +5,7 @@ from abc import ABC, abstractmethod
 from collections import defaultdict
 from typing import Any, Callable, Optional, Set, Tuple
 
-from justpy.htmlcomponents import HTMLBaseComponent
-
 from . import globals
-from .task_logger import create_task
 
 bindings = defaultdict(list)
 bindable_properties = dict()
@@ -18,67 +15,41 @@ active_links = []
 async def loop():
     while True:
         visited: Set[Tuple[int, str]] = set()
-        visited_views: Set[HTMLBaseComponent] = set()
         t = time.time()
         for link in active_links:
             (source_obj, source_name, target_obj, target_name, transform) = link
             value = transform(getattr(source_obj, source_name))
             if getattr(target_obj, target_name) != value:
                 setattr(target_obj, target_name, value)
-                propagate(target_obj, target_name, visited, visited_views)
+                propagate(target_obj, target_name, visited)
         if time.time() - t > 0.01:
             logging.warning(f'binding propagation for {len(active_links)} active links took {time.time() - t:.3f} s')
-        t = time.time()
-        update_views(visited_views)
-        if time.time() - t > 0.01:
-            logging.warning(f'binding update for {len(visited_views)} visited views took {time.time() - t:.3f} s')
         await asyncio.sleep(globals.config.binding_refresh_interval)
 
 
-async def update_views_async(views: Set[HTMLBaseComponent]):
-    for view in views:
-        await view.update()
-
-
-def update_views(views: Set[HTMLBaseComponent]):
-    if globals.loop is None:
-        return  # NOTE: no need to update view if event loop is not running, yet
-    create_task(update_views_async(views), name='update_views_async')
-
-
-def propagate(source_obj: Any,
-              source_name: str,
-              visited: Set[Tuple[int, str]] = None,
-              visited_views: Set[HTMLBaseComponent] = None) -> Set[HTMLBaseComponent]:
+def propagate(source_obj: Any, source_name: str, visited: Set[Tuple[int, str]] = None) -> None:
     if visited is None:
         visited = set()
-    if visited_views is None:
-        visited_views = set()
     visited.add((id(source_obj), source_name))
-    if isinstance(source_obj, HTMLBaseComponent):
-        visited_views.add(source_obj)
     for _, target_obj, target_name, transform in bindings[(id(source_obj), source_name)]:
         if (id(target_obj), target_name) in visited:
             continue
         target_value = transform(getattr(source_obj, source_name))
         if getattr(target_obj, target_name) != target_value:
             setattr(target_obj, target_name, target_value)
-            propagate(target_obj, target_name, visited, visited_views)
-    return visited_views
+            propagate(target_obj, target_name, visited)
 
 
 def bind_to(self_obj: Any, self_name: str, other_obj: Any, other_name: str, forward: Callable) -> None:
     bindings[(id(self_obj), self_name)].append((self_obj, other_obj, other_name, forward))
     if (id(self_obj), self_name) not in bindable_properties:
         active_links.append((self_obj, self_name, other_obj, other_name, forward))
-    update_views(propagate(self_obj, self_name))
 
 
 def bind_from(self_obj: Any, self_name: str, other_obj: Any, other_name: str, backward: Callable) -> None:
     bindings[(id(other_obj), other_name)].append((other_obj, self_obj, self_name, backward))
     if (id(other_obj), other_name) not in bindable_properties:
         active_links.append((other_obj, other_name, self_obj, self_name, backward))
-    update_views(propagate(other_obj, other_name))
 
 
 def bind(self_obj: Any, self_name: str, other_obj: Any, other_name: str, *,
@@ -105,7 +76,6 @@ class BindableProperty:
             return
         setattr(owner, '___' + self.name, value)
         bindable_properties[(id(owner), self.name)] = owner
-        update_views(propagate(owner, self.name))
         if value_changed and self.on_change is not None:
             self.on_change(owner, value)