Updated version

spelling fix

README.md

@@ -1,5 +1,4 @@
-Nomad Network - Communicate Freely
+# Nomad Network - Communicate Freely
-==========
 
 Off-grid, resilient mesh communication with strong encryption, forward secrecy and extreme privacy.
 
@@ -11,6 +10,8 @@ Nomad Network is build on [LXMF](https://github.com/markqvist/LXMF) and [Reticul
 
 Nomad Network does not need any connections to the public internet to work. In fact, it doesn't even need an IP or Ethernet network. You can use it entirely over packet radio, LoRa or even serial lines. But if you wish, you can bridge islanded networks over the Internet or private ethernet networks, or you can build networks running completely over the Internet. The choice is yours.
 
+If you'd rather want to use an LXMF client with a graphical user interface, you may want to take a look at [Sideband](https://github.com/markqvist/sideband), which is available for Linux, Android and macOS.
+
 ## Notable Features
  - Encrypted messaging over packet-radio, LoRa, WiFi or anything else [Reticulum](https://github.com/markqvist/Reticulum) supports.
  - Zero-configuration, minimal-infrastructure mesh communication
@@ -24,11 +25,6 @@ Nomad Network does not need any connections to the public internet to work. In f
 ## Current Status
 The current version of the program should be considered a beta release. The program works well, but there will most probably be bugs and possibly sub-optimal performance in some scenarios. On the other hand, this is the ideal time to have an influence on the direction of the development of Nomad Network. To do so, join the discussion, report bugs and request features here on the GitHub project.
 
-### Feature roadmap
- - Network-wide propagated bulletins and discussion threads
- - Collaborative maps and geospatial information sharing
- - Facilitation of trade and barter
-
 ## How do I get started?
 The easiest way to install Nomad Network is via pip:
 
@@ -46,22 +42,27 @@ nomadnet --daemon
 nomadnet --help
 ```
 
-The first time the program is running, you will be presented with the guide section, which contains all the information you need to start using Nomad Network.
+**Please Note**: If this is the very first time you use pip to install a program on your system, you might need to reboot your system for the program to become available. If you get a "command not found" error or similar when running the program, reboot your system and try again.
+
+The first time the program is running, you will be presented with the **Guide section**, which contains all the information you need to start using Nomad Network.
 
 To use Nomad Network on packet radio or LoRa, you will need to configure your Reticulum installation to use any relevant packet radio TNCs or LoRa devices on your system. See the [Reticulum documentation](https://markqvist.github.io/Reticulum/manual/interfaces.html) for info. For a general introduction on how to set up such a system, take a look at [this post](https://unsigned.io/private-messaging-over-lora/).
 
-If you want to try Nomad Network without building your own physical network, you can connect to the [Unsigned.io RNS Testnet](https://github.com/markqvist/Reticulum#public-testnet) over the Internet, where there is already some Nomad Network and LXMF activity.
+If you want to try Nomad Network without building your own physical network, you can connect to the [Unsigned.io RNS Testnet](https://github.com/markqvist/Reticulum#public-testnet) over the Internet, where there is already some Nomad Network and LXMF activity. If you connect to the testnet, you can leave nomadnet running for a while and wait for it to receive announces from other nodes on the network that host pages or services, or you can try connecting directly to some nodes listed here:
 
-**Please Note**: If this is the very first time you use pip to install a program on your system, you might need to reboot your system for the program to become available. If you get a "command not found" error or similar when running the program, reboot your system and try again.
+ - `abb3ebcd03cb2388a838e70c001291f9` Dublin Hub Testnet Node
+ - `ea6a715f814bdc37e56f80c34da6ad51` Frankfurt Hub Testnet Node
+
+To browse pages on a node that is not currently known, open the URL dialog in the `Network` section of the program by pressing `Ctrl+U`, paste or enter the address and select `Go` or press enter. Nomadnet will attempt to discover and connect to the requested node.
 
 ### Install on Android
 You can install Nomad Network on Android using Termux, but there's a few more commands involved than the above one-liner. The process is documented in the [Android Installation](https://markqvist.github.io/Reticulum/manual/gettingstartedfast.html#reticulum-on-android) section of the Reticulum Manual. Once the Reticulum has been installed according to the linked documentation, Nomad Network can be installed as usual with pip.
 
-For a native Android application with a graphical user interface, have a look at [Sideband](https://unsigned.io/sideband).
+For a native Android application with a graphical user interface, have a look at [Sideband](https://github.com/markqvist/Sideband).
 
 ### Docker Images
 
-Nomad Network is automatically published as a docker image on Github Packages. Image tags are one of either `master` (for the very latest commit) or the version number (eg `0.1.8`) for a specific release.
+Nomad Network is automatically published as a docker image on Github Packages. Image tags are one of either `master` (for the very latest commit) or the version number (eg `0.2.0`) for a specific release.
 
 ```sh
 $ docker pull ghcr.io/markqvist/nomadnet:master
@@ -100,9 +101,7 @@ You can help support the continued development of open, free and private communi
 
 - Monero:
   ```
-  84FpY1QbxHcgdseePYNmhTHcrgMX4nFf
+  84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
-  BYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD1
-  9b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
   ```
 - Ethereum
   ```
@@ -114,6 +113,29 @@ You can help support the continued development of open, free and private communi
   ```
 - Ko-Fi: https://ko-fi.com/markqvist
 
+## Development Roadmap
+
+- New major features
+    - Network-wide propagated bulletins and discussion threads
+    - Collaborative maps and geospatial information sharing
+    - Facilitation of trade and barter
+- Minor improvements and fixes
+    - Link status (RSSI and SNR) in conversation or conv list
+    - Ctrl-M shorcut for jumping to menu
+    - Share node with other users / send node info to user
+    - Fix internal editor failing on some OSes with no "editor" alias
+    - Possibly add a required-width header
+    - Improve browser handling of remote link close
+    - Better navigation handling when requests fail (also because of closed links)
+    - Retry failed messages mechanism
+    - Re-arrange buttons to be more consistent
+    - Input field for pages
+    - Post mechanism
+    - Term compatibility notice in readme
+    - Selected icon in conversation list
+    - Possibly a Search Local Nodes function
+    - Possibly add via entry in node info box, next to distance
+
 ## Caveat Emptor
 Nomad Network is beta software, and should be considered as such. While it has been built with cryptography best-practices very foremost in mind, it _has not_ been externally security audited, and there could very well be privacy-breaking bugs. If you want to help out, or help sponsor an audit, please do get in touch.
 

nomadnet/Conversation.py

@@ -142,6 +142,9 @@ class Conversation:
 
         self.__changed_callback = None
 
+        if not RNS.Transport.has_path(bytes.fromhex(source_hash)):
+            RNS.Transport.request_path(bytes.fromhex(source_hash))
+
         self.source_identity = RNS.Identity.recall(bytes.fromhex(self.source_hash))
 
         if self.source_identity:
@@ -224,6 +227,35 @@ class Conversation:
             RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
             return False
 
+    def paper_output(self, content="", title=""):
+        if self.send_destination:
+            try:
+                dest = self.send_destination
+                source = self.app.lxmf_destination
+                desired_method = LXMF.LXMessage.PAPER
+
+                lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
+                qr_code = lxm.as_qr()
+                qr_tmp_path = self.app.tmpfilespath+"/"+str(RNS.hexrep(lxm.hash, delimit=False))
+                qr_code.save(qr_tmp_path)
+
+                print_result = self.app.print_file(qr_tmp_path)
+                os.unlink(qr_tmp_path)
+                
+                if print_result:
+                    message_path = Conversation.ingest(lxm, self.app, originator=True)
+                    self.messages.append(ConversationMessage(message_path))
+
+                return print_result
+
+            except Exception as e:
+                RNS.log("An error occurred while generating paper message, the contained exception was: "+str(e), RNS.LOG_ERROR)
+                return False
+
+        else:
+            RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
+            return False
+
     def message_notification(self, message):
         if message.state == LXMF.LXMessage.FAILED and hasattr(message, "try_propagation_on_fail") and message.try_propagation_on_fail:
             RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE)
@@ -239,10 +271,11 @@ class Conversation:
     def __str__(self):
         string = self.source_hash
 
-        if self.source_identity:
+        # TODO: Remove this
-            if self.source_identity.app_data:
+        # if self.source_identity:
-                # TODO: Sanitise for viewing
+        #     if self.source_identity.app_data:
-                string += " | "+self.source.source_identity.app_data.decode("utf-8")
+        #         # TODO: Sanitise for viewing, or just clean this
+        #         string += " | "+self.source_identity.app_data.decode("utf-8")
 
         return string
 

nomadnet/Directory.py

@@ -5,6 +5,29 @@ import time
 import nomadnet
 import RNS.vendor.umsgpack as msgpack
 
+class PNAnnounceHandler:
+    def __init__(self, owner):
+        self.aspect_filter = "lxmf.propagation"
+        self.owner = owner
+
+    def received_announce(self, destination_hash, announced_identity, app_data):
+        try:
+            if type(app_data) == bytes:
+                data = msgpack.unpackb(app_data)
+
+                if data[0] == True:
+                    RNS.log("Received active propagation node announce from "+RNS.prettyhexrep(destination_hash))
+
+                    associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
+                    associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", announced_identity)
+
+                    self.owner.app.directory.pn_announce_received(destination_hash, app_data, associated_peer, associated_node)
+                    self.owner.app.autoselect_propagation_node()
+
+        except Exception as e:
+            RNS.log("Error while evaluating propagation node announce, ignoring announce.", RNS.LOG_DEBUG)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
+
 class Directory:
     ANNOUNCE_STREAM_MAXLENGTH = 64
 
@@ -14,8 +37,6 @@ class Directory:
         app = nomadnet.NomadNetworkApp.get_shared_instance()
 
         if not destination_hash in app.ignored_list:
-            destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
-
             associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
 
             app.directory.node_announce_received(destination_hash, app_data, associated_peer)
@@ -31,6 +52,9 @@ class Directory:
         self.app = app
         self.load_from_disk()
 
+        self.pn_announce_handler = PNAnnounceHandler(self)
+        RNS.Transport.register_announce_handler(self.pn_announce_handler)
+
 
     def save_to_disk(self):
         try:
@@ -47,6 +71,7 @@ class Directory:
             file = open(self.app.directorypath, "wb")
             file.write(msgpack.packb(directory))
             file.close()
+
         except Exception as e:
             RNS.log("Could not write directory to disk. Then contained exception was: "+str(e), RNS.LOG_ERROR)
 
@@ -60,6 +85,7 @@ class Directory:
 
                 entries = {}
                 for e in unpacked_list:
+                        
                     if len(e) > 3:
                         hosts_node = e[3]
                     else:
@@ -88,7 +114,7 @@ class Directory:
     def lxmf_announce_received(self, source_hash, app_data):
         if app_data != None:
             timestamp = time.time()
-            self.announce_stream.insert(0, (timestamp, source_hash, app_data, False))
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer"))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
                 self.announce_stream.pop()
 
@@ -98,7 +124,7 @@ class Directory:
     def node_announce_received(self, source_hash, app_data, associated_peer):
         if app_data != None:
             timestamp = time.time()
-            self.announce_stream.insert(0, (timestamp, source_hash, app_data, True))
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node"))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
                 self.announce_stream.pop()
 
@@ -111,6 +137,27 @@ class Directory:
             if hasattr(self.app.ui, "main_display"):
                 self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
 
+    def pn_announce_received(self, source_hash, app_data, associated_peer, associated_node):
+        found_node = None
+        for sh in self.directory_entries:
+            if sh == associated_node:
+                found_node = True
+                break
+
+        for e in self.announce_stream:
+            if e[1] == associated_node:
+                found_node = True
+                break
+
+        if not found_node:
+            timestamp = time.time()
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "pn"))
+            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                self.announce_stream.pop()
+            
+            if hasattr(self.app.ui, "main_display"):
+                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+
     def remove_announce_with_timestamp(self, timestamp):
         selected_announce = None
         for announce in self.announce_stream:
