Revert "dnet: improve view() logic and cleanup"

This reverts commit 34ffc26fa6be6a07261afadd6d0e9476f98fcecf.

bin/dnet/main.py

@@ -40,9 +40,8 @@ class Dnetview:
                 logging.debug(f"Started {name} RPC on port {port}")
                 break
             except Exception as e:
-                info[name] = {}
-                await self.queue.put(info)
-                continue
+                logging.debug(f"failed to connect {host}:{port} {e}")
+                pass
     
         data = await rpc._make_request("p2p.get_info", [])
         info[name] = data
@@ -52,7 +51,7 @@ class Dnetview:
         await rpc.dnet_subscribe_events()
 
         while True:
-            await asyncio.sleep(0.1)
+            await asyncio.sleep(0.01)
             data = await rpc.reader.readline()
             try:
                 data = json.loads(data)

bin/dnet/view.py

@@ -197,91 +197,50 @@ class View():
         while True:
             await asyncio.sleep(0.1)
             evloop.call_soon(loop.draw_screen)
-            
-            nodes = self.model.nodes.items()
 
-            # TODO: get_info() needs to be re-called when offline nodes
-            # come back online.
-
-            # Keep track of online nodes
             for index, item in enumerate(self.listwalker.contents):
-                if item.node_name not in live_nodes:
-                    live_nodes.append(item.node_name)
-                if (item.session == "inbound-slot"
-                        and item.session not in live_inbound):
+                live_nodes.append(item.node_name)
+                if item.session == "inbound-slot":
                     live_inbound.append(item.i)
 
-            # Offline node
-            for name, info in nodes:
-                if bool(info):
-                    continue
-                if name in dead_nodes:
+            # Draw get_info(). Called only once.
+            for node_name, info in self.model.nodes.items():
+                if node_name in live_nodes:
                     continue
-                if name in live_nodes:
-                    logging.debug(f"removing... {name}")
-                    live_nodes.remove(name)
-                dead_nodes.append(name)
-
-                # Trigger a redraw
-                self.listwalker.contents.clear()
-                self.draw_empty(name, info)
-                for name, info in nodes:
-                    if name in dead_nodes:
-                        continue
-                    logging.debug(live_nodes)
-                    logging.debug(f"offline redraw {name}")
-                    self.draw_info(name, info)
+                self.draw_info(node_name, info)
 
-            # Add a new node.
-            for name, info in nodes:
-                if name in live_nodes:
-                    continue
-                if name in dead_nodes:
-                    continue
-                self.draw_info(name, info)
+            # TODO: when RPC can't connect, display the node as offline.
 
-            # Online node event handling.
-            for name, info in nodes:
-                if name in dead_nodes:
-                    continue
-                # Update events
+            # If a node goes offline, trigger a redraw.
+            for node_name, info in self.model.nodes.items():
+                if not bool(info):
+                    if node_name in dead_nodes:
+                        continue
+                    dead_nodes.append(node_name)
+                    self.listwalker.contents.clear()
+                    self.draw_empty(node_name, info)
+                    for name, info in self.model.nodes.items():
+                        if name not in dead_nodes:
+                            self.draw_info(name, info)
+
+                # Only render info if the node is online.
                 self.fill_left_box()
                 self.fill_right_box()
 
-                # New inbound comes online.
+                # If a new inbound comes online, trigger a redraw.
                 for key in info['inbound'].keys():
-                    if key in live_inbound:
-                        continue
-                    self.listwalker.contents.clear()
-                    # Redraw all incl. dead nodes.
-                    for name, info in nodes:
-                        if bool(info):
-                            self.draw_info(name, info)
-                        else:
-                            if name in dead_nodes:
-                                continue
-                            dead_nodes.append(name)
-                            self.draw_empty(name, info)
-                            for name, info in nodes:
+                    if key not in live_inbound:
+                        self.listwalker.contents.clear()
+                        for name, info in self.model.nodes.items():
                                 self.draw_info(name, info)
 
-                    # Inbound goes offline.
+                    # If an inbound goes offline, trigger a redraw.
                     addr = info['inbound'].get(key)
-                    if bool(addr):
-                        continue
-                    if key in dead_inbound:
-                        continue
-                    dead_inbound.append(key)
-                    self.listwalker.contents.clear()
-                    # Redraw all incl. dead nodes.
-                    for name, info in nodes:
-                        if bool(info):
-                            self.draw_info(name, info)
-                        else:
-                            if name in dead_nodes:
-                                continue
-                            dead_nodes.append(name)
-                            self.draw_empty(name, info)
-                            for name, info in nodes:
+                    if not bool(addr):
+                        if key in dead_inbound:
+                            continue
+                        dead_inbound.append(key)
+                        self.listwalker.contents.clear()
+                        for name, info in self.model.nodes.items():
+                            if name not in dead_nodes:
                                 self.draw_info(name, info)
-