Updated dependencies

Update TextUI.py

nomadnet/Node.py

@@ -1,4 +1,6 @@
 import os
+import sys
+
 import RNS
 import time
 import threading
@@ -159,7 +161,7 @@ class Node:
         try:
             if request_allowed:
                 RNS.log("Serving page: "+file_path, RNS.LOG_VERBOSE)
-                if os.access(file_path, os.X_OK):
+                if not RNS.vendor.platformutils.is_windows() and os.access(file_path, os.X_OK):
                     env_map = {}
                     if "PATH" in os.environ:
                         env_map["PATH"] = os.environ["PATH"]

nomadnet/NomadNetworkApp.py

@@ -1136,13 +1136,15 @@ announce_interval = 360
 # Whether to announce when the node starts.
 announce_at_start = Yes
 
-# By default, when Nomad Network is hosting a
-# node, it will also act as an LXMF propagation
+# When Nomad Network is hosting a page-serving
+# node, it can also act as an LXMF propagation
 # node. If there is already a large amount of
 # propagation nodes on the network, or you
 # simply want to run a pageserving-only node,
 # you can disable running a propagation node.
-# disable_propagation = False
+# Due to lots of propagation nodes being
+# available, this is currently the default.
+disable_propagation = Yes
 
 # The maximum amount of storage to use for
 # the LXMF Propagation Node message store,
@@ -1176,10 +1178,6 @@ max_transfer_size = 256
 # and generally you do not need to use it.
 # prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf
 
-# Automatic rescan interval of the pages directory in minutes.
-# Default: int = 0 (no rescan)
-page_refresh_interval = 0
-
 # You can specify the interval in minutes for
 # rescanning the hosted pages path. By default,
 # this option is disabled, and the pages path

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.5.5"
+__version__ = "0.5.7"

nomadnet/ui/textui/MicronParser.py

@@ -168,7 +168,7 @@ def parse_line(line, state, url_delegate):
                             fn = o["name"]
                             fs = o["style"]
                             fmask = "*" if o["masked"] else None
-                            f = urwid.Edit(caption="", edit_text=fd, align=state["align"], multiline=False, mask=fmask)
+                            f = urwid.Edit(caption="", edit_text=fd, align=state["align"], multiline=True, mask=fmask)
                             f.field_name = fn
                             fa = urwid.AttrMap(f, fs)
                             widgets.append((fw, fa))

nomadnet/ui/textui/Network.py

@@ -1594,10 +1594,10 @@ class NetworkDisplay():
         if self.list_display == 1:
             parent = self.app.ui.main_display.sub_displays.network_display
             selected_node_entry = parent.known_nodes_display.ilb.get_selected_item()
-            if selected_node_entry != None:
-                selected_node_hash = selected_node_entry._get_base_widget().display_widget.source_hash
+            if selected_node_entry is not None:
+                selected_node_hash = selected_node_entry.base_widget.display_widget.source_hash
                 
-                if selected_node_hash != None:
+                if selected_node_hash is not None:
                     info_widget = KnownNodeInfo(selected_node_hash)
                     options = parent.left_pile.options(height_type=urwid.WEIGHT, height_amount=1)
                     parent.left_pile.contents[0] = (info_widget, options)
@@ -1797,7 +1797,15 @@ class LXMFPeerEntry(urwid.WidgetWrap):
                 style = "list_unresponsive"
                 focus_style = "list_focus_unresponsive"
 
-        widget = ListEntry(sym+" "+display_str+"\n  "+alive_string+", last heard "+pretty_date(int(peer.last_heard))+"\n  "+str(len(peer.unhandled_messages))+" unhandled LXMs, "+RNS.prettysize(peer.link_establishment_rate/8, "b")+"/s LER")
+        if peer.propagation_transfer_limit:
+            txfer_limit = RNS.prettysize(peer.propagation_transfer_limit*1000)
+        else:
+            txfer_limit = "No"
+        peer_info_str  = sym+" "+display_str+"\n  "+alive_string+", last heard "+pretty_date(int(peer.last_heard))
+        peer_info_str += "\n  "+str(len(peer.unhandled_messages))+f" unhandled LXMs, {txfer_limit} sync limit\n"
+        peer_info_str += f"  {RNS.prettyspeed(peer.sync_transfer_rate)} STR, "
+        peer_info_str += f"{RNS.prettyspeed(peer.link_establishment_rate)} LER\n"
+        widget = ListEntry(peer_info_str)
         self.display_widget = urwid.AttrMap(widget, style, focus_style)
         self.display_widget.destination_hash = destination_hash
         super().__init__(self.display_widget)

setup.py

@@ -30,6 +30,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=["rns>=0.8.7", "lxmf>=0.5.8", "urwid>=2.4.4", "qrcode"],
-    python_requires=">=3.6",
+    install_requires=["rns>=0.9.1", "lxmf>=0.6.0", "urwid>=2.6.16", "qrcode"],
+    python_requires=">=3.7",
 )