@@ -132,7 +179,11 @@ class Directory:
             return "<"+RNS.hexrep(source_hash, delimit=False)+">"
         else:
             if source_hash in self.directory_entries:
-                return self.directory_entries[source_hash].display_name
+                dn = self.directory_entries[source_hash].display_name
+                if dn == None:
+                    return RNS.prettyhexrep(source_hash)
+                else:
+                    return dn
             else:
                 return "<"+RNS.hexrep(source_hash, delimit=False)+">"
 
@@ -174,6 +225,8 @@ class Directory:
                 node_entry = self.directory_entries[associated_node]
                 node_entry.trust_level = entry.trust_level
 
+        self.save_to_disk()
+
     def forget(self, source_hash):
         if source_hash in self.directory_entries:
             self.directory_entries.pop(source_hash)
@@ -243,8 +296,6 @@ class DirectoryEntry:
         if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
             self.source_hash  = source_hash
             self.display_name = display_name
-            if display_name  == None:
-                display_name  = source_hash
 
             if preferred_delivery == None:
                 self.preferred_delivery = DirectoryEntry.DIRECT

nomadnet/NomadNetworkApp.py

@@ -2,9 +2,11 @@ import os
 import io
 import sys
 import time
+import shlex
 import atexit
 import threading
 import traceback
+import subprocess
 import contextlib
 
 import RNS
@@ -12,6 +14,7 @@ import LXMF
 import nomadnet
 
 from nomadnet.Directory import DirectoryEntry
+from datetime import datetime
 
 import RNS.vendor.umsgpack as msgpack
 
@@ -22,16 +25,38 @@ class NomadNetworkApp:
     time_format      = "%Y-%m-%d %H:%M:%S"
     _shared_instance = None
 
-    configdir = os.path.expanduser("~")+"/.nomadnetwork"
+    userdir = os.path.expanduser("~")
+    if os.path.isdir("/etc/nomadnetwork") and os.path.isfile("/etc/nomadnetwork/config"):
+        configdir = "/etc/nomadnetwork"
+    elif os.path.isdir(userdir+"/.config/nomadnetwork") and os.path.isfile(userdir+"/.config/nomadnetwork/config"):
+        configdir = userdir+"/.config/nomadnetwork"
+    else:
+        configdir = userdir+"/.nomadnetwork"
 
     START_ANNOUNCE_DELAY = 3
 
     def exit_handler(self):
-        RNS.log("Nomad Network Client exit handler executing...", RNS.LOG_VERBOSE)
         self.should_run_jobs = False
 
         RNS.log("Saving directory...", RNS.LOG_VERBOSE)
         self.directory.save_to_disk()
+
+        if hasattr(self.ui, "restore_ixon"):
+            if self.ui.restore_ixon:
+                try:
+                    os.system("stty ixon")
+
+                except Exception as e:
+                    RNS.log("Could not restore flow control sequences. The contained exception was: "+str(e), RNS.LOG_WARNING)
+
+        if hasattr(self.ui, "restore_palette"):
+            if self.ui.restore_palette:
+                try:
+                    self.ui.screen.write("\x1b]104\x07")
+
+                except Exception as e:
+                    RNS.log("Could not restore terminal color palette. The contained exception was: "+str(e), RNS.LOG_WARNING)
+
         RNS.log("Nomad Network Client exiting now", RNS.LOG_VERBOSE)
 
     def exception_handler(self, e_type, e_value, e_traceback):
@@ -73,6 +98,7 @@ class NomadNetworkApp:
         self.ignoredpath       = self.configdir+"/ignored"
         self.logfilepath       = self.configdir+"/logfile"
         self.errorfilepath     = self.configdir+"/errors"
+        self.pnannouncedpath   = self.configdir+"/pnannounced"
         self.storagepath       = self.configdir+"/storage"
         self.identitypath      = self.configdir+"/storage/identity"
         self.cachepath         = self.configdir+"/storage/cache"
@@ -80,6 +106,7 @@ class NomadNetworkApp:
         self.conversationpath  = self.configdir+"/storage/conversations"
         self.directorypath     = self.configdir+"/storage/directory"
         self.peersettingspath  = self.configdir+"/storage/peersettings"
+        self.tmpfilespath      = self.configdir+"/storage/tmp"
 
         self.pagespath         = self.configdir+"/storage/pages"
         self.filespath         = self.configdir+"/storage/files"
@@ -120,6 +147,11 @@ class NomadNetworkApp:
         if not os.path.isdir(self.cachepath):
             os.makedirs(self.cachepath)
 
+        if not os.path.isdir(self.tmpfilespath):
+            os.makedirs(self.tmpfilespath)
+        else:
+            self.clear_tmp_dir()
+
         if os.path.isfile(self.configpath):
             try:
                 self.config = ConfigObj(self.configpath)
@@ -231,7 +263,7 @@ class NomadNetworkApp:
                             RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
 
             except Exception as e:
-                RNS.log("Error while fetching loading list of ignored destinations: "+str(e), RNS.LOG_ERROR)
+                RNS.log("Error while loading list of ignored destinations: "+str(e), RNS.LOG_ERROR)
 
         self.directory = nomadnet.Directory(self)
 
@@ -254,7 +286,7 @@ class NomadNetworkApp:
         RNS.log("LXMF Router ready to receive on: "+RNS.prettyhexrep(self.lxmf_destination.hash))
 
         if self.enable_node:
-            self.message_router.set_message_storage_limit(gigabytes=self.message_storage_limit)
+            self.message_router.set_message_storage_limit(megabytes=self.message_storage_limit)
             for dest_str in self.prioritised_lxmf_destinations:
                 try:
                     dest_hash = bytes.fromhex(dest_str)
@@ -265,11 +297,24 @@ class NomadNetworkApp:
                     RNS.log("Cannot prioritise "+str(dest_str)+", it is not a valid destination hash", RNS.LOG_ERROR)
 
             self.message_router.enable_propagation()
+            try:
+                with open(self.pnannouncedpath, "wb") as pnf:
+                    pnf.write(msgpack.packb(time.time()))
+                    pnf.close()
+            except Exception as e:
+                RNS.log("An error ocurred while writing Propagation Node announce timestamp. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
             RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash))
             self.node = nomadnet.Node(self)
         else:
             self.node = None
+            if os.path.isfile(self.pnannouncedpath):
+                try:
+                    RNS.log("Sending indication to peered LXMF Propagation Node that this node is no longer participating", RNS.LOG_DEBUG)
+                    self.message_router.disable_propagation()
+                    os.unlink(self.pnannouncedpath)
+                except Exception as e:
+                    RNS.log("An error ocurred while indicating that this LXMF Propagation Node is no longer participating. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
         RNS.Transport.register_announce_handler(nomadnet.Conversation)
         RNS.Transport.register_announce_handler(nomadnet.Directory)
@@ -374,13 +419,13 @@ class NomadNetworkApp:
         if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE:
             return False
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_PATH_REQUESTED:
-            return True
+            return False
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHING:
-            return True
+            return False
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHED:
-            return True
+            return False
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_REQUEST_SENT:
-            return True
+            return False
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RECEIVING:
             return True
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_RECEIVED:
@@ -411,8 +456,9 @@ class NomadNetworkApp:
     def autoselect_propagation_node(self):
         selected_node = None
 
-        if "propagation_node" in self.peer_settings and self.directory.find(self.peer_settings["propagation_node"]):
+        if "propagation_node" in self.peer_settings:
-            selected_node = self.directory.find(self.peer_settings["propagation_node"])
+            selected_node = self.peer_settings["propagation_node"]
+        
         else:
             nodes = self.directory.known_nodes()
             trusted_nodes = []
@@ -425,19 +471,14 @@ class NomadNetworkApp:
 
                     if hops < best_hops:
                         best_hops = hops
-                        selected_node = node
+                        selected_node = node.source_hash
 
         if selected_node == None:
-            RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network.", RNS.LOG_WARNING)
+            RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network, or a propagation node is manually selected.", RNS.LOG_WARNING)
         else:
-            node_identity = RNS.Identity.recall(selected_node.source_hash)
+            pn_name_str = ""
-            if node_identity != None:
+            RNS.log("Selecting "+RNS.prettyhexrep(selected_node)+pn_name_str+" as default LXMF propagation node", RNS.LOG_INFO)
-                propagation_hash = RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_identity)
+            self.message_router.set_outbound_propagation_node(selected_node)
-                RNS.log("Selecting "+selected_node.display_name+" "+RNS.prettyhexrep(propagation_hash)+" as default LXMF propagation node", RNS.LOG_INFO)
-                self.message_router.set_outbound_propagation_node(propagation_hash)
-            else:
-                RNS.log("Could not recall identity for autoselected LXMF propagation node "+RNS.prettyhexrep(selected_node.source_hash), RNS.LOG_WARNING)
-                RNS.log("LXMF propagation will not be available until a trusted node announces on the network.", RNS.LOG_WARNING)
 
     def get_user_selected_propagation_node(self):
         if "propagation_node" in self.peer_settings:
@@ -471,6 +512,88 @@ class NomadNetworkApp:
 
         nomadnet.Conversation.ingest(message, self)
 
