Versions

nomadnet/Node.py

@@ -173,7 +173,7 @@ class Node:
                             if isinstance(e, str) and (e.startswith("field_") or e.startswith("var_")):
                                 env_map[e] = data[e]
 
-                    generated = subprocess.run([file_path], stdout=subprocess.PIPE, env=env_map)
+                    generated = subprocess.run([file_path], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, env=env_map)
                     return generated.stdout
                 else:
                     fh = open(file_path, "rb")

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.9.5"
+__version__ = "0.9.7"

nomadnet/ui/textui/Browser.py

@@ -1040,7 +1040,8 @@ class Browser:
                     fg = self.markup[fgpos+5:endpos]
                     self.page_foreground_color = fg
 
-            self.attr_maps = markup_to_attrmaps(strip_modifiers(self.markup), url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
+            try: self.attr_maps = markup_to_attrmaps(strip_modifiers(self.markup), url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
+            except Exception as e: self.attr_maps = [urwid.AttrMap(urwid.Text(f"Could not render page: {e}"), "inactive_text")]
             
             self.response_progress = 0
             self.response_speed = None
@@ -1080,7 +1081,7 @@ class Browser:
                         if "PATH" in os.environ:
                             env_map["PATH"] = os.environ["PATH"]
 
-                        generated = subprocess.run([page_path], stdout=subprocess.PIPE, env=env_map)
+                        generated = subprocess.run([page_path], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, env=env_map)
                         page_data = generated.stdout
                     else:
                         file = open(page_path, "rb")
@@ -1107,7 +1108,8 @@ class Browser:
                         fg = self.markup[fgpos+5:endpos]
                         self.page_foreground_color = fg
 
-                self.attr_maps = markup_to_attrmaps(strip_modifiers(self.markup), url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
+                try: self.attr_maps = markup_to_attrmaps(strip_modifiers(self.markup), url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
+                except Exception as e: self.attr_maps = [urwid.AttrMap(urwid.Text(f"Could not render page: {e}"), "inactive_text")]
                 
                 self.response_progress = 0
                 self.response_speed = None
@@ -1259,7 +1261,9 @@ class Browser:
                     fg = self.markup[fgpos+5:endpos]
                     self.page_foreground_color = fg
 
-            self.attr_maps = markup_to_attrmaps(strip_modifiers(self.markup), url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
+            try: self.attr_maps = markup_to_attrmaps(strip_modifiers(self.markup), url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
+            except Exception as e: self.attr_maps = [urwid.AttrMap(urwid.Text(f"Could not render page: {e}"), "inactive_text")]
+
             self.response_progress = 0
             self.response_speed = None
             self.progress_updated_at = None

nomadnet/ui/textui/Interfaces.py

@@ -1,6 +1,7 @@
 import RNS
 import time
 import nomadnet
+import threading
 from math import log10, pow
 
 from nomadnet.vendor.additional_urwid_widgets.FormWidgets import *
@@ -2226,7 +2227,7 @@ class ShowInterface(urwid.WidgetWrap):
             self.history_length = screen_cols-(margin+2)
 
         # get interface stats
-        interface_stats = self.parent.app.rns.get_interface_stats()
+        interface_stats = self.parent.app.interface_stats
         stats_lookup = {iface['short_name']: iface for iface in interface_stats['interfaces']}
         self.stats = stats_lookup.get(iface_name, {})
 
@@ -2758,7 +2759,7 @@ class ShowInterface(urwid.WidgetWrap):
             return
 
         try:
-            interface_stats = self.parent.app.rns.get_interface_stats()
+            interface_stats = self.parent.app.interface_stats
             stats_lookup = {iface['short_name']: iface for iface in interface_stats['interfaces']}
             stats = stats_lookup.get(self.iface_name, {})
 
@@ -2825,6 +2826,8 @@ class InterfaceDisplay:
     def __init__(self, app):
         self.app = app
         self.started = False
+        self.poll_scheduler = False
+        self.size_scheduler = False
         self.interface_items = []
         self.glyphset = self.app.config["textui"]["glyphs"]
         self.g = self.app.ui.glyphs
@@ -2857,7 +2860,8 @@ class InterfaceDisplay:
 
             processed_interfaces[interface_name] = interface_data
 
-        interface_stats = app.rns.get_interface_stats()
+        app.interface_stats = app.rns.get_interface_stats()
+        interface_stats = app.interface_stats
         stats_lookup = {interface['short_name']: interface for interface in interface_stats['interfaces']}
         # print(stats_lookup)
         for interface_name, interface_data in processed_interfaces.items():
@@ -2916,8 +2920,8 @@ class InterfaceDisplay:
     def start(self):
         # started from Main.py
         self.started = True
-        self.app.ui.loop.set_alarm_in(1, self.poll_stats)
+        if not self.poll_scheduler: self.app.ui.loop.set_alarm_in(1, self.poll_stats)
-        self.app.ui.loop.set_alarm_in(5, self.check_terminal_size)
+        if not self.size_scheduler: self.app.ui.loop.set_alarm_in(5, self.check_terminal_size)
 
     def switch_to_edit_interface(self, iface_name):
         self.edit_interface_view = EditInterfaceView(self, iface_name)
@@ -2936,6 +2940,7 @@ class InterfaceDisplay:
         self.switch_to_edit_interface(interface_name)
 
     def check_terminal_size(self, loop, user_data):
+        self.size_scheduler = True
         new_cols, new_rows = _get_cols_rows()
 
         if new_rows != self.terminal_rows or new_cols != self.terminal_cols:
@@ -2950,12 +2955,15 @@ class InterfaceDisplay:
             loop.set_alarm_in(5, self.check_terminal_size)
 
     def poll_stats(self, loop, user_data):
+        self.poll_scheduler = True
         try:
             if hasattr(self, 'disconnect_overlay') and self.widget is self.disconnect_overlay:
                 self.widget = self.interfaces_display
                 self.app.ui.main_display.update_active_sub_display()
 
-            interface_stats = self.app.rns.get_interface_stats()
+            def job(): self.app.interface_stats = self.app.rns.get_interface_stats()
+            threading.Thread(target=job, daemon=True).start()
+            interface_stats = self.app.interface_stats
             stats_lookup = {iface['short_name']: iface for iface in interface_stats['interfaces']}
             for item in self.interface_items:
                 # use interface name as the key

nomadnet/ui/textui/MicronParser.py

@@ -146,6 +146,12 @@ def parse_line(line, state, url_delegate):
 
         # Only parse content if not in literal state
         if not state["literal"]:
+            # Apply markup sanitization
+            if first_char == ">" and "`<" in line:
+                # Remove heading status from lines containing fields
+                line = line.lstrip(">")
+                first_char = line[0]
+
             # Check if the command is an escape
             if first_char == "\\":
                 line = line[1:]

setup.py

@@ -30,6 +30,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=["rns>=1.0.4", "lxmf>=0.9.3", "urwid>=2.6.16", "qrcode"],
+    install_requires=["rns>=1.1.1", "lxmf>=0.9.4", "urwid>=2.6.16", "qrcode"],
     python_requires=">=3.7",
 )