+        if self.should_print(message):
+            self.print_message(message)
+
+    def should_print(self, message):
+        if self.print_messages:
+            if self.print_all_messages:
+                return True
+            
+            else:
+                source_hash_text = RNS.hexrep(message.source_hash, delimit=False)
+
+                if self.print_trusted_messages:
+                    trust_level = self.directory.trust_level(message.source_hash)
+                    if trust_level == DirectoryEntry.TRUSTED:
+                        return True
+
+                if type(self.allowed_message_print_destinations) is list:
+                    if source_hash_text in self.allowed_message_print_destinations:
+                        return True
+
+        return False
+
+    def print_file(self, filename):
+        print_command = self.print_command+" "+filename
+
+        try:
+            return_code = subprocess.call(shlex.split(print_command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+        except Exception as e:
+            RNS.log("An error occurred while executing print command: "+str(print_command), RNS.LOG_ERROR)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+            return False
+
+        if return_code == 0:
+            RNS.log("Successfully printed "+str(filename)+" using print command: "+print_command, RNS.LOG_DEBUG)
+            return True
+
+        else:
+            RNS.log("Printing "+str(filename)+" failed using print command: "+print_command, RNS.LOG_DEBUG)
+            return False
+
+
+    def print_message(self, message, received = None):
+        try:
+            template = self.printing_template_msg
+
+            if received == None:
+                received = time.time()
+
+            g = self.ui.glyphs
+            
+            m_rtime = datetime.fromtimestamp(message.timestamp)
+            stime = m_rtime.strftime(self.time_format)
+
+            message_time = datetime.fromtimestamp(received)
+            rtime = message_time.strftime(self.time_format)
+
+            display_name = self.directory.simplest_display_str(message.source_hash)
+            title = message.title_as_string()
+            if title == "":
+                title = "None"
+
+            output = template.format(
+                origin=display_name,
+                stime=stime,
+                rtime=rtime,
+                mtitle=title,
+                mbody=message.content_as_string(),
+            )
+
+            filename = "/tmp/"+RNS.hexrep(RNS.Identity.full_hash(output.encode("utf-8")), delimit=False)
+            with open(filename, "wb") as f:
+                f.write(output.encode("utf-8"))
+                f.close()
+
+            self.print_file(filename)
+
+            os.unlink(filename)
+
+        except Exception as e:
+            RNS.log("Error while printing incoming LXMF message. The contained exception was: "+str(e))
+
     def conversations(self):
         return nomadnet.Conversation.conversation_list(self)
 
@@ -492,6 +615,12 @@ class NomadNetworkApp:
             if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"):
                 os.unlink(self.conversationpath + "/" + source_hash + "/unread")
 
+    def clear_tmp_dir(self):
+        if os.path.isdir(self.tmpfilespath):
+            for file in os.listdir(self.tmpfilespath):
+                fpath = self.tmpfilespath+"/"+file
+                os.unlink(fpath)
+
     def createDefaultConfig(self):
         self.config = ConfigObj(__default_nomadnet_config__)
         self.config.filename = self.configpath
@@ -670,13 +799,62 @@ class NomadNetworkApp:
                 self.prioritised_lxmf_destinations = []
 
             if not "message_storage_limit" in self.config["node"]:
-                self.message_storage_limit = 2
+                self.message_storage_limit = 2000
             else:
                 value = self.config["node"].as_float("message_storage_limit")
-                if value < 0.064:
+                if value < 0.005:
-                    value = 0.064
+                    value = 0.005
                 self.message_storage_limit = value
 
+        self.print_command = "lp"
+        self.print_messages = False
+        self.print_all_messages = False
+        self.print_trusted_messages = False
+        if "printing" in self.config:
+            if not "print_messages" in self.config["printing"]:
+                self.print_messages = False
+            else:
+                self.print_messages = self.config["printing"].as_bool("print_messages")
+
+                if "print_command" in self.config["printing"]:
+                    self.print_command = self.config["printing"]["print_command"]
+
+                if self.print_messages:
+                    if not "print_from" in self.config["printing"]:
+                        self.allowed_message_print_destinations = None
+                    else:
+                        if type(self.config["printing"]["print_from"]) == str:
+                            self.allowed_message_print_destinations = []
+                            if self.config["printing"]["print_from"].lower() == "everywhere":
+                                self.print_all_messages = True
+
+                            if self.config["printing"]["print_from"].lower() == "trusted":
+                                
+                                self.print_all_messages = False
+                                self.print_trusted_messages = True
+
+                            if len(self.config["printing"]["print_from"]) == (RNS.Identity.TRUNCATED_HASHLENGTH//8)*2:
+                                self.allowed_message_print_destinations.append(self.config["printing"]["print_from"])
+                        
+                        if type(self.config["printing"]["print_from"]) == list:
+                                self.allowed_message_print_destinations =  self.config["printing"].as_list("print_from")
+                                for allowed_entry in self.allowed_message_print_destinations:
+                                    if allowed_entry.lower() == "trusted":
+                                        self.print_trusted_messages = True
+
+
+                    if not "message_template" in self.config["printing"]:
+                        self.printing_template_msg = __printing_template_msg__
+                    else:
+                        mt_path = os.path.expanduser(self.config["printing"]["message_template"])
+                        if os.path.isfile(mt_path):
+                            template_file = open(mt_path, "rb")
+                            self.printing_template_msg = template_file.read().decode("utf-8")
+                        else:
+                            template_file = open(mt_path, "wb")
+                            template_file.write(__printing_template_msg__.encode("utf-8"))
+                            self.printing_template_msg = __printing_template_msg__
+
               
     @staticmethod
     def get_shared_instance():
@@ -808,14 +986,14 @@ announce_at_start = Yes
 
 # The maximum amount of storage to use for
 # the LXMF Propagation Node message store,
-# specified in gigabytes. When this limit
+# specified in megabytes. When this limit
 # is reached, LXMF will periodically remove
 # messages in its message store. By default,
 # LXMF prioritises keeping messages that are
 # new and small. Large and old messages will
 # be removed first. This setting is optional
 # and defaults to 2 gigabytes.
-# message_storage_limit = 2
+# message_storage_limit = 2000
 
 # You can tell the LXMF message router to
 # prioritise storage for one or more
@@ -824,6 +1002,62 @@ announce_at_start = Yes
 # keeping messages for destinations specified
 # with this option. This setting is optional,
 # and generally you do not need to use it.
-# prioritise_destinations = 10bc7624c27032a18639, ba780a6dff4cc1391db8
+# prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf
 
-'''.splitlines()
+[printing]
+
+# You can configure Nomad Network to print
+# various kinds of information and messages.
+
+# Printing messages is disabled by default
+print_messages = No
+
+# You can configure a custom template for
+# message printing. If you uncomment this
+# option, set a path to the template and
+# restart Nomad Network, a default template
+# will be created that you can edit.
+# message_template = ~/.nomadnetwork/print_template_msg.txt
+
+# You can configure Nomad Network to only
+# print messages from trusted destinations.
+# print_from = trusted
+
+# Or specify the source LXMF addresses that
+# will automatically have messages printed
+# on arrival.
+# print_from = 76fe5751a56067d1e84eef3e88eab85b, 0e70b5848eb57c13154154feaeeb89b7
+
+# Or allow printing from anywhere, if you
+# are feeling brave and adventurous.
+# print_from = everywhere
+
+# You can configure the printing command.
+# This will use the default CUPS printer on
+# your system.
+print_command = lp
+
+# You can specify what printer to use
+# print_command = lp -d PRINTER_NAME
+
+# Or specify more advanced options. This
+# example works well for small thermal-
+# roll printers.
+# print_command = lp -d PRINTER_NAME -o cpi=16 -o lpi=8
+
+# This one is more suitable for full-sheet
+# printers.
+# print_command = lp -d PRINTER_NAME -o page-left=36 -o page-top=36 -o page-right=36 -o page-bottom=36
+
+'''.splitlines()
+
+__printing_template_msg__ = """
+---------------------------
+From: {origin}
+Sent: {stime}
+Rcvd: {rtime}
+Title: {mtitle}
+
+{mbody}
+---------------------------
+"""

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.1.9"
+__version__ = "0.3.0"

nomadnet/ui/TextUI.py

@@ -121,12 +121,29 @@ GLYPHS = {
     ("decoration_menu", " +",        " +",          " \uf93a"),
     ("unread_menu",     " !",        " \u2709",     urm_char),
     ("globe",           "",          "",            "\uf484"),
-    ("sent",            "/\\",       "\u2191",      "\ufbf4")
+    ("sent",            "/\\",       "\u2191",      "\ufbf4"),
+    ("papermsg",        "P",         "\u25a4",      "\uf719"),
+    ("qrcode",          "QR",        "\u25a4",      "\uf029"),
 }
 
 class TextUI:
 
     def __init__(self):
+        self.restore_ixon = False
+
+        try:
+            rval = os.system("stty -a | grep \"\\-ixon\"")
+            if rval == 0:
+                pass
+
+            else:
+                os.system("stty -ixon")
+                self.restore_ixon = True
+
+        except Exception as e:
+            RNS.log("Could not configure terminal flow control sequences, some keybindings may not work.", RNS.LOG_WARNING)
+            RNS.log("The contained exception was: "+str(e))
+
         self.app = NomadNetworkApp.get_shared_instance()
         self.app.ui = self
         self.loop = None
@@ -164,7 +181,7 @@ class TextUI:
         else:
             initial_widget = self.main_display.widget
 
-        self.loop = urwid.MainLoop(initial_widget, screen=self.screen, handle_mouse=mouse_enabled)
+        self.loop = urwid.MainLoop(initial_widget, unhandled_input=self.unhandled_input, screen=self.screen, handle_mouse=mouse_enabled)
 
         if intro_timeout > 0:
             self.loop.set_alarm_in(intro_timeout, self.display_main)
@@ -192,7 +209,14 @@ class TextUI:
     def set_colormode(self, colormode):
         self.colormode = colormode
         self.screen.set_terminal_properties(colormode)
-        self.screen.reset_default_terminal_palette()
+        
+        if self.colormode < 256:
+            self.screen.reset_default_terminal_palette()
+            self.restore_palette = True
+
+    def unhandled_input(self, key):
+        if key == "ctrl q":
+            raise urwid.ExitMainLoop
 
     def display_main(self, loop, user_data):
         self.loop.widget = self.main_display.widget

nomadnet/ui/textui/Browser.py

@@ -6,6 +6,7 @@ import nomadnet
 import subprocess
 import threading
 from .MicronParser import markup_to_attrmaps
+from nomadnet.Directory import DirectoryEntry
 from nomadnet.vendor.Scrollable import *
 
 class BrowserFrame(urwid.Frame):
@@ -20,6 +21,10 @@ class BrowserFrame(urwid.Frame):
             self.delegate.reload()
         elif key == "ctrl u":
             self.delegate.url_dialog()
+        elif key == "ctrl s":
+            self.delegate.save_node_dialog()
+        elif key == "ctrl g":
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.network_display.toggle_fullscreen()
         elif self.get_focus() == "body":
             return super(BrowserFrame, self).keypress(size, key)
             # if key == "up" and self.delegate.messagelist.top_is_visible:
@@ -128,17 +133,82 @@ class Browser:
             self.browser_footer = urwid.AttrMap(urwid.Pile([urwid.Divider(self.g["divider1"]), urwid.Text("Link to: "+str(link_target))]), "browser_controls")
             self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
 
-    def handle_link(self, link_target):
+    def expand_shorthands(self, destination_type):
-        if self.status >= Browser.DISCONECTED:
+        if destination_type == "nnn":
-            RNS.log("Browser handling link to: "+str(link_target), RNS.LOG_DEBUG)
+            return "nomadnetwork.node"
-            try:
+        elif destination_type == "lxmf":
-                self.retrieve_url(link_target)
+            return "lxmf.delivery"
-            except Exception as e:
-                self.browser_footer = urwid.Text("Could not open link: "+str(e))
-                self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
         else:
-            RNS.log("Browser aleady hadling link, cannot handle link to: "+str(link_target), RNS.LOG_DEBUG)
+            return destination_type
 
+    def handle_link(self, link_target):
+        components = link_target.split("@")
+        destination_type = None
+
+        if len(components) == 2:
+            destination_type = self.expand_shorthands(components[0])
+            link_target = components[1]
+        else:
+            destination_type = "nomadnetwork.node"
+            link_target = components[0]
+
+        if destination_type == "nomadnetwork.node":
+            if self.status >= Browser.DISCONECTED:
+                RNS.log("Browser handling link to: "+str(link_target), RNS.LOG_DEBUG)
+                try:
+                    self.retrieve_url(link_target)
+                except Exception as e:
+                    self.browser_footer = urwid.Text("Could not open link: "+str(e))
+                    self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
+            else:
+                RNS.log("Browser already handling link, cannot handle link to: "+str(link_target), RNS.LOG_DEBUG)
+
+        elif destination_type == "lxmf.delivery":
+            RNS.log("Passing LXMF link to handler", RNS.LOG_DEBUG)
+            self.handle_lxmf_link(link_target)
+
+        else:
+            RNS.log("No known handler for destination type "+str(destination_type), RNS.LOG_DEBUG)
+            self.browser_footer = urwid.Text("Could not open link: "+"No known handler for destination type "+str(destination_type))
+            self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
+
+    def handle_lxmf_link(self, link_target):
+        try:
+            if not type(link_target) is str:
+                raise ValueError("Invalid data type for LXMF link")
+
+            if len(link_target) != (RNS.Reticulum.TRUNCATED_HASHLENGTH//8)*2:
+                raise ValueError("Invalid length for LXMF link")
+
+            try:
+                bytes.fromhex(link_target)
+
+            except Exception as e:
+                raise ValueError("Could not decode destination hash from LXMF link")
+
+            existing_conversations = nomadnet.Conversation.conversation_list(self.app)
+            
+            source_hash_text = link_target
+            display_name_data = RNS.Identity.recall_app_data(bytes.fromhex(source_hash_text))
+
+            display_name = None
+            if display_name_data != None:
+                display_name = display_name_data.decode("utf-8")
+
+            if not source_hash_text in [c[0] for c in existing_conversations]:
+                entry = DirectoryEntry(bytes.fromhex(source_hash_text), display_name=display_name)
+                self.app.directory.remember(entry)
+
+                new_conversation = nomadnet.Conversation(source_hash_text, nomadnet.NomadNetworkApp.get_shared_instance(), initiator=True)
+                self.app.ui.main_display.sub_displays.conversations_display.update_conversation_list()
+
+            self.app.ui.main_display.sub_displays.conversations_display.display_conversation(None, source_hash_text)
+            self.app.ui.main_display.show_conversations(None)
+
+        except Exception as e:
+            RNS.log("Error while starting conversation from link. The contained exception was: "+str(e), RNS.LOG_ERROR)
+            self.browser_footer = urwid.Text("Could not open LXMF link: "+str(e))
+            self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
 
 
     def micron_released_focus(self):
@@ -279,7 +349,7 @@ class Browser:
 
         components = url.split(":")
         if len(components) == 1:
-            if len(components[0]) == 20:
+            if len(components[0]) == (RNS.Reticulum.TRUNCATED_HASHLENGTH//8)*2:
                 try:
                     destination_hash = bytes.fromhex(components[0])
                 except Exception as e:
@@ -288,7 +358,7 @@ class Browser:
             else:
                 raise ValueError("Malformed URL")
         elif len(components) == 2:
-            if len(components[0]) == 20:
+            if len(components[0]) == (RNS.Reticulum.TRUNCATED_HASHLENGTH//8)*2:
                 try:
                     destination_hash = bytes.fromhex(components[0])
                 except Exception as e:
@@ -481,7 +551,12 @@ class Browser:
             self.close_dialogs()
 
         def confirmed(sender):
-            self.retrieve_url(e_url.get_edit_text())
+            try:
+                self.retrieve_url(e_url.get_edit_text())
+            except Exception as e:
+                self.browser_footer = urwid.Text("Could not open link: "+str(e))
+                self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
+
             self.close_dialogs()
 
         dialog = UrlDialogLineBox(
@@ -501,6 +576,40 @@ class Browser:
         self.delegate.columns.contents[1] = (overlay, options)
         self.delegate.columns.focus_position = 1
 
+    def save_node_dialog(self):
+        def dismiss_dialog(sender):
+            self.close_dialogs()
+
+        display_name = RNS.Identity.recall_app_data(self.destination_hash)
+        disp_str = ""
+        if display_name != None:
+            display_name = display_name.decode("utf-8")
+            disp_str = " \""+display_name+"\""
+            
+        def confirmed(sender):
+            node_entry = DirectoryEntry(self.destination_hash, display_name=display_name, hosts_node=True)
+            self.app.directory.remember(node_entry)
+            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+
+            self.close_dialogs()
+
+        dialog = UrlDialogLineBox(
+            urwid.Pile([
+                urwid.Text("Save connected node"+disp_str+" "+RNS.prettyhexrep(self.destination_hash)+" to Known Nodes?\n"),
+                urwid.Columns([("weight", 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Save", on_press=confirmed))])
+            ]), title="Save Node"
+        )
+
+        dialog.confirmed = confirmed
+        dialog.delegate = self
+        bottom = self.display_widget
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 50), valign="middle", height="pack", left=2, right=2)
+
+        options = self.delegate.columns.options("weight", self.delegate.right_area_width)
+        self.delegate.columns.contents[1] = (overlay, options)
+        self.delegate.columns.focus_position = 1
+
 
     def load_page(self):
         cached = self.get_cached(self.current_url())

nomadnet/ui/textui/Conversations.py

@@ -14,13 +14,13 @@ class ConversationListDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[Enter] Open  [C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New  [C-u] Ingest URI  [C-g] Fullscreen"), "shortcutbar")
 
 class ConversationDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-k] Clear  [C-w] Close  [C-t] Title  [C-p] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-p] Paper Msg  [C-t] Title  [C-k] Clear  [C-w] Close  [C-u] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
 
 class ConversationsArea(urwid.LineBox):
     def keypress(self, size, key):
@@ -30,8 +30,12 @@ class ConversationsArea(urwid.LineBox):
             self.delegate.delete_selected_conversation()
         elif key == "ctrl n":
             self.delegate.new_conversation()
+        elif key == "ctrl u":
+            self.delegate.ingest_lxm_uri()
         elif key == "ctrl r":
             self.delegate.sync_conversations()
+        elif key == "ctrl g":
+            self.delegate.toggle_fullscreen()
         elif key == "tab":
             self.delegate.app.ui.main_display.frame.set_focus("header")
         elif key == "up" and (self.delegate.ilb.first_item_is_selected() or self.delegate.ilb.body_is_empty()):
@@ -48,6 +52,7 @@ class DialogLineBox(urwid.LineBox):
 
 class ConversationsDisplay():
     list_width = 0.33
+    given_list_width = 52
     cached_conversation_widgets = {}
 
     def __init__(self, app):
@@ -64,8 +69,10 @@ class ConversationsDisplay():
 
         self.columns_widget = urwid.Columns(
             [
-                ("weight", ConversationsDisplay.list_width, self.listbox),
+                # ("weight", ConversationsDisplay.list_width, self.listbox),
-                ("weight", 1-ConversationsDisplay.list_width, self.make_conversation_widget(None))
+                # ("weight", 1-ConversationsDisplay.list_width, self.make_conversation_widget(None))
+                (ConversationsDisplay.given_list_width, self.listbox),
+                ("weight", 1, self.make_conversation_widget(None))
             ],
             dividechars=0, focus_column=0, box_columns=[0]
         )
@@ -126,7 +133,8 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def edit_selected_in_directory(self):
@@ -226,7 +234,7 @@ class ConversationsDisplay():
                     (urwid.Button("OK", on_press=dismiss_dialog), options)
                 ]
             query_button = urwid.Button("Query network for keys", on_press=query_action, user_data=source_hash_text)
-            known_section = urwid.Pile([urwid.Divider(g["divider1"]), urwid.Text(g["info"]+"\n", align="center"), urwid.Text("The identity of this peer is not known, and you cannot currently communicate.\n", align="center"), query_button, urwid.Divider(g["divider1"])])
+            known_section = urwid.Pile([urwid.Divider(g["divider1"]), urwid.Text(g["info"]+"\n", align="center"), urwid.Text("The identity of this peer is not known, and you cannot currently send messages to it. You can query the network to obtain the identity.\n", align="center"), query_button, urwid.Divider(g["divider1"])])
 
         dialog_pile = urwid.Pile([
             selected_id_widget,
@@ -249,7 +257,8 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def new_conversation(self):
@@ -287,6 +296,7 @@ class ConversationsDisplay():
                     self.app.directory.remember(entry)
 
                     new_conversation = nomadnet.Conversation(source_hash_text, nomadnet.NomadNetworkApp.get_shared_instance(), initiator=True)
+
                     self.update_conversation_list()
 
                 self.display_conversation(source_hash_text)
@@ -318,7 +328,112 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+        self.columns_widget.contents[0] = (overlay, options)
+
+    def ingest_lxm_uri(self):
+        self.dialog_open = True
+        lxm_uri = ""
+        e_uri = urwid.Edit(caption="URI : ",edit_text=lxm_uri)
+
+        def dismiss_dialog(sender):
+            self.update_conversation_list()
+            self.dialog_open = False
+
+        def confirmed(sender):
+            try:
+                local_delivery_signal = "local_delivery_occurred"
+                duplicate_signal = "duplicate_lxm"
+                lxm_uri = e_uri.get_edit_text()
+
+                ingest_result = self.app.message_router.ingest_lxm_uri(
+                    lxm_uri,
+                    signal_local_delivery=local_delivery_signal,
+                    signal_duplicate=duplicate_signal
+                )
+
+                if ingest_result == False:
+                    raise ValueError("The URI contained no decodable messages")
+                
+                elif ingest_result == local_delivery_signal:
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text("Message was decoded, decrypted successfully, and added to your conversation list."),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+                
+                elif ingest_result == duplicate_signal:
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text("The decoded message has already been processed by the LXMF Router, and will not be ingested again."),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+                
+                else:
+                    if self.app.enable_node:
+                        propagation_text = "The decoded message was not addressed to this LXMF address, but has been added to the propagation node queues, and will be distributed on the propagation network."
+                    else:
+                        propagation_text = "The decoded message was not addressed to this LXMF address, and has been discarded."
+
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text(propagation_text),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+
+            except Exception as e:
+                RNS.log("Could not ingest LXM URI. The contained exception was: "+str(e), RNS.LOG_VERBOSE)
+                if not dialog_pile.error_display:
+                    dialog_pile.error_display = True
+                    options = dialog_pile.options(height_type="pack")
+                    dialog_pile.contents.append((urwid.Text(""), options))
+                    dialog_pile.contents.append((urwid.Text(("error_text", "Could ingest LXM from URI data. Check your input."), align="center"), options))
+
+        dialog_pile = urwid.Pile([
+            e_uri,
+            urwid.Text(""),
+            urwid.Columns([("weight", 0.45, urwid.Button("Ingest", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Back", on_press=dismiss_dialog))])
+        ])
+        dialog_pile.error_display = False
+
+        dialog = DialogLineBox(dialog_pile, title="Ingest message URI")
+        dialog.delegate = self
+        bottom = self.listbox
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def delete_conversation(self, source_hash):
@@ -326,6 +441,15 @@ class ConversationsDisplay():
             conversation = ConversationsDisplay.cached_conversation_widgets[source_hash]
             self.close_conversation(conversation)
 
+    def toggle_fullscreen(self):
+        if ConversationsDisplay.given_list_width != 0:
+            self.saved_list_width = ConversationsDisplay.given_list_width
+            ConversationsDisplay.given_list_width = 0
+        else:
+            ConversationsDisplay.given_list_width = self.saved_list_width
+
+        self.update_conversation_list()
+
     def sync_conversations(self):
         g = self.app.ui.glyphs
         self.dialog_open = True
@@ -380,10 +504,15 @@ class ConversationsDisplay():
         if pn_ident != None:
             node_hash = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", pn_ident)
             pn_entry = self.app.directory.find(node_hash)
+            pn_display_str = " "
+            if pn_entry != None:
+                pn_display_str += " "+str(pn_entry.display_name)
+            else:
+                pn_display_str += " "+RNS.prettyhexrep(pn_hash)
 
             dialog = DialogLineBox(
                 urwid.Pile([
-                    urwid.Text(""+g["node"]+" "+str(pn_entry.display_name), align="center"),
+                    urwid.Text(""+g["node"]+pn_display_str, align="center"),
                     urwid.Divider(g["divider1"]),
                     sync_progress,
                     urwid.Divider(g["divider1"]),
@@ -398,7 +527,8 @@ class ConversationsDisplay():
             dialog = DialogLineBox(
                 urwid.Pile([
                     urwid.Text(""),
-                    urwid.Text("No trusted nodes found, cannot sync", align="center"),
+                    urwid.Text("No trusted nodes found, cannot sync!\n", align="center"),
+                    urwid.Text("To syncronise messages from the network, one or more nodes must be marked as trusted in the Known Nodes list, or a node must manually be selected as the default propagation node. Nomad Network will then automatically sync from the nearest trusted node, or the manually selected one.", align="left"),
                     urwid.Text(""),
                     button_columns
                 ]), title="Message Sync"
@@ -416,7 +546,8 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def update_sync_dialog(self, loop = None, sender = None):
@@ -437,7 +568,8 @@ class ConversationsDisplay():
     def update_conversation_list(self):
         ilb_position = self.ilb.get_selected_position()
         self.update_listbox()
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         if not (self.dialog_open and self.sync_dialog != None):
             self.columns_widget.contents[0] = (self.listbox, options)
         else:
@@ -468,7 +600,8 @@ class ConversationsDisplay():
                 self.app.mark_conversation_read(self.currently_displayed_conversation)
 
         self.currently_displayed_conversation = source_hash
-        options = self.widget.options("weight", 1-ConversationsDisplay.list_width)
+        # options = self.widget.options("weight", 1-ConversationsDisplay.list_width)
+        options = self.widget.options("weight", 1)
         self.widget.contents[1] = (self.make_conversation_widget(source_hash), options)
         if source_hash == None:
             self.widget.set_focus_column(0)
@@ -609,6 +742,8 @@ class MessageEdit(urwid.Edit):
     def keypress(self, size, key):
         if key == "ctrl d":
             self.delegate.send_message()
+        elif key == "ctrl p":
+            self.delegate.paper_message()
         elif key == "ctrl k":
             self.delegate.clear_editor()
         elif key == "up":
@@ -753,7 +888,7 @@ class ConversationWidget(urwid.WidgetWrap):
             if allowed:
                 self.frame.contents["footer"] = (self.minimal_editor, None)
             else:
-                warning = urwid.AttrMap(urwid.Padding(urwid.Text(g["info"]+" You cannot currently communicate with this peer, since it's identity keys are not known", align="center")), "msg_header_caution")
+                warning = urwid.AttrMap(urwid.Padding(urwid.Text("\n"+g["info"]+"\n\nYou cannot currently message this peer, since it's identity keys are not known.\n\nWait for an announce to arrive from the peer, or query the network for it.\n\nTo query the network, select this conversation in the conversation list, press Ctrl-E, and use the query button.\n", align="center")), "msg_header_caution")
                 self.frame.contents["footer"] = (warning, None)
 
     def toggle_focus_area(self):
@@ -773,13 +908,15 @@ class ConversationWidget(urwid.WidgetWrap):
             self.toggle_focus_area()
         elif key == "ctrl w":
             self.close()
-        elif key == "ctrl p":
+        elif key == "ctrl u":
             self.conversation.purge_failed()
             self.conversation_changed(None)
         elif key == "ctrl t":
             self.toggle_editor()
         elif key == "ctrl x":
             self.clear_history_dialog()
+        elif key == "ctrl g":
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.conversations_display.toggle_fullscreen()
         elif key == "ctrl o":
             self.sort_by_timestamp ^= True
             self.conversation_changed(None)
@@ -831,6 +968,34 @@ class ConversationWidget(urwid.WidgetWrap):
             else:
                 pass
 
+    def paper_message(self):
+        content = self.content_editor.get_edit_text()
+        title = self.title_editor.get_edit_text()
+        if not content == "":
+            if self.conversation.paper_output(content, title):
+                self.clear_editor()
+            else:
+                self.paper_message_failed()
+
+    def paper_message_failed(self):
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.conversation_changed(None)
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("Could not output paper message,\ncheck your settings. See the log\nfile for any error messages.\n", align="center"),
+                urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+            ]), title="!"
+        )
+        dialog.delegate = self
+        bottom = self.messagelist
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=34, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+
     def close(self):
         self.delegate.close_conversation(self)
 
@@ -861,6 +1026,9 @@ class LXMessageWidget(urwid.WidgetWrap):
             elif message.lxm.method == LXMF.LXMessage.PROPAGATED and message.lxm.state == LXMF.LXMessage.SENT:
                 header_style = "msg_header_propagated"
                 title_string = g["sent"]+" "+title_string
+            elif message.lxm.method == LXMF.LXMessage.PAPER and message.lxm.state == LXMF.LXMessage.PAPER:
+                header_style = "msg_header_propagated"
+                title_string = g["papermsg"]+" "+title_string
             elif message.lxm.state == LXMF.LXMessage.SENT:
                 header_style = "msg_header_sent"
                 title_string = g["sent"]+" "+title_string

nomadnet/ui/textui/Extras.py

@@ -17,45 +17,3 @@ class IntroDisplay():
 
         self.widget = urwid.Filler(intro)
 
-
-class DemoDisplay():
-    def __init__(self, ui, app):
-        import urwid
-
-        def color_mono(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_MONO)
-
-        def color_16(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_16)
-
-        def color_88(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_88)
-
-        def color_8bit(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_256)
-
-        def color_true(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_TRUE)
-
-        # pile = urwid.Pile([
-        #     urwid.Text(("heading", "This is a heading")),
-        #     urwid.Text(("body_text", "Hello World \U0001F332")),
-        #     urwid.Button(("buttons", "Monochrome"), color_mono),
-        #     urwid.Button(("buttons", "16 color"), color_16),
-        #     urwid.Button(("buttons", "88 color"), color_88),
-        #     urwid.Button(("buttons", "256 color"), color_8bit),
-        #     urwid.Button(("buttons", "True color"), color_true),
-        # ])
-
-        gf = urwid.GridFlow([
-            urwid.Text(("heading", "This is a heading")),
-            urwid.Text(("body_text", "Hello World \U0001F332")),
-            urwid.Button(("buttons", "Monochrome"), color_mono),
-            urwid.Button(("buttons", "16 color"), color_16),
-            urwid.Button(("buttons", "88 color"), color_88),
-            urwid.Button(("buttons", "256 color"), color_8bit),
-            urwid.Button(("buttons", "True color"), color_true),
-        ], cell_width=20, h_sep=0, v_sep=0, align="left")
-
-        self.widget = urwid.Filler(urwid.Padding((urwid.Text("Test"),urwid.Text("Test 2"))), 'top')
-        #self.widget = urwid.Filler(pile, 'top')

nomadnet/ui/textui/Guide.py

@@ -111,6 +111,7 @@ class TopicList(urwid.WidgetWrap):
             GuideEntry(self.app, self, guide_display, "Concepts & Terminology"),
             GuideEntry(self.app, self, guide_display, "Hosting a Node"),
             GuideEntry(self.app, self, guide_display, "Configuration Options"),
+            GuideEntry(self.app, self, guide_display, "Keyboard Shortcuts"),
             GuideEntry(self.app, self, guide_display, "Markup"),
             self.first_run_entry,
             GuideEntry(self.app, self, guide_display, "Network Configuration"),
@@ -194,6 +195,48 @@ The current version of the program should be considered a beta release. The prog
 
 '''
 
+TOPIC_SHORTCUTS = '''>Keyboard Shortcuts
+
+The different sections of the program has a number of keyboard shortcuts mapped, that makes operating and navigating the program easier. The following lists details all mapped shortcuts.
+
+>>`!Conversations Window`!
+>>>Conversation List
+ - Ctrl-N   Start a new conversation
+ - Ctrl-E   Display and edit selected peer info
+ - Ctrl-X   Delete conversation
+ - Ctrl-R   Open LXMF syncronisation dialog
+
+>>>Conversation Display
+ - Ctrl-D   Send message
+ - Ctrl-K   Clear input fields
+ - Ctrl-T   Toggle message title field
+ - Ctrl-O   Toggle sort mode
+ - Ctrl-P   Purge failed messages
+ - Ctrl-X   Clear conversation history
+ - Ctrl-G   Toggle fullscreen conversation
+ - Ctrl-W   Close conversation
+
+>>`!Network Window`!
+>>>Announce Stream
+ - Ctrl-L   Switch to Known Nodes list
+ - Ctrl-X   Delete selected announce
+ - Ctrl-P   Display peered LXMF Propagation Nodes
+
+>>>Known Nodes
+ - Ctrl-L   Switch to Announce Stream
+ - Ctrl-X   Delete selected node entry
+ - Ctrl-P   Display peered LXMF Propagation Nodes
+
+>>>Browser
+ - Ctrl-D   Back
+ - Ctrl-F   Forward
+ - Ctrl-R   Reload page
+ - Ctrl-U   Open URL entry dialog
+ - Ctrl-S   Save connected node
+ - Ctrl-G   Toggle fullscreen browser window
+ - Ctrl-W   Disconnect from node
+'''
+
 TOPIC_CONCEPTS = '''>Concepts and Terminology
 
 The following section will briefly introduce various concepts and terms used in the program.
@@ -202,9 +245,9 @@ The following section will briefly introduce various concepts and terms used in
 
 A `*peer`* refers to another Nomad Network client, which will generally be operated by another person. But since Nomad Network is a general LXMF client, it could also be any other LXMF client, program, automated system or machine that can communicate over LXMF.
 
-All peers (and nodes) are identified by their `*address`* (which is, technically speaking, a Reticulum destination hash). An address consist of 20 hexadecimal characters, and looks like this:
+All peers (and nodes) are identified by their `*address`* (which is, technically speaking, a Reticulum destination hash). An address consist of 32 hexadecimal characters (16 bytes), and looks like this:
 
-`c<b8ea8f92541c9a275f0e>
+`c<e9eafceea9e3664a5c55611c5e8c420a>
 `l
 
 Anyone can choose whatever display name they want, but addresses are always unique, and generated from the unique cryptographic keys of the peer. This is an important point to understand. Since there is not anyone controlling naming or address spaces in Nomad Network, you can easily come across another user with the same display name as you.
@@ -229,13 +272,13 @@ In the `![ Conversations ]`! part of the program you can view and interact with
 
 By default, Nomad Network will attempt to deliver messages to a peer directly. This happens by first establishing an encrypted link directly to the peer, and then delivering the message over it.
 
-If the desired peer is not available because it has disconnected from the network, this method will obviously fail. In this case, Nomad Network will attempt to deliver the message to a node, which will store and forward it over the network, for later retrieval by the destination peer. The message is encrypted with an ephemeral key before being transmitted to the network, and is only readable by the intended recipient.
+If the desired peer is not available because it has disconnected from the network, this method will obviously fail. In this case, Nomad Network will attempt to deliver the message to a node, which will store and forward it over the network, for later retrieval by the destination peer. The message is encrypted before being transmitted to the network, and is only readable by the intended recipient.
 
 For propagated delivery to work, one or more nodes must be available on the network. If one or more trusted nodes are available, Nomad Network will automatically select the most suitable node to send the message via, but you can also manually specify what node to use.
 
 To select a node manually, go to the `![ Network ]`! part of the program, choose the desired node in the `*Known Nodes`* list, and select the `!< Info >`! button. In the `!Node Info`! dialog, you can specify the selected node as the default propagation node.
 
-By default, Nomad Network will check in with propagation nodes, and download any available messages every 6 hours. You can change this interval, or disable automatic synchronisation completely, by editing the configuration file.
+By default, Nomad Network will check in with propagation nodes, and download any available messages every 6 hours. You can change this interval, or disable automatic syncronisation completely, by editing the configuration file.
 
 You can always initiate a sync manually, by pressing `!Ctrl-R`! in the `![ Conversations ]`! part of the program, which will open the syncronisation window.
 
@@ -245,7 +288,7 @@ A Nomad Network `*node`* is an instance of the Nomad Network program that has be
 
 Nodes can host pages (similar to webpages) written in a markup-language called `*micron`*, as well as make files and other resources available for download for peers on the network. Nodes also form a distributed message store for offline users, and allows messages to be exchanged between peers that are not online at the same time.
 
-If no nodes exist on a network, all peers will still be able to communicate directly peer-to-peer, but both endpoints of a conversation will need to be available at the same time to converse. When nodes exist on the network, messages will be held and syncronised between nodes for deferred delivery if the destination peer is unavailable. Nodes will automatically discover and peer with each other, and handle synchronisation of message stores.
+If no nodes exist on a network, all peers will still be able to communicate directly peer-to-peer, but both endpoints of a conversation will need to be available at the same time to converse. When nodes exist on the network, messages will be held and syncronised between nodes for deferred delivery if the destination peer is unavailable. Nodes will automatically discover and peer with each other, and handle syncronisation of message stores.
 
 To learn how to host your own node, read the `*Hosting a Node`* section of this guide.
 
@@ -357,7 +400,15 @@ Now go out there and explore. This is still early days. See what you can find an
 
 TOPIC_CONFIG = '''>Configuration Options
 
-To change the configuration of Nomad Network, you must edit the configuration file. By default, this is located at `!~/.nomadnetwork/config`! on your system. You can open it in any text-editor, and change the options. You can also use the editor built in to this program, under the `![ Config ]`! menu item. The default configuration file contains comments on all the different configuration options present, and explains their possible settings.
+To change the configuration of Nomad Network, you must edit the configuration file. If you did not manually specify a config path when you started the program, Nomad Net will look for a configuration in the folllowing directories:
+
+  `!/etc/nomadnetwork`!
+  `!~/.config/nomadnetwork`!
+  `!~/.nomadnetwork`!
+
+If no existing configuration file is found, one will be created at `!~/.nomadnetwork/config`! by default. The default configuration file contains comments on all the different configuration options present, and explains their possible settings.
+
+You can open the configuration file in any text-editor, and change the options. You can also use the editor built in to this program, under the `![ Config ]`! menu item. If the built-in editor does not gain focus, and your navigation keys are not working, try hitting enter or space, which should focus the editor and let you navigate the text.
 
 For reference, all the configuration options are listed and explained here as well. The configuration is divided into different sections, each with their own options.
 
@@ -535,9 +586,9 @@ Determines whether your node is automatically announced on the network when the
 <
 
 >>>
-`!announce_interval = 720`!
+`!announce_interval = 360`!
 >>>>
-Determines how often, in minutes, your node is announced on the network. Defaults to 12 hours.
+Determines how often, in minutes, your node is announced on the network. Defaults to 6 hours.
 <
 
 >>>
@@ -553,20 +604,48 @@ Determines where the node server will look for downloadable files. Must be a rea
 <
 
 >>>
-`!message_storage_limit = 2`!
+`!message_storage_limit = 2000`!
 >>>>
-Configures the maximum amount of storage, in gigabytes, the LXMF Propagation Node will use to store messages.
+Configures the maximum amount of storage, in megabytes, that the LXMF Propagation Node will use to store messages.
 <
 
 >>>
-`!prioritise_destinations = 10bc7624c27032a18639, ba780a6dff4cc1391db8`!
+`!prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf`!
 >>>>
 Configures the LXMF Propagation Node to prioritise storing messages for certain destinations. If the message store reaches the specified limit, LXMF will prioritise keeping messages for destinations specified with this option. This setting is optional, and generally you do not need to use it.
 <
 
+>> Printing Section
+
+This section holds configuration directives related to printing. It is delimited by the `![printing]`! header in the configuration file. Available directives, along with example values, are as follows:
+
+>>>
+`!print_messages = no`!
+>>>>
+Determines whether messages should be printed upon arrival. Must be a boolean value, and is turned off by default.
+<
+
+>>>
+`!message_template = ~/.nomadnetwork/print_template_msg.txt`!
+>>>>
+Determines where the template for printed messages is found. Must be a filesystem path. If you set this path to a non-existing file, an example will be generated in the specified location.
+<
+
+>>>
+`!print_from = 76fe5751a56067d1e84eef3e88eab85b, trusted`!
+>>>>
+Determines from which destinations messages are printed. Can be a list of destinations hashes, the keyword "trusted", or "everywhere".
+<
+
+>>>
+`!print_command = lp -d PRINTER_NAME -o cpi=16 -o lpi=8`!
+>>>>
+Specifies the command that Nomad Network uses to print the message. Defaults to "lp". The above example works well for small thermal-roll printers.
+<
+
 >Ignoring Destinations
 
-If you encounter peers or nodes on the network, that you would rather not see in your client, you can add them to the `!~/.nomadnetwork/ignored`! file. To ignore nodes or peers, add one 20-character hexadecimal destination hash per line to the file. To unignore one again, simply remove the corresponding entry from the file and restart Nomad Network.
+If you encounter peers or nodes on the network, that you would rather not see in your client, you can add them to the `!~/.nomadnetwork/ignored`! file. To ignore nodes or peers, add one 32-character hexadecimal destination hash per line to the file. To unignore one again, simply remove the corresponding entry from the file and restart Nomad Network.
 '''
 
 TOPIC_NETWORKS = '''>Network Configuration
@@ -591,20 +670,27 @@ For future reference, you can download the Reticulum Manual in PDF format here:
 
 It might be nice to keep that handy when you are not connected to the Internet, as it is full of information and examples that are also very relevant to Nomad Network.
 
->The Unsigned.io Testnet
+>The Reticulum Testnet
 
 If you have Internet access, and just want to get started experimenting, you are welcome to join the Unsigned.io RNS Testnet. The testnet is just that, an informal network for testing and experimenting. It will be up most of the time, and anyone can join, but it also means that there's no guarantees for service availability.
 
 The Testnet also runs the latest version of Reticulum, often even a short while before it is publicly released, which means strange behaviour might occur. If none of that scares you, add the following interface to your Reticulum configuration file to join:
 
 >>
-[[RNS Testnet Frankfurt]]
+[[RNS Testnet Zurich]]
   type = TCPClientInterface
   interface_enabled = yes
   outgoing = True
-  target_host = frankfurt.rns.unsigned.io
+  target_host = zurich.connect.reticulum.network
-  target_port = 4965
+  target_port = 4242
+<
 
+If you connect to the testnet, you can leave nomadnet running for a while and wait for it to receive announces from other nodes on the network that host pages or services, or you can try connecting directly to some nodes listed here:
+
+ - Dublin Hub Testnet Node    : `!`[abb3ebcd03cb2388a838e70c001291f9]`!
+ - Frankfurt Hub Testnet Node : `!`[ea6a715f814bdc37e56f80c34da6ad51]`!
+
+To browse pages on a node that is not currently known, open the URL dialog in the `![ Network ]`! section of the program by pressing `!Ctrl+U`!, paste or enter the address and select `!< Go >`! or press enter. Nomadnet will attempt to discover and connect to the requested node. You can save the currently connected node by pressing `!Ctrl+S`!.
 '''
 
 TOPIC_DISPLAYTEST = '''>Markup & Color Display Test
@@ -706,7 +792,7 @@ While micron can output formatted text to even the most basic terminal, there's
 
 Formatting such as `_underline`_, `!bold`! or `*italics`* will be displayed if your terminal supports it.
 
-If you are having trouble getting micron output to display correctly, try using `*gnome-terminal`*, which should work with all formatting options out of the box. Most other terminals will work fine as well, but you might have to change some settings to get certain formatting to display correctly.
+If you are having trouble getting micron output to display correctly, try using `*gnome-terminal`* or `*alacritty`*, which should work with all formatting options out of the box. Most other terminals will work fine as well, but you might have to change some settings to get certain formatting to display correctly.
 
 >>>Encoding
 
@@ -886,11 +972,11 @@ Here's a few examples:
 
 `Faaa
 `=
-Here is a link without any label: `[1385edace36466a6b3dd:/page/index.mu]
+Here is a link without any label: `[72914442a3689add83a09a767963f57c:/page/index.mu]
 
-This is a `[labeled link`1385edace36466a6b3dd:/page/index.mu] to the same page, but it's hard to see if you don't know it
+This is a `[labeled link`72914442a3689add83a09a767963f57c:/page/index.mu] to the same page, but it's hard to see if you don't know it
 
-Here is `F00a`_`[a more visible link`1385edace36466a6b3dd:/page/index.mu]`_`f
+Here is `F00a`_`[a more visible link`72914442a3689add83a09a767963f57c:/page/index.mu]`_`f
 `=
 ``
 
@@ -898,11 +984,11 @@ The above markup produces the following output:
 
 `Faaa`B333
 
-Here is a link without any label: `[1385edace36466a6b3dd:/page/index.mu]
+Here is a link without any label: `[72914442a3689add83a09a767963f57c:/page/index.mu]
 
-This is a `[labeled link`1385edace36466a6b3dd:/page/index.mu] to the same page, but it's hard to see if you don't know it
+This is a `[labeled link`72914442a3689add83a09a767963f57c:/page/index.mu] to the same page, but it's hard to see if you don't know it
 
-Here is `F00f`_`[a more visible link`1385edace36466a6b3dd:/page/index.mu]`_`f
+Here is `F00f`_`[a more visible link`72914442a3689add83a09a767963f57c:/page/index.mu]`_`f
 
 ``
 
@@ -949,6 +1035,7 @@ TOPICS = {
     "Conversations": TOPIC_CONVERSATIONS,
     "Hosting a Node": TOPIC_HOSTING,
     "Configuration Options": TOPIC_CONFIG,
+    "Keyboard Shortcuts": TOPIC_SHORTCUTS,
     "Markup": TOPIC_MARKUP,
     "Display Test": TOPIC_DISPLAYTEST,
     "Network Configuration": TOPIC_NETWORKS,

nomadnet/ui/textui/Main.py

@@ -125,8 +125,6 @@ class MainDisplay():
     def update_active_sub_display(self):
         self.frame.contents["body"] = (self.sub_displays.active().widget, None)
         self.update_active_shortcuts()
-        # TODO: Remove when new mitigation has been tested
-        # self.app.ui.main_display.request_redraw(extra_delay=0.0)
 
     def update_active_shortcuts(self):
         self.frame.contents["footer"] = (self.sub_displays.active().shortcuts().widget, None)

nomadnet/ui/textui/MicronParser.py

@@ -480,7 +480,11 @@ def make_output(state, line, url_delegate):
 
                 elif mode == "text":
                     if c == "\\":
-                        escape = True
+                        if escape:
+                            part += c
+                            escape = False
+                        else:
+                            escape = True
                     elif c == "`":
                         if escape:
                             part += c

nomadnet/ui/textui/Network.py

@@ -13,7 +13,7 @@ class NetworkDisplayShortcuts():
         self.app = app
         g = app.ui.glyphs
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-l] Nodes/Announces  [C-x] Remove  [C-w] Disconnect  [C-d] Back  [C-f] Forward  [C-r] Reload  [C-u] URL"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-l] Nodes/Announces  [C-x] Remove  [C-w] Disconnect  [C-d] Back  [C-f] Forward  [C-r] Reload  [C-u] URL  [C-g] Fullscreen"), "shortcutbar")
         #   "[C-"+g["arrow_u"]+g["arrow_d"]+"] Navigate Lists"
 
 
@@ -51,6 +51,13 @@ class ListEntry(urwid.Text):
 
 
 class AnnounceInfo(urwid.WidgetWrap):
+    def keypress(self, size, key):
+        if key == "esc":
+            options = self.parent.left_pile.options(height_type="weight", height_amount=1)
+            self.parent.left_pile.contents[0] = (self.parent.announce_stream_display, options)
+        else:
+            return super(AnnounceInfo, self).keypress(size, key)
+
     def __init__(self, announce, parent, app):
         self.app = nomadnet.NomadNetworkApp.get_shared_instance()
         self.parent = self.app.ui.main_display.sub_displays.network_display
@@ -64,11 +71,17 @@ class AnnounceInfo(urwid.WidgetWrap):
         trust_str    = ""
         display_str  = self.app.directory.simplest_display_str(source_hash)
         addr_str     = "<"+RNS.hexrep(source_hash, delimit=False)+">"
-        is_node      = announce[3]
+        info_type    = announce[3]
 
-        if is_node:
+        is_node = False
-            type_string = "Node " + g["node"]
+        is_pn   = False
-        else:
+        if info_type == "node" or info_type == True:
+            type_string = "Nomad Network Node " + g["node"]
+            is_node = True
+        elif info_type == "pn":
+            type_string = "LXMF Propagation Node " + g["sent"]
+            is_pn = True
+        elif info_type == "peer" or info_type == False:
             type_string = "Peer " + g["peer"]
 
         try:
@@ -107,8 +120,6 @@ class AnnounceInfo(urwid.WidgetWrap):
             self.parent.left_pile.contents[0] = (self.parent.announce_stream_display, options)
 
         def connect(sender):
-            # TODO: Remove when new mitigation has been tested
-            # self.app.ui.main_display.request_redraw(extra_delay=0.75)
             self.parent.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
             show_announce_stream(None)
 
@@ -120,6 +131,9 @@ class AnnounceInfo(urwid.WidgetWrap):
 
         if is_node:
             node_ident = RNS.Identity.recall(source_hash)
+            if not node_ident:
+                raise KeyError("Could not recall identity for selected node")
+
             op_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", node_ident)
             op_str = self.app.directory.simplest_display_str(op_hash)
 
@@ -166,10 +180,20 @@ class AnnounceInfo(urwid.WidgetWrap):
             except Exception as e:
                 RNS.log("Error while starting conversation from announce. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
+        def use_pn(sender):
+            show_announce_stream(None)
+            try:
+                self.app.set_user_selected_propagation_node(source_hash)
+            except Exception as e:
+                RNS.log("Error while setting active propagation node from announce. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
         if is_node:
             type_button = ("weight", 0.45, urwid.Button("Connect", on_press=connect))
             msg_button =  ("weight", 0.45, urwid.Button("Msg Op", on_press=msg_op))
             save_button = ("weight", 0.45, urwid.Button("Save", on_press=save_node))
+        elif is_pn:
+            type_button = ("weight", 0.45, urwid.Button("Use as default", on_press=use_pn))
+            save_button = None
         else:
             type_button = ("weight", 0.45, urwid.Button("Converse", on_press=converse))
             save_button = None
@@ -179,21 +203,33 @@ class AnnounceInfo(urwid.WidgetWrap):
         else:
             button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), type_button])
 
-        pile_widgets = [
+        pile_widgets = []
-            urwid.Text("Time  : "+ts_string, align="left"),
-            urwid.Text("Addr  : "+addr_str, align="left"),
-            urwid.Text("Type  : "+type_string, align="left"),
-            urwid.Text("Name  : "+display_str, align="left"),
-            urwid.Text(["Trust : ", (style, trust_str)], align="left"),
-            urwid.Divider(g["divider1"]),
-            urwid.Text(["Announce Data: \n", (data_style, data_str)], align="left"),
-            urwid.Divider(g["divider1"]),
-            button_columns
-        ]
 
-        if is_node:
+        if is_pn:
-            operator_entry = urwid.Text("Oprtr : "+op_str, align="left")
+            pile_widgets = [
-            pile_widgets.insert(4, operator_entry)
+                urwid.Text("Time  : "+ts_string, align="left"),
+                urwid.Text("Addr  : "+addr_str, align="left"),
+                urwid.Text("Type  : "+type_string, align="left"),
+                urwid.Divider(g["divider1"]),
+                button_columns
+            ]
+
+        else:
+            pile_widgets = [
+                urwid.Text("Time  : "+ts_string, align="left"),
+                urwid.Text("Addr  : "+addr_str, align="left"),
+                urwid.Text("Type  : "+type_string, align="left"),
+                urwid.Text("Name  : "+display_str, align="left"),
+                urwid.Text(["Trust : ", (style, trust_str)], align="left"),
+                urwid.Divider(g["divider1"]),
+                urwid.Text(["Announce Data: \n", (data_style, data_str)], align="left"),
+                urwid.Divider(g["divider1"]),
+                button_columns
+            ]
+
+            if is_node:
+                operator_entry = urwid.Text("Oprtr : "+op_str, align="left")
+                pile_widgets.insert(4, operator_entry)
 
         pile = urwid.Pile(pile_widgets)
 
@@ -208,10 +244,11 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
         date_time_format = "%Y-%m-%d"
         time_time_format = "%H:%M:%S"
         short_time_format = "%Y-%m-%d %H:%M"
+        date_only_format = "%Y-%m-%d"
 
         timestamp = announce[0]
         source_hash = announce[1]
-        is_node = announce[3]
+        announce_type = announce[3]
         self.app = app
         self.timestamp = timestamp
         time_format = app.time_format
@@ -222,7 +259,7 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
         if dt.strftime(date_time_format) == dtn.strftime(date_time_format):
             ts_string = dt.strftime(time_time_format)
         else:
-            ts_string = dt.strftime(short_time_format)
+            ts_string = dt.strftime(date_only_format)
 
         trust_level  = self.app.directory.trust_level(source_hash)
         display_str = self.app.directory.simplest_display_str(source_hash)
@@ -248,10 +285,12 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
             style         = "list_untrusted"
             focus_style   = "list_focus_untrusted"
 
-        if is_node:
+        if announce_type == "node" or announce_type == True:
             type_symbol = g["node"]
-        else:
+        elif announce_type == "peer" or announce_type == False:
             type_symbol = g["peer"]
+        elif announce_type == "pn":
+            type_symbol = g["sent"]
 
         widget = ListEntry(ts_string+" "+type_symbol+" "+display_str)
         urwid.connect_signal(widget, "click", self.display_announce, announce)
@@ -387,6 +426,13 @@ class ListDialogLineBox(urwid.LineBox):
             return super(ListDialogLineBox, self).keypress(size, key)
 
 class KnownNodeInfo(urwid.WidgetWrap):
+    def keypress(self, size, key):
+        if key == "esc":
+            options = self.parent.left_pile.options(height_type="weight", height_amount=1)
+            self.parent.left_pile.contents[0] = (self.parent.known_nodes_display, options)
+        else:
+            return super(KnownNodeInfo, self).keypress(size, key)
+
     def __init__(self, node_hash):
         self.app = nomadnet.NomadNetworkApp.get_shared_instance()
         self.parent = self.app.ui.main_display.sub_displays.network_display
@@ -406,13 +452,18 @@ class KnownNodeInfo(urwid.WidgetWrap):
 
         addr_str     = "<"+RNS.hexrep(source_hash, delimit=False)+">"
 
+        if display_str == None:
+            display_str = addr_str
+
+        pn_hash = RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_ident)
+
         if node_ident != None:
-            lxmf_addr_str = g["sent"]+" LXMF Propagation Node Address is "+RNS.prettyhexrep(RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_ident))
+            lxmf_addr_str = g["sent"]+" LXMF Propagation Node Address is "+RNS.prettyhexrep(pn_hash)
         else:
             lxmf_addr_str = "No associated Propagation Node known"
 
 
-        type_string = "Node " + g["node"]
+        type_string = "Nomad Network Node " + g["node"]
 
         if trust_level == DirectoryEntry.UNTRUSTED:
             trust_str     = "Untrusted"
@@ -506,7 +557,7 @@ class KnownNodeInfo(urwid.WidgetWrap):
         def save_node(sender):
             if self.pn_changed:
                 if propagation_node_checkbox.get_state():
-                    self.app.set_user_selected_propagation_node(source_hash)
+                    self.app.set_user_selected_propagation_node(pn_hash)
                 else:
                     self.app.set_user_selected_propagation_node(None)
 
@@ -567,6 +618,10 @@ class KnownNodeInfo(urwid.WidgetWrap):
         pile_widgets.insert(4, operator_entry)
 
         pile = urwid.Pile(pile_widgets)
+        
+        pile.focus_position = len(pile.contents)-1
+        button_columns.focus_position = 0
+
 
         self.display_widget = urwid.Filler(pile, valign="top", height="pack")
 
@@ -586,6 +641,8 @@ class ExceptionHandlingListBox(IndicativeListBox):
                 nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
             elif key == "down":
                 nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.network_display.left_pile.set_focus(1)
+            else:
+                RNS.log("An error occurred while processing an interface event. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
 
 class KnownNodes(urwid.WidgetWrap):
@@ -806,7 +863,7 @@ class NodeAnnounceTime(urwid.WidgetWrap):
         if self.app.peer_settings["node_last_announce"] != None:
             self.last_announce_string = pretty_date(int(self.app.peer_settings["node_last_announce"]))
 
-        self.display_widget.set_text("Last Announce     : "+self.last_announce_string)
+        self.display_widget.set_text("Last Announce  : "+self.last_announce_string)
 
     def update_time_callback(self, loop=None, user_data=None):
         self.update_time()
@@ -837,7 +894,7 @@ class NodeActiveConnections(urwid.WidgetWrap):
         if self.app.node != None:
             self.stat_string = str(len(self.app.node.destination.links))
 
-        self.display_widget.set_text("Connections Now   : "+self.stat_string)
+        self.display_widget.set_text("Connected Now  : "+self.stat_string)
 
     def update_stat_callback(self, loop=None, user_data=None):
         self.update_stat()
@@ -853,6 +910,48 @@ class NodeActiveConnections(urwid.WidgetWrap):
     def stop(self):
         self.started = False
 
+class NodeStorageStats(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_stat()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_stat(self):
+        self.stat_string = "None"
+        if self.app.node != None:
+
+            limit = self.app.message_router.message_storage_limit
+            used = self.app.message_router.message_storage_size()
+
+            if limit != None:
+                pct = round((used/limit)*100, 1)
+                pct_str = str(pct)+"%, "
+                limit_str = " of "+RNS.prettysize(limit)
+            else:
+                limit_str = ""
+                pct_str = ""
+
+            self.stat_string = pct_str+RNS.prettysize(used)+limit_str
+
+        self.display_widget.set_text("LXMF Storage   : "+self.stat_string)
+
+    def update_stat_callback(self, loop=None, user_data=None):
+        self.update_stat()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_stat_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_stat_callback()
+
+    def stop(self):
+        self.started = False
 
 class NodeTotalConnections(urwid.WidgetWrap):
     def __init__(self, app):
@@ -869,7 +968,7 @@ class NodeTotalConnections(urwid.WidgetWrap):
         if self.app.node != None:
             self.stat_string = str(self.app.peer_settings["node_connects"])
 
-        self.display_widget.set_text("Total Connections : "+self.stat_string)
+        self.display_widget.set_text("Total Connects : "+self.stat_string)
 
     def update_stat_callback(self, loop=None, user_data=None):
         self.update_stat()
@@ -901,7 +1000,7 @@ class NodeTotalPages(urwid.WidgetWrap):
         if self.app.node != None:
             self.stat_string = str(self.app.peer_settings["served_page_requests"])
 
-        self.display_widget.set_text("Served Pages      : "+self.stat_string)
+        self.display_widget.set_text("Served Pages   : "+self.stat_string)
 
     def update_stat_callback(self, loop=None, user_data=None):
         self.update_stat()
@@ -933,7 +1032,7 @@ class NodeTotalFiles(urwid.WidgetWrap):
         if self.app.node != None:
             self.stat_string = str(self.app.peer_settings["served_file_requests"])
 
-        self.display_widget.set_text("Served Files      : "+self.stat_string)
+        self.display_widget.set_text("Served Files   : "+self.stat_string)
 
     def update_stat_callback(self, loop=None, user_data=None):
         self.update_stat()
@@ -1050,6 +1149,7 @@ class NodeInfo(urwid.WidgetWrap):
     conns_timer = None
     pages_timer = None
     files_timer = None
+    storage_timer = None
 
     def __init__(self, app, parent):
         self.app = app
@@ -1123,6 +1223,13 @@ class NodeInfo(urwid.WidgetWrap):
                 self.t_active_links = NodeInfo.links_timer
                 self.t_active_links.update_stat()
 
+            if NodeInfo.storage_timer == None:
+                self.t_storage_stats = NodeStorageStats(self.app)
+                NodeInfo.storage_timer = self.t_storage_stats
+            else:
+                self.t_storage_stats = NodeInfo.storage_timer
+                self.t_storage_stats.update_stat()
+
             if NodeInfo.conns_timer == None:
                 self.t_total_connections = NodeTotalConnections(self.app)
                 NodeInfo.conns_timer = self.t_total_connections
@@ -1158,6 +1265,7 @@ class NodeInfo(urwid.WidgetWrap):
                 e_lxmf,
                 urwid.Divider(g["divider1"]),
                 self.t_last_announce,
+                self.t_storage_stats,
                 self.t_active_links,
                 self.t_total_connections,
                 self.t_total_pages,
@@ -1257,6 +1365,10 @@ class NetworkLeftPile(urwid.Pile):
     def keypress(self, size, key):
         if key == "ctrl l":
             self.parent.toggle_list()
+        elif key == "ctrl g":
+            self.parent.toggle_fullscreen()
+        elif key == "ctrl e":
+            self.parent.selected_node_info()
         elif key == "ctrl p":
             self.parent.reinit_lxmf_peers()
             self.parent.show_peers()
@@ -1264,12 +1376,16 @@ class NetworkLeftPile(urwid.Pile):
             self.parent.browser.disconnect()
         elif key == "ctrl u":
             self.parent.browser.url_dialog()
+        elif key == "ctrl s":
+            self.parent.browser.save_node_dialog()
+
         else:
             return super(NetworkLeftPile, self).keypress(size, key)
 
 
 class NetworkDisplay():
     list_width = 0.33
+    given_list_width = 52
 
     def __init__(self, app):
         self.app = app
@@ -1304,8 +1420,10 @@ class NetworkDisplay():
 
         self.columns = urwid.Columns(
             [
-                ("weight", NetworkDisplay.list_width, self.left_area),
+                # ("weight", NetworkDisplay.list_width, self.left_area),
-                ("weight", self.right_area_width, self.right_area)
+                # ("weight", self.right_area_width, self.right_area)
+                (NetworkDisplay.given_list_width, self.left_area),
+                ("weight", 1, self.right_area)
             ],
             dividechars=0, focus_column=0
         )
@@ -1323,6 +1441,16 @@ class NetworkDisplay():
             self.left_pile.contents[0] = (self.known_nodes_display, options)
             self.list_display = 1
 
+    def toggle_fullscreen(self):
+        if NetworkDisplay.given_list_width != 0:
+            self.saved_list_width = NetworkDisplay.given_list_width
+            NetworkDisplay.given_list_width = 0
+        else:
+            NetworkDisplay.given_list_width = self.saved_list_width
+
+        options = self.widget.options("given", NetworkDisplay.given_list_width)
+        self.widget.contents[0] = (self.left_area, options)
+
     def show_peers(self):
         options = self.left_pile.options(height_type="weight", height_amount=1)
         self.left_pile.contents[0] = (self.lxmf_peers_display, options)
@@ -1332,6 +1460,18 @@ class NetworkDisplay():
         else:
             self.list_display = 1
 
+    def selected_node_info(self):
+        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_hash != None:
+                    info_widget = KnownNodeInfo(selected_node_hash)
+                    options = parent.left_pile.options(height_type="weight", height_amount=1)
+                    parent.left_pile.contents[0] = (info_widget, options)
+    
     def focus_lists(self):
         self.columns.focus_position = 0
 
@@ -1464,7 +1604,14 @@ class LXMFPeerEntry(urwid.WidgetWrap):
         style         = "list_unknown"
         focus_style   = "list_focus"
 
-        widget = ListEntry(sym+" "+display_str+"\n  "+str(len(peer.unhandled_messages))+" unhandled messages - "+"Last heard "+pretty_date(int(peer.last_heard)))
+        alive_string = "Unknown"
+        if hasattr(peer, "alive"):
+            if peer.alive:
+                alive_string = "Available"
+            else:
+                alive_string = "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")
         # urwid.connect_signal(widget, "click", delegate.connect_node, node)
 
         self.display_widget = urwid.AttrMap(widget, style, focus_style)

setup.py

@@ -23,6 +23,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=['rns>=0.3.8', 'lxmf>=0.1.7', 'urwid>=2.1.2'],
+    install_requires=["rns>=0.4.3", "lxmf>=0.2.7", "urwid>=2.1.2", "qrcode"],
-    python_requires='>=3.6',
+    python_requires=">=3.6",
 )