.dockerignore

@@ -1 +0,0 @@
-.gitignore

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: ✨ Feature Request or Idea
-    url: https://github.com/markqvist/Reticulum/discussions/new?category=ideas
-    about: Propose and discuss features and ideas
-  - name: 💬 Questions, Help & Discussion
-    about: Ask anything, or get help
-    url: https://github.com/markqvist/Reticulum/discussions/new/choose
-  - name: 📖 Read the Reticulum Manual
-    url: https://markqvist.github.io/Reticulum/manual/
-    about: The complete documentation for Reticulum

.github/ISSUE_TEMPLATE/🐛-bug-report.md

@@ -1,35 +0,0 @@
----
-name: "\U0001F41B Bug Report"
-about: Report a reproducible bug
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Read the Contribution Guidelines**
-Before creating a bug report on this issue tracker, you **must** read the [Contribution Guidelines](https://github.com/markqvist/Reticulum/blob/master/Contributing.md). Issues that do not follow the contribution guidelines **will be deleted without comment**.
-
-- The issue tracker is used by developers of this project. **Do not use it to ask general questions, or for support requests**.
-- Ideas and feature requests can be made on the [Discussions](https://github.com/markqvist/Reticulum/discussions). **Only** feature requests accepted by maintainers and developers are tracked and included on the issue tracker. **Do not post feature requests here**.
-- After reading the [Contribution Guidelines](https://github.com/markqvist/Reticulum/blob/master/Contributing.md), **delete this section only** (*"Read the Contribution Guidelines"*) from your bug report, **and fill in all the other sections**.
-
-**Describe the Bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Describe in detail how to reproduce the bug.
-
-**Expected Behavior**
-A clear and concise description of what you expected to happen.
-
-**Logs & Screenshots**
-Please include any relevant log output. If applicable, also add screenshots to help explain your problem.
-
-**System Information**
-- OS and version
-- Python version
-- Program version
-
-**Additional context**
-Add any other context about the problem here.

.github/workflows/publish-container.yml

@@ -1,42 +0,0 @@
-name: Create and publish a Docker image
-
-on:
-  push:
-    branches: ['master']
-    tags: ['*.*.*']
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,26 +0,0 @@
-FROM python:3.12-alpine as build
-
-RUN apk add --no-cache build-base linux-headers libffi-dev cargo
-
-# Create a virtualenv that we'll copy to the published image
-RUN python -m venv /opt/venv
-ENV PATH="/opt/venv/bin:$PATH"
-RUN pip3 install setuptools-rust pyopenssl cryptography
-
-COPY . /app/
-RUN cd /app/ && pip3 install .
-
-# Use multi-stage build, as we don't need rust compilation on the final image
-FROM python:3.12-alpine
-
-LABEL org.opencontainers.image.documentation="https://github.com/markqvist/NomadNet#nomad-network-daemon-with-docker"
-
-ENV PATH="/opt/venv/bin:$PATH"
-ENV PYTHONUNBUFFERED="yes"
-COPY --from=build /opt/venv /opt/venv
-
-VOLUME /root/.reticulum
-VOLUME /root/.nomadnetwork
-
-ENTRYPOINT ["nomadnet"]
-CMD ["--daemon"]

Dockerfile.build

@@ -1,28 +0,0 @@
-FROM python:alpine
-LABEL authors="Petr Blaha petr.blaha@cleverdata.cz"
-USER root
-RUN apk update
-RUN apk add  build-base libffi-dev cargo pkgconfig   linux-headers py3-virtualenv
-
-RUN addgroup -S myuser && adduser -S -G myuser myuser
-USER myuser
-WORKDIR /home/myuser
-
-RUN pip install --upgrade pip
-RUN pip install setuptools-rust pyopenssl cryptography
-
-
-ENV PATH="/home/myuser/.local/bin:${PATH}"
-
-################### BEGIN NomadNet ###########################################
-
-
-COPY --chown=myuser:myuser . .
-
-#Python create virtual environment
-RUN virtualenv /home/myuser/NomadNet/venv
-RUN source /home/myuser/NomadNet/venv/bin/activate
-
-RUN make all
-
-################### END NomadNet ###########################################

Dockerfile.howto

@@ -1,6 +0,0 @@
-# Run docker command one by one(all four), it will build NomadNet artifact and copy to dist directory.
-# No need to build locally and install dependencies
-docker build -t nomadnetdockerimage -f Dockerfile.build .
-docker run -d -it --name nomadnetdockercontainer nomadnetdockerimage /bin/sh
-docker cp nomadnetdockercontainer:/home/myuser/dist .
-docker rm -f nomadnetdockercontainer

FUNDING.yml

@@ -1,3 +0,0 @@
-liberapay: Reticulum
-ko_fi: markqvist
-custom: "https://unsigned.io/donate"

Makefile

@@ -1,25 +0,0 @@
-all: release
-
-clean:
-	@echo Cleaning...
-	-rm -r ./build
-	-rm -r ./dist
-
-remove_symlinks:
-	@echo Removing symlinks for build...
-	-rm ./LXMF
-	-rm ./RNS
-
-create_symlinks:
-	@echo Creating symlinks...
-	-ln -s ../Reticulum/RNS ./
-	-ln -s ../LXMF/LXMF ./
-
-build_wheel:
-	python3 setup.py sdist bdist_wheel
-
-release: remove_symlinks build_wheel create_symlinks
-
-upload:
-	@echo Uploading to PyPi...
-	twine upload dist/*

README.md

@@ -1,182 +1,51 @@
-# Nomad Network - Communicate Freely
+Nomad Network - Communicate Freely
-
+==========
-Off-grid, resilient mesh communication with strong encryption, forward secrecy and extreme privacy.
 
 ![Screenshot](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png)
 
-Nomad Network allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them. No signups, no agreements, no handover of any data, no permissions and gatekeepers.
+The intention with this program is to provide a tool to that allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them.
 
-Nomad Network is build on [LXMF](https://github.com/markqvist/LXMF) and [Reticulum](https://github.com/markqvist/Reticulum), which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to fiber optics.
+Nomad Network is build on [LXMF](https://github.com/markqvist/LXMF) and [Reticulum](https://github.com/markqvist/Reticulum), which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to fiber.
 
-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. Since Nomad Network uses Reticulum, it is efficient enough to run even over *extremely* low-bandwidth medium, and has been succesfully used over 300bps radio links.
+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 Reticulum 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
- - Distributed and encrypted message store holds messages for offline users
  - Connectable nodes that can host pages and files
  - Node-side generated pages with PHP, Python, bash or others
  - Built-in text-based browser for interacting with contents on nodes
  - An easy to use and bandwidth efficient markup language for writing pages
  - Page caching in browser
 
+## 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
+ - Access control and authentication for nodes, pages and files
+ - Network-wide propagated messaging and discussion threads
+ - Geospatial information sharing
+ - Distributed Marketplace
+
+## Dependencies:
+ - Python 3
+ - RNS
+ - LXMF
+
 ## How do I get started?
 The easiest way to install Nomad Network is via pip:
 
 ```bash
 # Install Nomad Network and dependencies
-pip install nomadnet
+pip3 install nomadnet
 
 # Run the client
 nomadnet
-
-# Or alternatively run as a daemon, with no user interface
-nomadnet --daemon
-
-# List options
-nomadnet --help
 ```
 
-If you are using an operating system that blocks normal user package installation via `pip`, you can return `pip` to normal behaviour by editing the `~/.config/pip/pip.conf` file, and adding the following directive in the `[global]` section:
+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.
 
-```text
+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 for info.
-[global]
-break-system-packages = true
-```
-
-Alternatively, you can use the `pipx` tool to install Nomad Network in an isolated environment:
-
-```bash
-# Install Nomad Network
-pipx install nomadnet
-
-# Optionally install Reticulum utilities
-pipx install rns
-
-# Optionally install standalone LXMF utilities
-pipx install lxmf
-
-# Run the client
-nomadnet
-
-# Or alternatively run as a daemon, with no user interface
-nomadnet --daemon
-
-# List options
-nomadnet --help
-```
-
-**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 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:
-
- - `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://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.2.0`) for a specific release.
-
-```sh
-$ docker pull ghcr.io/markqvist/nomadnet:master
-
-# Run nomadnet interactively in a container
-$ docker run -it ghcr.io/markqvist/nomadnet:master --textui
-
-# Run nomadnet as a daemon, using config stored on the host machine in specified
-# directories, and connect the containers network to the host network (which will
-# allow the default AutoInterface to automatically peer with other discovered
-# Reticulum instances).
-$ docker run -d \
-  -v /local/path/nomadnetconfigdir/:/root/.nomadnetwork/ \
-  -v /local/path/reticulumconfigdir/:/root/.reticulum/ \
-  --network host
-  ghcr.io/markqvist/nomadnet:master
-
-# You can also keep the network of the container isolated from the host, but you
-# will need to manually configure one or more Reticulum interfaces to reach other
-# nodes in a network, by editing the Reticulum configuration file.
-$ docker run -d \
-  -v /local/path/nomadnetconfigdir/:/root/.nomadnetwork/ \
-  -v /local/path/reticulumconfigdir/:/root/.reticulum/ \
-  ghcr.io/markqvist/nomadnet:master
-
-# Send daemon log output to console instead of file
-$ docker run -i ghcr.io/markqvist/nomadnet:master --daemon --console
-```
-
-## Tools & Extensions
-
-Nomad Network is a very flexible and extensible platform, and a variety of community-provided tools, utilities and node-side extensions exist:
-
-- [NomadForum](https://codeberg.org/AutumnSpark1226/nomadForum) ([GitHub mirror](https://github.com/AutumnSpark1226/nomadForum))
-- [NomadForecast](https://github.com/faragher/NomadForecast)
-- [micron-blog](https://github.com/randogoth/micron-blog)
-- [md2mu](https://github.com/randogoth/md2mu)
-- [Any2MicronConverter](https://github.com/SebastianObi/Any2MicronConverter)
-- [Some nomadnet page examples](https://github.com/SebastianObi/NomadNet-Pages)
-- [More nomadnet page examples](https://github.com/epenguins/NomadNet_pages)
-- [LXMF-Bot](https://github.com/randogoth/lxmf-bot)
-- [LXMF Messageboard](https://github.com/chengtripp/lxmf_messageboard)
-- [LXMEvent](https://github.com/faragher/LXMEvent)
-- [POPR](https://github.com/faragher/POPR)
-- [LXMF Tools](https://github.com/SebastianObi/LXMF-Tools)
-
-## Help & Discussion
-
-For help requests, discussion, sharing ideas or anything else related to Nomad Network, please have a look at the [Nomad Network discussions pages](https://github.com/markqvist/Reticulum/discussions/categories/nomad-network).
-
-## Support Nomad Network
-You can help support the continued development of open, free and private communications systems by donating via one of the following channels:
-
-- Monero:
-  ```
-  84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
-  ```
-- Bitcoin
-  ```
-  bc1p4a6axuvl7n9hpapfj8sv5reqj8kz6uxa67d5en70vzrttj0fmcusgxsfk5
-  ```
-- Ethereum
-  ```
-  0xae89F3B94fC4AD6563F0864a55F9a697a90261ff
-  ```
-- 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
-- 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

@@ -14,8 +14,6 @@ class Conversation:
     @staticmethod
     def received_announce(destination_hash, announced_identity, app_data):
         app = nomadnet.NomadNetworkApp.get_shared_instance()
-
-        if not destination_hash in app.ignored_list:
         destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
         # Check if the announced destination is in
         # our list of conversations
@@ -27,20 +25,10 @@ class Conversation:
                 if Conversation.created_callback != None:
                     Conversation.created_callback()
 
-            # This reformats the new v0.5.0 announce data back to the expected format
-            # for nomadnets storage and other handling functions.
-            dn = LXMF.display_name_from_app_data(app_data)
-            app_data = b""
-            if dn != None:
-                app_data = dn.encode("utf-8")
-            
         # Add the announce to the directory announce
         # stream logger
         app.directory.lxmf_announce_received(destination_hash, app_data)
 
-        else:
-            RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
-
     @staticmethod
     def query_for_peer(source_hash):
         try:
@@ -78,7 +66,6 @@ class Conversation:
             except Exception as e:
                 pass
 
-            if Conversation.created_callback != None:
             Conversation.created_callback()
 
         return ingested_path
@@ -102,7 +89,7 @@ class Conversation:
                         unread = True
 
                     if display_name == None and app_data:
-                        display_name = LXMF.display_name_from_app_data(app_data)
+                        display_name = app_data.decode("utf-8")
 
                     if display_name == None:
                         sort_name = ""
@@ -149,9 +136,6 @@ class Conversation:
 
         self.__changed_callback = None
 
-        if not RNS.Identity.recall(bytes.fromhex(self.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:
@@ -212,26 +196,9 @@ class Conversation:
         if self.send_destination:
             dest = self.send_destination
             source = self.app.lxmf_destination
-            desired_method = LXMF.LXMessage.DIRECT
+            lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=LXMF.LXMessage.DIRECT)
-            if self.app.directory.preferred_delivery(dest.hash) == DirectoryEntry.PROPAGATED:
-                if self.app.message_router.get_outbound_propagation_node() != None:
-                    desired_method = LXMF.LXMessage.PROPAGATED
-            else:
-                if not self.app.message_router.delivery_link_available(dest.hash) and RNS.Identity.current_ratchet_id(dest.hash) != None:
-                    RNS.log(f"Have ratchet for {RNS.prettyhexrep(dest.hash)}, requesting opportunistic delivery of message", RNS.LOG_DEBUG)
-                    desired_method = LXMF.LXMessage.OPPORTUNISTIC
-
-            dest_is_trusted = False
-            if self.app.directory.trust_level(dest.hash) == DirectoryEntry.TRUSTED:
-                dest_is_trusted = True
-
-            lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method, include_ticket=dest_is_trusted)
             lxm.register_delivery_callback(self.message_notification)
             lxm.register_failed_callback(self.message_notification)
-
-            if self.app.message_router.get_outbound_propagation_node() != None:
-                lxm.try_propagation_on_fail = self.app.try_propagation_on_fail
-
             self.app.message_router.handle_outbound(lxm)
 
             message_path = Conversation.ingest(lxm, self.app, originator=True)
@@ -242,82 +209,16 @@ class Conversation:
             RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
             return False
 
-    def paper_output(self, content="", title="", mode="print_qr"):
-        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)
-
-                if mode == "print_qr":
-                    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
-
-                elif mode == "save_qr":
-                    qr_code = lxm.as_qr()
-                    qr_save_path = self.app.downloads_path+"/LXM_"+str(RNS.hexrep(lxm.hash, delimit=False)+".png")
-                    qr_code.save(qr_save_path)
-                    message_path = Conversation.ingest(lxm, self.app, originator=True)
-                    self.messages.append(ConversationMessage(message_path))
-                    return qr_save_path
-
-                elif mode == "save_uri":
-                    lxm_uri = lxm.as_uri()+"\n"
-                    uri_save_path = self.app.downloads_path+"/LXM_"+str(RNS.hexrep(lxm.hash, delimit=False)+".txt")
-                    with open(uri_save_path, "wb") as f:
-                        f.write(lxm_uri.encode("utf-8"))
-
-                    message_path = Conversation.ingest(lxm, self.app, originator=True)
-                    self.messages.append(ConversationMessage(message_path))
-                    return uri_save_path
-
-                elif mode == "return_uri":
-                    return lxm.as_uri()
-
-            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:
-            if hasattr(message, "stamp_generation_failed") and message.stamp_generation_failed == True:
-                RNS.log(f"Could not send {message} due to a stamp generation failure", RNS.LOG_ERROR)
-            else:
-                RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE)
-                message.try_propagation_on_fail = None
-                message.delivery_attempts = 0
-                if hasattr(message, "next_delivery_attempt"):
-                    del message.next_delivery_attempt
-                message.packed = None
-                message.desired_method = LXMF.LXMessage.PROPAGATED
-                self.app.message_router.handle_outbound(message)
-        else:
         message_path = Conversation.ingest(message, self.app, originator=True)
 
     def __str__(self):
         string = self.source_hash
 
-        # TODO: Remove this
+        if self.source_identity:
-        # if self.source_identity:
+            if self.source_identity.app_data:
-        #     if self.source_identity.app_data:
+                # TODO: Sanitise for viewing
-        #         # TODO: Sanitise for viewing, or just clean this
+                string += " | "+self.source.source_identity.app_data.decode("utf-8")
-        #         string += " | "+self.source_identity.app_data.decode("utf-8")
 
         return string
 
@@ -335,19 +236,13 @@ class ConversationMessage:
             self.lxm = LXMF.LXMessage.unpack_from_file(open(self.file_path, "rb"))
             self.loaded = True
             self.timestamp = self.lxm.timestamp
-            self.sort_timestamp = os.path.getmtime(self.file_path)
 
-            if self.lxm.state > LXMF.LXMessage.GENERATING and self.lxm.state < LXMF.LXMessage.SENT:
+            if self.lxm.state > LXMF.LXMessage.DRAFT and self.lxm.state < LXMF.LXMessage.SENT:
                 found = False
-
                 for pending in nomadnet.NomadNetworkApp.get_shared_instance().message_router.pending_outbound:
                     if pending.hash == self.lxm.hash:
                         found = True
 
-                for pending_id in nomadnet.NomadNetworkApp.get_shared_instance().message_router.pending_deferred_stamps:
-                    if pending_id == self.lxm.hash:
-                        found = True
-
                 if not found:
                     self.lxm.state = LXMF.LXMessage.FAILED
 

nomadnet/Directory.py

@@ -3,72 +3,35 @@ import RNS
 import LXMF
 import time
 import nomadnet
-import threading
 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 = 256
+    ANNOUNCE_STREAM_MAXLENGTH = 64
 
     aspect_filter = "nomadnetwork.node"
     @staticmethod
     def received_announce(destination_hash, announced_identity, app_data):
-        try:
         app = nomadnet.NomadNetworkApp.get_shared_instance()
+        destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
 
-            if not destination_hash in app.ignored_list:
         associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
 
         app.directory.node_announce_received(destination_hash, app_data, associated_peer)
-                app.autoselect_propagation_node()
-                
-            else:
-                RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
-
-        except Exception as e:
-            RNS.log("Error while evaluating LXMF destination announce, ignoring announce.", RNS.LOG_DEBUG)
-            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
 
 
     def __init__(self, app):
         self.directory_entries = {}
         self.announce_stream = []
         self.app = app
-        self.announce_lock = threading.Lock()
         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:
             packed_list = []
             for source_hash in self.directory_entries:
                 e = self.directory_entries[source_hash]
-                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node, e.preferred_delivery, e.identify, e.sort_rank))
+                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node))
 
             directory = {
                 "entry_list": packed_list,
@@ -78,7 +41,6 @@ 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)
 
@@ -92,127 +54,39 @@ class Directory:
 
                 entries = {}
                 for e in unpacked_list:
-
-                    if e[1] == None:
-                        e[1] = "Undefined"
-
                     if len(e) > 3:
                         hosts_node = e[3]
                     else:
                         hosts_node = False
 
-                    if len(e) > 4:
+                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node)
-                        preferred_delivery = e[4]
-                    else:
-                        preferred_delivery = None
-
-                    if len(e) > 5:
-                        identify = e[5]
-                    else:
-                        identify = False
-
-                    if len(e) > 6:
-                        sort_rank = e[6]
-                    else:
-                        sort_rank = None
-
-                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery, identify_on_connect=identify, sort_rank=sort_rank)
 
                 self.directory_entries = entries
 
                 self.announce_stream = unpacked_directory["announce_stream"]
 
+
             except Exception as e:
                 RNS.log("Could not load directory from disk. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
     def lxmf_announce_received(self, source_hash, app_data):
-        with self.announce_lock:
         if app_data != None:
-                if self.app.compact_stream:
-                    try:
-                        remove_announces = []
-                        for announce in self.announce_stream:
-                            if announce[1] == source_hash:
-                                remove_announces.append(announce)
-
-                        for a in remove_announces:
-                            self.announce_stream.remove(a)
-                    
-                    except Exception as e:
-                        RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
-
             timestamp = time.time()
-                self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer"))
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, False))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
                 self.announce_stream.pop()
-
-                if hasattr(self.app, "ui") and self.app.ui != None:
-                    if hasattr(self.app.ui, "main_display"):
             self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
 
     def node_announce_received(self, source_hash, app_data, associated_peer):
-        with self.announce_lock:
         if app_data != None:
-                if self.app.compact_stream:
-                    try:
-                        remove_announces = []
-                        for announce in self.announce_stream:
-                            if announce[1] == source_hash:
-                                remove_announces.append(announce)
-
-                        for a in remove_announces:
-                            self.announce_stream.remove(a)
-                    
-                    except Exception as e:
-                        RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
-
             timestamp = time.time()
-                self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node"))
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, True))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
                 self.announce_stream.pop()
 
             if self.trust_level(associated_peer) == DirectoryEntry.TRUSTED:
-                    existing_entry = self.find(source_hash)
-                    if not existing_entry:
                 node_entry = DirectoryEntry(source_hash, display_name=app_data.decode("utf-8"), trust_level=DirectoryEntry.TRUSTED, hosts_node=True)
                 self.remember(node_entry)
-                
-                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):
-        with self.announce_lock:
-            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:
-                if self.app.compact_stream:
-                    try:
-                        remove_announces = []
-                        for announce in self.announce_stream:
-                            if announce[1] == source_hash:
-                                remove_announces.append(announce)
-
-                        for a in remove_announces:
-                            self.announce_stream.remove(a)
-                    
-                    except Exception as e:
-                        RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
-
-                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") and 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):
@@ -233,37 +107,18 @@ class Directory:
     def simplest_display_str(self, source_hash):
         trust_level = self.trust_level(source_hash)
         if trust_level == DirectoryEntry.WARNING or trust_level == DirectoryEntry.UNTRUSTED:
-            if source_hash in self.directory_entries:
-                dn = self.directory_entries[source_hash].display_name
-                if dn == None:
-                    return RNS.prettyhexrep(source_hash)
-                else:
-                    return dn+" <"+RNS.hexrep(source_hash, delimit=False)+">"
-            else:
             return "<"+RNS.hexrep(source_hash, delimit=False)+">"
         else:
-            if source_hash in self.directory_entries:
-                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)+">"
-
-    def alleged_display_str(self, source_hash):
             if source_hash in self.directory_entries:
                 return self.directory_entries[source_hash].display_name
             else:
-            return None
+                return "<"+RNS.hexrep(source_hash, delimit=False)+">"
-
 
     def trust_level(self, source_hash, announced_display_name=None):
         if source_hash in self.directory_entries:
             if announced_display_name == None:
                 return self.directory_entries[source_hash].trust_level
             else:
-                if not self.directory_entries[source_hash].trust_level == DirectoryEntry.TRUSTED:
                 for entry in self.directory_entries:
                     e = self.directory_entries[entry]
                     if e.display_name == announced_display_name:
@@ -274,36 +129,15 @@ class Directory:
         else:
             return DirectoryEntry.UNKNOWN
 
-    def pn_trust_level(self, source_hash):
-        recalled_identity = RNS.Identity.recall(source_hash)
-        if recalled_identity != None:
-            associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", recalled_identity)
-            return self.trust_level(associated_node)
-
-    def sort_rank(self, source_hash):
-        if source_hash in self.directory_entries:
-            return self.directory_entries[source_hash].sort_rank
-        else:
-            return None
-
-    def preferred_delivery(self, source_hash):
-        if source_hash in self.directory_entries:
-            return self.directory_entries[source_hash].preferred_delivery
-        else:
-            return DirectoryEntry.DIRECT
-
     def remember(self, entry):
         self.directory_entries[entry.source_hash] = entry
 
         identity = RNS.Identity.recall(entry.source_hash)
-        if identity != None:
         associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", identity)
         if associated_node in self.directory_entries:
             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)
@@ -326,18 +160,6 @@ class Directory:
         except Exception as e:
             return False
 
-    def should_identify_on_connect(self, source_hash):
-        if source_hash in self.directory_entries:
-            entry = self.directory_entries[source_hash]
-            return entry.identify
-        else:
-            return False
-
-    def set_identify_on_connect(self, source_hash, state):
-        if source_hash in self.directory_entries:
-            entry = self.directory_entries[source_hash]
-            entry.identify = state
-    
     def known_nodes(self):
         node_list = []
         for eh in self.directory_entries:
@@ -345,7 +167,6 @@ class Directory:
             if e.hosts_node:
                 node_list.append(e)
 
-        node_list.sort(key = lambda e: (e.sort_rank if e.sort_rank != None else 2^32, DirectoryEntry.TRUSTED-e.trust_level, e.display_name if e.display_name != None else "_"))
         return node_list
 
     def number_of_known_nodes(self):
@@ -367,22 +188,14 @@ class DirectoryEntry:
     UNKNOWN   = 0x02
     TRUSTED   = 0xFF
 
-    DIRECT     = 0x01
+    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False):
-    PROPAGATED = 0x02
-
-    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None, identify_on_connect=False, sort_rank=None):
         if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
             self.source_hash  = source_hash
             self.display_name = display_name
-            self.sort_rank = sort_rank
+            if display_name  == None:
-
+                display_name  = source_hash
-            if preferred_delivery == None:
-                self.preferred_delivery = DirectoryEntry.DIRECT
-            else:
-                self.preferred_delivery = preferred_delivery
 
             self.trust_level  = trust_level
             self.hosts_node   = hosts_node
-            self.identify     = identify_on_connect
         else:
             raise TypeError("Attempt to add invalid source hash to directory")

nomadnet/Node.py

@@ -1,6 +1,4 @@
 import os
-import sys
-
 import RNS
 import time
 import threading
@@ -9,19 +7,14 @@ import RNS.vendor.umsgpack as msgpack
 
 class Node:
     JOB_INTERVAL = 5
-    START_ANNOUNCE_DELAY = 6
 
     def __init__(self, app):
         RNS.log("Nomad Network Node starting...", RNS.LOG_VERBOSE)
         self.app = app
         self.identity = self.app.identity
         self.destination = RNS.Destination(self.identity, RNS.Destination.IN, RNS.Destination.SINGLE, "nomadnetwork", "node")
-        self.last_announce = time.time()
+        self.last_announce = None
-        self.last_file_refresh = time.time()
-        self.last_page_refresh = time.time()
         self.announce_interval = self.app.node_announce_interval
-        self.page_refresh_interval = self.app.page_refresh_interval
-        self.file_refresh_interval = self.app.file_refresh_interval
         self.job_interval = Node.JOB_INTERVAL
         self.should_run_jobs = True
         self.app_data = None
@@ -30,30 +23,16 @@ class Node:
         self.register_pages()
         self.register_files()
 
-        self.destination.set_link_established_callback(self.peer_connected)
-
         if self.name == None:
             self.name = self.app.peer_settings["display_name"]+"'s Node"
 
         RNS.log("Node \""+self.name+"\" ready for incoming connections on "+RNS.prettyhexrep(self.destination.hash), RNS.LOG_VERBOSE)
 
         if self.app.node_announce_at_start:
-            def delayed_announce():
-                time.sleep(Node.START_ANNOUNCE_DELAY)
             self.announce()
 
-            da_thread = threading.Thread(target=delayed_announce)
-            da_thread.setDaemon(True)
-            da_thread.start()
-
-        job_thread = threading.Thread(target=self.__jobs)
-        job_thread.setDaemon(True)
-        job_thread.start()
-
 
     def register_pages(self):
-        # TODO: Deregister previously registered pages
-        # that no longer exist.
         self.servedpages = []
         self.scan_pages(self.app.pagespath)
 
@@ -61,18 +40,18 @@ class Node:
             self.destination.register_request_handler(
                 "/page/index.mu",
                 response_generator = self.serve_default_index,
-                allow = RNS.Destination.ALLOW_ALL)
+                allow = RNS.Destination.ALLOW_ALL
+            )
 
         for page in self.servedpages:
             request_path = "/page"+page.replace(self.app.pagespath, "")
             self.destination.register_request_handler(
                 request_path,
                 response_generator = self.serve_page,
-                allow = RNS.Destination.ALLOW_ALL)
+                allow = RNS.Destination.ALLOW_ALL
+            )
 
     def register_files(self):
-        # TODO: Deregister previously registered files
-        # that no longer exist.
         self.servedfiles = []
         self.scan_files(self.app.filespath)
 
@@ -81,15 +60,14 @@ class Node:
             self.destination.register_request_handler(
                 request_path,
                 response_generator = self.serve_file,
-                allow = RNS.Destination.ALLOW_ALL,
+                allow = RNS.Destination.ALLOW_ALL
-                auto_compress = 32_000_000)
+            )
 
     def scan_pages(self, base_path):
         files = [file for file in os.listdir(base_path) if os.path.isfile(os.path.join(base_path, file)) and file[:1] != "."]
         directories = [file for file in os.listdir(base_path) if os.path.isdir(os.path.join(base_path, file)) and file[:1] != "."]
 
         for file in files:
-            if not file.endswith(".allowed"):
             self.servedpages.append(base_path+"/"+file)
 
         for directory in directories:
@@ -105,84 +83,19 @@ class Node:
         for directory in directories:
             self.scan_files(base_path+"/"+directory)
 
-    def serve_page(self, path, data, request_id, link_id, remote_identity, requested_at):
+    def serve_page(self, path, data, request_id, remote_identity, requested_at):
         RNS.log("Page request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_VERBOSE)
-        try:
-            self.app.peer_settings["served_page_requests"] += 1
-            self.app.save_peer_settings()
-            
-        except Exception as e:
-            RNS.log("Could not increase served page request count", RNS.LOG_ERROR)
-
         file_path = path.replace("/page", self.app.pagespath, 1)
-
-        allowed_path = file_path+".allowed"
-        request_allowed = False
-
-        if os.path.isfile(allowed_path):
-            allowed_list = []
-
         try:
-                if os.access(allowed_path, os.X_OK):
-                    allowed_result = subprocess.run([allowed_path], stdout=subprocess.PIPE)
-                    allowed_input = allowed_result.stdout
-
-                else:
-                    fh = open(allowed_path, "rb")
-                    allowed_input = fh.read()
-                    fh.close()
-
-                allowed_hash_strs = allowed_input.splitlines()
-
-                for hash_str in allowed_hash_strs:
-                    if len(hash_str) == RNS.Identity.TRUNCATED_HASHLENGTH//8*2:
-                        try:
-                            allowed_hash = bytes.fromhex(hash_str.decode("utf-8"))
-                            allowed_list.append(allowed_hash)
-
-                        except Exception as e:
-                            RNS.log("Could not decode RNS Identity hash from: "+str(hash_str), RNS.LOG_DEBUG)
-                            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
-
-            except Exception as e:
-                RNS.log("Error while fetching list of allowed identities for request: "+str(e), RNS.LOG_ERROR)
-
-            if hasattr(remote_identity, "hash") and remote_identity.hash in allowed_list:
-                request_allowed = True
-            else:
-                request_allowed = False
-                RNS.log("Denying request, remote identity was not in list of allowed identities", RNS.LOG_VERBOSE)
-
-        else:
-            request_allowed = True
-
-        try:
-            if request_allowed:
             RNS.log("Serving page: "+file_path, RNS.LOG_VERBOSE)
-                if not RNS.vendor.platformutils.is_windows() and os.access(file_path, os.X_OK):
+            if os.access(file_path, os.X_OK):
-                    env_map = {}
+                generated = subprocess.run([file_path], stdout=subprocess.PIPE)
-                    if "PATH" in os.environ:
-                        env_map["PATH"] = os.environ["PATH"]
-                    if link_id != None:
-                        env_map["link_id"] = RNS.hexrep(link_id, delimit=False)
-                    if remote_identity != None:
-                        env_map["remote_identity"] = RNS.hexrep(remote_identity.hash, delimit=False)
-
-                    if data != None and isinstance(data, dict):
-                        for e in data:
-                            if isinstance(e, str) and (e.startswith("field_") or e.startswith("var_")):
-                                env_map[e] = data[e]
-
-                    generated = subprocess.run([file_path], stdout=subprocess.PIPE, env=env_map)
                 return generated.stdout
             else:
                 fh = open(file_path, "rb")
                 response_data = fh.read()
                 fh.close()
                 return response_data
-            else:
-                RNS.log("Request denied", RNS.LOG_VERBOSE)
-                return DEFAULT_NOTALLOWED.encode("utf-8")
 
         except Exception as e:
             RNS.log("Error occurred while handling request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_ERROR)
@@ -192,18 +105,14 @@ class Node:
     # TODO: Improve file handling, this will be slow for large files
     def serve_file(self, path, data, request_id, remote_identity, requested_at):
         RNS.log("File request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_VERBOSE)
-        try:
-            self.app.peer_settings["served_file_requests"] += 1
-            self.app.save_peer_settings()
-            
-        except Exception as e:
-            RNS.log("Could not increase served file request count", RNS.LOG_ERROR)
-
         file_path = path.replace("/file", self.app.filespath, 1)
         file_name = path.replace("/file/", "", 1)
         try:
             RNS.log("Serving file: "+file_path, RNS.LOG_VERBOSE)
-            return [open(file_path, "rb"), {"name": file_name.encode("utf-8")}]
+            fh = open(file_path, "rb")
+            file_data = fh.read()
+            fh.close()
+            return [file_name, file_data]
 
         except Exception as e:
             RNS.log("Error occurred while handling request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_ERROR)
@@ -219,41 +128,20 @@ class Node:
         self.last_announce = time.time()
         self.app.peer_settings["node_last_announce"] = self.last_announce
         self.destination.announce(app_data=self.app_data)
-        self.app.message_router.announce_propagation_node()
 
     def __jobs(self):
         while self.should_run_jobs:
             now = time.time()
             
-            if now > self.last_announce + self.announce_interval*60:
+            if now > self.last_announce + self.announce_interval:
                 self.announce()
 
-            if self.page_refresh_interval > 0:
-                if now > self.last_page_refresh + self.page_refresh_interval*60:
-                    self.register_pages()
-                    self.last_page_refresh = time.time()
-
-            if self.file_refresh_interval > 0:
-                if now > self.last_file_refresh + self.file_refresh_interval*60:
-                    self.register_files()
-                    self.last_file_refresh = time.time()
-
             time.sleep(self.job_interval)
 
-    def peer_connected(self, link):
+    def peer_connected(link):
-        RNS.log("Peer connected to "+str(self.destination), RNS.LOG_VERBOSE)
+        RNS.log("Peer connected to "+str(self.destination), RNS.LOG_INFO)
-        try:
-            self.app.peer_settings["node_connects"] += 1
-            self.app.save_peer_settings()
-
-        except Exception as e:
-            RNS.log("Could not increase node connection count", RNS.LOG_ERROR)
-
         link.set_link_closed_callback(self.peer_disconnected)
 
-    def peer_disconnected(self, link):
-        RNS.log("Peer disconnected from "+str(self.destination), RNS.LOG_VERBOSE)
-        pass
 
 DEFAULT_INDEX = '''>Default Home Page
 
@@ -261,8 +149,3 @@ This node is serving pages, but the home page file (index.mu) was not found in t
 
 If you are the node operator, you can define your own home page by creating a file named `*index.mu`* in the page storage directory.
 '''
-
-DEFAULT_NOTALLOWED = '''>Request Not Allowed
-
-You are not authorised to carry out the request.
-'''

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.1.0"

nomadnet/examples/messageboard/README.md

@@ -1,18 +0,0 @@
-# lxmf_messageboard
-Simple message board that can be hosted on a NomadNet node, messages can be posted by 'conversing' with a unique peer, all messages are then forwarded to the message board.
-
-## How Do I Use It?
-A user can submit messages to the message board by initiating a chat with the message board peer, they are assigned a username (based on the first 5 characters of their address) and their messages are added directly to the message board. The message board can be viewed on a page hosted by a NomadNet node.
-
-An example message board can be found on the reticulum testnet hosted on the SolarExpress Node `<d16df67bff870a8eaa2af6957c5a2d7d>` and the message board peer `<ad713cd3fedf36cc190f0cb89c4be1ff>`
-
-## How Does It Work?
-The message board page itself is hosted on a NomadNet node, you can place the message_board.mu into the pages directory. You can then run the message_board.py script which provides the peer that the users can send messages to. The two parts are joined together using umsgpack and a flat file system similar to NomadNet and Reticulum and runs in the background.
-
-## How Do I Set It Up?
-* Turn on node hosting in NomadNet
-* Put the `message_board.mu` file into `pages` directory in the config file for `NomadNet`. Edit the file to customise from the default page.
-* Run the `message_board.py` script (`python3 message_board.py` either in a `screen` or as a system service), this script uses `NomadNet` and `RNS` libraries and has no additional libraries that need to be installed. Take a note of the message boards address, it is printed on starting the board, you can then place this address in `message_board.mu` file to make it easier for users to interact the board.
-
-## Credits
-* This example application was written and contributed by @chengtripp

nomadnet/examples/messageboard/messageboard.mu

@@ -1,41 +0,0 @@
-#!/bin/python3
-import time
-import os
-import RNS.vendor.umsgpack as msgpack
-
-message_board_peer = 'please_replace'
-userdir = os.path.expanduser("~")
-
-if os.path.isdir("/etc/nomadmb") and os.path.isfile("/etc/nomadmb/config"):
-    configdir = "/etc/nomadmb"
-elif os.path.isdir(userdir+"/.config/nomadmb") and os.path.isfile(userdir+"/.config/nomadmb/config"):
-    configdir = userdir+"/.config/nomadmb"
-else:
-    configdir = userdir+"/.nomadmb"
-
-storagepath  = configdir+"/storage"
-if not os.path.isdir(storagepath):
-    os.makedirs(storagepath)
-
-boardpath = configdir+"/storage/board"
-
-print('`!`F222`Bddd`cNomadNet Message Board')
-
-print('-')
-print('`a`b`f')
-print("")
-print("To add a message to the board just converse with the NomadNet Message Board at `[lxmf@{}]".format(message_board_peer))
-time_string = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))
-print("Last Updated: {}".format(time_string))
-print("")
-print('>Messages')
-print("  Date       Time    Username     Message")
-f = open(boardpath, "rb")
-board_contents = msgpack.unpack(f)
-board_contents.reverse()
-
-for content in board_contents:
-    print("`a{}".format(content.rstrip()))
-    print("")
-
-f.close()

nomadnet/examples/messageboard/messageboard.py

@@ -1,187 +0,0 @@
-# Simple message board that can be hosted on a NomadNet node, messages can be posted by 'conversing' with a unique peer, all messages are then forwarded to the message board.
-# https://github.com/chengtripp/lxmf_messageboard
-
-import RNS
-import LXMF
-import os, time
-from queue import Queue
-import RNS.vendor.umsgpack as msgpack
-
-display_name = "NomadNet Message Board"
-max_messages = 20
-
-def setup_lxmf():
-    if os.path.isfile(identitypath):
-        identity = RNS.Identity.from_file(identitypath)
-        RNS.log('Loaded identity from file', RNS.LOG_INFO)
-    else:
-        RNS.log('No Primary Identity file found, creating new...', RNS.LOG_INFO)
-        identity = RNS.Identity()
-        identity.to_file(identitypath)
-
-    return identity
-
-def lxmf_delivery(message):
-    # Do something here with a received message
-    RNS.log("A message was received: "+str(message.content.decode('utf-8')))
-
-    message_content = message.content.decode('utf-8')
-    source_hash_text = RNS.hexrep(message.source_hash, delimit=False)
-
-    #Create username (just first 5 char of your addr)
-    username = source_hash_text[0:5]
-
-    RNS.log('Username: {}'.format(username), RNS.LOG_INFO)
-
-    time_string = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(message.timestamp))
-    new_message = '{} {}: {}\n'.format(time_string, username, message_content)
-
-    # Push message to board
-    # First read message board (if it exists
-    if os.path.isfile(boardpath):
-        f = open(boardpath, "rb")
-        message_board = msgpack.unpack(f)
-        f.close()
-    else:
-        message_board = []
-
-    #Check we aren't doubling up (this can sometimes happen if there is an error initially and it then gets fixed)
-    if new_message not in message_board:
-        # Append our new message to the list
-        message_board.append(new_message)
-
-    # Prune the message board if needed
-    while len(message_board) > max_messages:
-        RNS.log('Pruning Message Board')
-        message_board.pop(0)
-
-    # Now open the board and write the updated list
-    f = open(boardpath, "wb")
-    msgpack.pack(message_board, f)
-    f.close()
-
-    # Send reply
-    message_reply = '{}_{}_Your message has been added to the messageboard'.format(source_hash_text, time.time())
-    q.put(message_reply)
-
-def announce_now(lxmf_destination):
-    lxmf_destination.announce()
-
-def send_message(destination_hash, message_content):
-    try:
-      # Make a binary destination hash from a hexadecimal string
-      destination_hash = bytes.fromhex(destination_hash)
-
-    except Exception as e:
-      RNS.log("Invalid destination hash", RNS.LOG_ERROR)
-      return
-
-    # Check that size is correct
-    if not len(destination_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8:
-      RNS.log("Invalid destination hash length", RNS.LOG_ERROR)
-
-    else:
-      # Length of address was correct, let's try to recall the
-      # corresponding Identity
-      destination_identity = RNS.Identity.recall(destination_hash)
-
-      if destination_identity == None:
-        # No path/identity known, we'll have to abort or request one
-        RNS.log("Could not recall an Identity for the requested address. You have probably never received an announce from it. Try requesting a path from the network first. In fact, let's do this now :)", RNS.LOG_ERROR)
-        RNS.Transport.request_path(destination_hash)
-        RNS.log("OK, a path was requested. If the network knows a path, you will receive an announce with the Identity data shortly.", RNS.LOG_INFO)
-
-      else:
-        # We know the identity for the destination hash, let's
-        # reconstruct a destination object.
-        lxmf_destination = RNS.Destination(destination_identity, RNS.Destination.OUT, RNS.Destination.SINGLE, "lxmf", "delivery")
-
-        # Create a new message object
-        lxm = LXMF.LXMessage(lxmf_destination, local_lxmf_destination, message_content, title="Reply", desired_method=LXMF.LXMessage.DIRECT)
-
-        # You can optionally tell LXMF to try to send the message
-        # as a propagated message if a direct link fails
-        lxm.try_propagation_on_fail = True
-
-        # Send it
-        message_router.handle_outbound(lxm)
-
-def announce_check():
-    if os.path.isfile(announcepath):
-        f = open(announcepath, "r")
-        announce = int(f.readline())
-        f.close()
-    else:
-        RNS.log('failed to open announcepath', RNS.LOG_DEBUG)
-        announce = 1
-
-    if announce > int(time.time()):
-        RNS.log('Recent announcement', RNS.LOG_DEBUG)
-    else:
-        f = open(announcepath, "w")
-        next_announce = int(time.time()) + 1800
-        f.write(str(next_announce))
-        f.close()
-        announce_now(local_lxmf_destination)
-        RNS.log('Announcement sent, expr set 1800 seconds', RNS.LOG_INFO)
-
-#Setup Paths and Config Files
-userdir = os.path.expanduser("~")
-
-if os.path.isdir("/etc/nomadmb") and os.path.isfile("/etc/nomadmb/config"):
-    configdir = "/etc/nomadmb"
-elif os.path.isdir(userdir+"/.config/nomadmb") and os.path.isfile(userdir+"/.config/nomadmb/config"):
-    configdir = userdir+"/.config/nomadmb"
-else:
-    configdir = userdir+"/.nomadmb"
-
-storagepath  = configdir+"/storage"
-if not os.path.isdir(storagepath):
-    os.makedirs(storagepath)
-
-identitypath = configdir+"/storage/identity"
-announcepath = configdir+"/storage/announce"
-boardpath = configdir+"/storage/board"
-
-# Message Queue
-q = Queue(maxsize = 5)
-
-# Start Reticulum and print out all the debug messages
-reticulum = RNS.Reticulum(loglevel=RNS.LOG_VERBOSE)
-
-# Create a Identity.
-current_identity = setup_lxmf()
-
-# Init the LXMF router
-message_router = LXMF.LXMRouter(identity = current_identity, storagepath = configdir)
-
-# Register a delivery destination (for yourself)
-# In this example we use the same Identity as we used
-# to instantiate the LXMF router. It could be a different one,
-# but it can also just be the same, depending on what you want.
-local_lxmf_destination = message_router.register_delivery_identity(current_identity, display_name=display_name)
-
-# Set a callback for when a message is received
-message_router.register_delivery_callback(lxmf_delivery)
-
-# Announce node properties
-
-RNS.log('LXMF Router ready to receive on: {}'.format(RNS.prettyhexrep(local_lxmf_destination.hash)), RNS.LOG_INFO)
-announce_check()
-
-while True:
-
-    # Work through internal message queue
-    for i in list(q.queue):
-        message_id = q.get()
-        split_message = message_id.split('_')
-        destination_hash = split_message[0]
-        message = split_message[2]
-        RNS.log('{} {}'.format(destination_hash, message), RNS.LOG_INFO)
-        send_message(destination_hash, message)
-
-    # Check whether we need to make another announcement
-    announce_check()
-
-    #Sleep
-    time.sleep(10)

nomadnet/examples/various/input_fields.py

@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-import os
-env_string = ""
-for e in os.environ:
-  env_string += "{}={}\n".format(e, os.environ[e])
-
-template = """>Fields and Submitting Data
-
-Nomad Network let's you use simple input fields for submitting data to node-side applications. Submitted data, along with other session variables will be available to the node-side script / program as environment variables. This page contains a few examples.
-
->> Read Environment Variables
-
-{@ENV}
->>Examples of Fields and Submissions
-
-The following section contains a simple set of fields, and a few different links that submit the field data in different ways.
-
--=
-
-
->>>Text Fields
-An input field    : `B444`<username`Entered data>`b
-
-An masked field   : `B444`<!|password`Value of Field>`b
-
-An small field    : `B444`<8|small`test>`b, and some more text.
-
-Two fields        : `B444`<8|one`One>`b `B444`<8|two`Two>`b
-
-The data can be `!`[submitted`:/page/input_fields.mu`username|two]`!.
-
->> Checkbox Fields
-
-`B444`<?|sign_up|1|*`>`b Sign me up 
-
->> Radio group
-
-Select your favorite color:
-
-`B900`<^|color|Red`>`b  Red
-
-`B090`<^|color|Green`>`b Green
-
-`B009`<^|color|Blue`>`b Blue
-
-
->>> Submitting data
-
-You can `!`[submit`:/page/input_fields.mu`one|password|small|color]`! other fields, or just `!`[a single one`:/page/input_fields.mu`username]`!
-
-Or simply `!`[submit them all`:/page/input_fields.mu`*]`!.
-
-Submission links can also `!`[include pre-configured variables`:/page/input_fields.mu`username|two|entitiy_id=4611|action=view]`!.
-
-Or take all fields and `!`[pre-configured variables`:/page/input_fields.mu`*|entitiy_id=4611|action=view]`!.
-
-Or only `!`[pre-configured variables`:/page/input_fields.mu`entitiy_id=4688|task=something]`!
-
--=
-
-"""
-print(template.replace("{@ENV}", env_string))

nomadnet/nomadnet.py

@@ -2,27 +2,18 @@
 
 from ._version import __version__
 
-import io
 import argparse
 import nomadnet
 
 
-def program_setup(configdir, rnsconfigdir, daemon, console):
+def program_setup(configdir, rnsconfigdir):
-    app = nomadnet.NomadNetworkApp(
+    app = nomadnet.NomadNetworkApp(configdir = configdir, rnsconfigdir = rnsconfigdir)
-        configdir = configdir,
-        rnsconfigdir = rnsconfigdir,
-        daemon = daemon,
-        force_console = console,
-    )
 
 def main():
     try:
         parser = argparse.ArgumentParser(description="Nomad Network Client")
         parser.add_argument("--config", action="store", default=None, help="path to alternative Nomad Network config directory", type=str)
         parser.add_argument("--rnsconfig", action="store", default=None, help="path to alternative Reticulum config directory", type=str)
-        parser.add_argument("-t", "--textui", action="store_true", default=False, help="run Nomad Network in text-UI mode")
-        parser.add_argument("-d", "--daemon", action="store_true", default=False, help="run Nomad Network in daemon mode")
-        parser.add_argument("-c", "--console", action="store_true", default=False, help="in daemon mode, log to console instead of file")
         parser.add_argument("--version", action="version", version="Nomad Network Client {version}".format(version=__version__))
         
         args = parser.parse_args()
@@ -37,18 +28,7 @@ def main():
         else:
             rnsconfigarg = None
 
-        console = False
+        program_setup(configarg, rnsconfigarg)
-        if args.daemon:
-            daemon = True
-            if args.console:
-                console = True
-        else:
-            daemon = False
-
-        if args.textui:
-            daemon = False
-
-        program_setup(configarg, rnsconfigarg, daemon, console)
 
     except KeyboardInterrupt:
         print("")

nomadnet/ui/MenuUI.py

@@ -4,5 +4,5 @@ import nomadnet
 class MenuUI:
 
     def __init__(self):
-        RNS.log("Menu UI not implemented", RNS.LOG_ERROR, _override_destination=True)
+        RNS.log("Menu UI not implemented", RNS.LOG_ERROR)
         nomadnet.panic()

nomadnet/ui/NoneUI.py

@@ -1,19 +0,0 @@
-import RNS
-import nomadnet
-import time
-
-from nomadnet import NomadNetworkApp
-
-class NoneUI:
-
-    def __init__(self):
-        self.app = NomadNetworkApp.get_shared_instance()
-        self.app.ui = self
-
-        if not self.app.force_console_log:
-            RNS.log("Nomad Network started in daemon mode, all further messages are logged to "+str(self.app.logfilepath), RNS.LOG_INFO, _override_destination=True)
-        else:
-            RNS.log("Nomad Network daemon started", RNS.LOG_INFO)
-
-        while True:
-            time.sleep(1)

nomadnet/ui/TextUI.py

@@ -2,7 +2,6 @@ import RNS
 import urwid
 import time
 import os
-import platform
 
 import nomadnet
 from nomadnet.ui.textui import *
@@ -22,9 +21,9 @@ THEMES = {
             # Style name                    # 16-color style                        # Monochrome style          # 88, 256 and true-color style
             ("heading",                     "light gray,underline", "default",      "underline",                "g93,underline", "default"),
             ("menubar",                     "black", "light gray",                  "standout",                 "#111", "#bbb"),
-            ("scrollbar",                   "light gray", "default",                "default",                  "#444", "default"),
+            ("scrollbar",                   "light gray", "default",                "standout",                 "#444", "default"),
             ("shortcutbar",                 "black", "light gray",                  "standout",                 "#111", "#bbb"),
-            ("body_text",                   "light gray", "default",                "default",                  "#ddd", "default"),
+            ("body_text",                   "white", "default",                     "default",                  "#ddd", "default"),
             ("error_text",                  "dark red", "default",                  "default",                  "dark red", "default"),
             ("warning_text",                "yellow", "default",                    "default",                  "#ba4", "default"),
             ("inactive_text",               "dark gray", "default",                 "default",                  "dark gray", "default"),
@@ -33,7 +32,6 @@ THEMES = {
             ("msg_header_ok",               "black", "light green",                 "standout",                 "#111", "#6b2"),
             ("msg_header_caution",          "black", "yellow",                      "standout",                 "#111", "#fd3"),
             ("msg_header_sent",             "black", "light gray",                  "standout",                 "#111", "#ddd"),
-            ("msg_header_propagated",       "black", "light blue",                  "standout",                 "#111", "#28b"),
             ("msg_header_delivered",        "black", "light blue",                  "standout",                 "#111", "#28b"),
             ("msg_header_failed",           "black", "dark gray",                   "standout",                 "#000", "#777"),
             ("msg_warning_untrusted",       "black", "dark red",                    "standout",                 "#111", "dark red"),
@@ -45,20 +43,10 @@ THEMES = {
             ("list_normal",                 "dark gray", "default",                 "default",                  "#bbb", "default"),
             ("list_untrusted",              "dark red", "default",                  "default",                  "#a22", "default"),
             ("list_focus_untrusted",        "black", "light gray",                  "standout",                 "#810", "#aaa"),
-            ("list_unresponsive",           "yellow", "default",                    "default",                  "#b92", "default"),
+            ("topic_list_normal",           "white", "default",                     "default",                  "#ddd", "default"),
-            ("list_focus_unresponsive",     "black", "light gray",                  "standout",                 "#530", "#aaa"),
-            ("topic_list_normal",           "light gray", "default",                "default",                  "#ddd", "default"),
             ("browser_controls",            "light gray", "default",                "default",                  "#bbb", "default"),
             ("progress_full",               "black", "light gray",                  "standout",                 "#111", "#bbb"),
             ("progress_empty",              "light gray", "default",                "default",                  "#ddd", "default"),
-            ("interface_title",             "", "",                                 "default",                  "", ""),
-            ("interface_title_selected",    "bold", "",                             "bold",                     "", ""),
-            ("connected_status",            "dark green", "default",                "default",                  "dark green", "default"),
-            ("disconnected_status",         "dark red", "default",                  "default",                  "dark red", "default"),
-            ("placeholder",                 "dark gray", "default",                 "default",                  "dark gray", "default"),
-            ("placeholder_text",            "dark gray", "default",                 "default",                  "dark gray", "default"),
-            ("error",                       "light red,blink",                      "default", "blink",         "#f44,blink", "default"),
-
         ],        
     },
     THEME_LIGHT: {
@@ -66,9 +54,9 @@ THEMES = {
             # Style name                    # 16-color style                        # Monochrome style          # 88, 256 and true-color style
             ("heading",                     "dark gray,underline", "default",      "underline",                "g93,underline", "default"),
             ("menubar",                     "black", "dark gray",                  "standout",                 "#111", "#bbb"),
-            ("scrollbar",                   "dark gray", "default",                "default",                  "#444", "default"),
+            ("scrollbar",                   "dark gray", "default",                "standout",                 "#444", "default"),
             ("shortcutbar",                 "black", "dark gray",                  "standout",                 "#111", "#bbb"),
-            ("body_text",                   "dark gray", "default",                "default",                  "#222", "default"),
+            ("body_text",                   "black", "default",                    "default",                  "#222", "default"),
             ("error_text",                  "dark red", "default",                 "default",                  "dark red", "default"),
             ("warning_text",                "yellow", "default",                   "default",                  "#ba4", "default"),
             ("inactive_text",               "light gray", "default",               "default",                  "dark gray", "default"),
@@ -77,7 +65,6 @@ THEMES = {
             ("msg_header_ok",               "black", "dark green",                 "standout",                 "#111", "#6b2"),
             ("msg_header_caution",          "black", "yellow",                     "standout",                 "#111", "#fd3"),
             ("msg_header_sent",             "black", "dark gray",                  "standout",                 "#111", "#ddd"),
-            ("msg_header_propagated",       "black", "light blue",                 "standout",                 "#111", "#28b"),
             ("msg_header_delivered",        "black", "light blue",                 "standout",                 "#111", "#28b"),
             ("msg_header_failed",           "black", "dark gray",                  "standout",                 "#000", "#777"),
             ("msg_warning_untrusted",       "black", "dark red",                   "standout",                 "#111", "dark red"),
@@ -89,19 +76,10 @@ THEMES = {
             ("list_normal",                 "dark gray", "default",                "default",                  "#444", "default"),
             ("list_untrusted",              "dark red", "default",                 "default",                  "#a22", "default"),
             ("list_focus_untrusted",        "black", "dark gray",                  "standout",                 "#810", "#aaa"),
-            ("list_unresponsive",           "yellow", "default",                   "default",                  "#b92", "default"),
+            ("topic_list_normal",           "black", "default",                    "default",                  "#222", "default"),
-            ("list_focus_unresponsive",     "black", "light gray",                 "standout",                 "#530", "#aaa"),
-            ("topic_list_normal",           "dark gray", "default",                "default",                  "#222", "default"),
             ("browser_controls",            "dark gray", "default",                "default",                  "#444", "default"),
             ("progress_full",               "black", "dark gray",                  "standout",                 "#111", "#bbb"),
             ("progress_empty",              "dark gray", "default",                "default",                  "#ddd", "default"),
-            ("interface_title",             "dark gray", "default",                "default",                  "#444", "default"),
-            ("interface_title_selected",    "dark gray,bold", "default",           "bold",                     "#444,bold", "default"),
-            ("connected_status",            "dark green", "default",               "default",                  "#4a0", "default"),
-            ("disconnected_status",         "dark red", "default",                 "default",                  "#a22", "default"),
-            ("placeholder",                 "light gray", "default",               "default",                  "#999", "default"),
-            ("placeholder_text",            "light gray", "default",               "default",                  "#999", "default"),
-            ("error",                       "dark red,blink", "default",           "blink",                    "#a22,blink", "default"),
         ],        
     }
 }
@@ -112,13 +90,6 @@ GLYPHSETS = {
     "nerdfont": 3
 }
 
-if platform.system() == "Darwin":
-    urm_char = " \uf0e0"
-    ur_char = "\uf0e0 "
-else:
-    urm_char = " \uf003"
-    ur_char = "\uf003 "
-
 GLYPHS = {
     # Glyph name        # Plain      # Unicode      # Nerd Font
     ("check",           "=",         "\u2713",      "\u2713"),
@@ -131,45 +102,32 @@ GLYPHS = {
     ("arrow_u",         "/\\",       "\u2191",      "\u2191"),
     ("arrow_d",         "\\/",       "\u2193",      "\u2193"),
     ("warning",         "!",         "\u26a0",      "\uf12a"),
-    ("info",            "i",         "\u2139",      "\U000f064e"),
+    ("info",            "i",         "\u2139",      "\ufb4d"),
-    ("unread",          "[!]",       "\u2709",      ur_char),
+    ("unread",          "[U]",       "\u2709",      "\uf003 "),
     ("divider1",        "-",         "\u2504",      "\u2504"),
     ("peer",            "[P]",       "\u24c5 ",     "\uf415"),
-    ("node",            "[N]",       "\u24c3 ",     "\U000f0002"),
+    ("node",            "[N]",       "\u24c3 ",     "\uf502"),
-    ("page",            "",          "\u25a4 ",     "\uf719 "),
+    ("page",            "",          "\u25a4",      "\uf719 "),
-    ("speed",           "",          "\u25F7 ",     "\U000f04c5 "),
+    ("speed",           "",          "\u25F7",      "\uf9c4"),
-    ("decoration_menu", " +",        " +",          " \U000f043b"),
+    ("decoration_menu", "",          "",            " \uf93a"),
-    ("unread_menu",     " !",        " \u2709",     urm_char),
     ("globe",           "",          "",            "\uf484"),
-    ("sent",            "/\\",       "\u2191",      "\U000f0cd8"),
-    ("papermsg",        "P",         "\u25a4",      "\uf719"),
-    ("qrcode",          "QR",        "\u25a4",      "\uf029"),
-    ("selected",        "[*] ",      "\u25CF",      "\u25CF"),
-    ("unselected",      "[ ] ",      "\u25CB",      "\u25CB"),
 }
 
 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
 
+        # TODO: Remove
+        # if importlib.util.find_spec("urwid") != None:
+        #     import urwid
+        # else:
+        #     RNS.log("The text-mode user interface requires Urwid to be installed on your system.", RNS.LOG_ERROR)
+        #     RNS.log("You can install it with the command: pip3 install urwid", RNS.LOG_ERROR)
+        #     nomadnet.panic()
+
         urwid.set_encoding("UTF-8")
 
         intro_timeout  = self.app.config["textui"]["intro_time"]
@@ -181,7 +139,7 @@ class TextUI:
 
         if self.app.config["textui"]["glyphs"] == "plain":
             glyphset = "plain"
-        elif self.app.config["textui"]["glyphs"] == "unicode":
+        elif self.app.config["textui"]["glyphs"] == "unicoode":
             glyphset = "unicode"
         elif self.app.config["textui"]["glyphs"] == "nerdfont":
             glyphset = "nerdfont"
@@ -203,7 +161,7 @@ class TextUI:
         else:
             initial_widget = self.main_display.widget
 
-        self.loop = urwid.MainLoop(initial_widget, unhandled_input=self.unhandled_input, screen=self.screen, handle_mouse=mouse_enabled)
+        self.loop = urwid.MainLoop(initial_widget, screen=self.screen, handle_mouse=mouse_enabled)
 
         if intro_timeout > 0:
             self.loop.set_alarm_in(intro_timeout, self.display_main)
@@ -225,22 +183,12 @@ class TextUI:
 
         self.set_colormode(colormode)
 
-        self.main_display.start()
         self.loop.run()
 
     def set_colormode(self, colormode):
         self.colormode = colormode
         self.screen.set_terminal_properties(colormode)
-        
-        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
-        elif key == "ctrl e":
-            pass
 
     def display_main(self, loop, user_data):
         self.loop.widget = self.main_display.widget

nomadnet/ui/__init__.py

@@ -12,15 +12,11 @@ UI_MENU       = 0x01
 UI_TEXT       = 0x02
 UI_GRAPHICAL  = 0x03
 UI_WEB        = 0x04
-UI_MODES = [UI_NONE, UI_MENU, UI_TEXT, UI_GRAPHICAL, UI_WEB]
+UI_MODES = [UI_MENU, UI_TEXT, UI_GRAPHICAL, UI_WEB]
 
 def spawn(uimode):
     if uimode in UI_MODES:
-        if uimode == UI_NONE:
-            RNS.log("Starting Nomad Network daemon...", RNS.LOG_INFO)
-        else:
         RNS.log("Starting user interface...", RNS.LOG_INFO)
-
         if uimode == UI_MENU:
             from .MenuUI import MenuUI
             return MenuUI()
@@ -33,11 +29,8 @@ def spawn(uimode):
         elif uimode == UI_WEB:
             from .WebUI import WebUI
             return WebUI()
-        elif uimode == UI_NONE:
-            from .NoneUI import NoneUI
-            return NoneUI()
         else:
             return None
     else:
-        RNS.log("Invalid UI mode", RNS.LOG_ERROR, _override_destination=True)
+        RNS.log("Invalid UI mode", RNS.LOG_ERROR)
         nomadnet.panic()

nomadnet/ui/textui/Browser.py

@@ -1,15 +1,11 @@
 import RNS
-import LXMF
-import io
 import os
 import time
 import urwid
-import shutil
 import nomadnet
 import subprocess
 import threading
-from .MicronParser import markup_to_attrmaps, make_style, default_state
+from .MicronParser import markup_to_attrmaps
-from nomadnet.Directory import DirectoryEntry
 from nomadnet.vendor.Scrollable import *
 
 class BrowserFrame(urwid.Frame):
@@ -24,39 +20,14 @@ class BrowserFrame(urwid.Frame):
             self.delegate.reload()
         elif key == "ctrl u":
             self.delegate.url_dialog()
-        elif key == "ctrl s":
+        elif self.get_focus() == "body":
-            self.delegate.save_node_dialog()
-        elif key == "ctrl b":
-            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.focus_position == "body":
-            if key == "down" or key == "up":
-                try:
-                    if hasattr(self.delegate, "page_pile") and self.delegate.page_pile:
-                        def df(loop, user_data):
-                            st = None
-                            nf = self.delegate.page_pile.focus
-                            if hasattr(nf, "key_timeout"):
-                                st = nf
-                            elif hasattr(nf, "original_widget"):
-                                no = nf.original_widget
-                                if hasattr(no, "original_widget"):
-                                    st = no.original_widget
-                                else:
-                                    if hasattr(no, "key_timeout"):
-                                        st = no
-                        
-                            if st and hasattr(st, "key_timeout") and hasattr(st, "keypress") and callable(st.keypress):
-                                st.keypress(None, None)
-
-                        nomadnet.NomadNetworkApp.get_shared_instance().ui.loop.set_alarm_in(0.25, df)
-                
-                except Exception as e:
-                    RNS.log("Error while setting up cursor timeout. The contained exception was: "+str(e), RNS.LOG_ERROR)
-                                        
             return super(BrowserFrame, self).keypress(size, key)
-
+            # if key == "up" and self.delegate.messagelist.top_is_visible:
+            #     nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+            # elif key == "down" and self.delegate.messagelist.bottom_is_visible:
+            #     self.set_focus("footer")
+            # else:
+            #     return super(ConversationFrame, self).keypress(size, key)
         else:
             return super(BrowserFrame, self).keypress(size, key)
 
@@ -86,21 +57,15 @@ class Browser:
         self.aspects = aspects
         self.destination_hash = destination_hash
         self.path = path
-        self.request_data = None
         self.timeout = Browser.DEFAULT_TIMEOUT
         self.last_keypress = None
 
         self.link = None
         self.loopback = None
         self.status = Browser.DISCONECTED
-        self.progress_updated_at = None
-        self.previous_progress = 0
         self.response_progress = 0
-        self.response_speed = None
         self.response_size = None
         self.response_transfer_size = None
-        self.page_background_color = None
-        self.page_foreground_color = None
         self.saved_file_name = None
         self.page_data = None
         self.displayed_page_data = None
@@ -110,7 +75,6 @@ class Browser:
         self.link_target = None
         self.frame = None
         self.attr_maps = []
-        self.page_pile = None
         self.build_display()
 
         self.history = []
@@ -126,8 +90,6 @@ class Browser:
         if self.destination_hash != None:
             self.load_page()
 
-        self.clean_cache()
-
     def current_url(self):
         if self.destination_hash == None:
             return ""
@@ -159,153 +121,22 @@ class Browser:
                 self.browser_footer = self.make_status_widget()
                 self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
                 self.link_status_showing = False
-                if self.page_background_color != None or self.page_foreground_color != None:
-                    style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
-                    self.browser_footer.set_attr_map({None: style_name})
         else:
             self.link_status_showing = True
             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())
-            if self.page_background_color != None or self.page_foreground_color != None:
-                style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
-                self.browser_footer.set_attr_map({None: style_name})
 
-    def expand_shorthands(self, destination_type):
+    def handle_link(self, link_target):
-        if destination_type == "nnn":
-            return "nomadnetwork.node"
-        elif destination_type == "lxmf":
-            return "lxmf.delivery"
-        else:
-            return destination_type
-
-    def handle_link(self, link_target, link_data = None):
-        request_data = None
-        if link_data != None:
-            link_fields = []
-            request_data = {}
-            all_fields = True if "*" in link_data else False
-
-            for e in link_data:
-                if "=" in e:
-                    c = e.split("=")
-                    if len(c) == 2:
-                        request_data["var_"+str(c[0])] = str(c[1])
-                else:
-                    link_fields.append(e)
-
-                def recurse_down(w):
-                    if isinstance(w, list):
-                        for t in w:
-                            recurse_down(t)
-                    elif isinstance(w, tuple):
-                        for t in w:
-                            recurse_down(t)
-                    elif hasattr(w, "contents"):
-                        recurse_down(w.contents)
-                    elif hasattr(w, "original_widget"):
-                        recurse_down(w.original_widget)
-                    elif hasattr(w, "_original_widget"):
-                        recurse_down(w._original_widget)
-                    else:
-                        if hasattr(w, "field_name") and (all_fields or w.field_name in link_fields):
-                            field_key = "field_" + w.field_name
-                            if isinstance(w, urwid.Edit):
-                                request_data[field_key] = w.edit_text
-                            elif isinstance(w, urwid.RadioButton):
-                                if w.state:
-                                    user_data = getattr(w, "field_value", None)  
-                                    if user_data is not None:
-                                        request_data[field_key] = user_data
-                            elif isinstance(w, urwid.CheckBox):
-                                user_data = getattr(w, "field_value", "1")
-                                if w.state:
-                                    existing_value = request_data.get(field_key, '')
-                                    if existing_value:
-                                        # Concatenate the new value with the existing one
-                                        request_data[field_key] = existing_value + ',' + user_data
-                                    else:
-                                        # Initialize the field with the current value
-                                        request_data[field_key] = user_data
-                                else:
-                                    pass  # do nothing if checkbox is not check
-
-
-
-
-                        
-
-                
-            recurse_down(self.attr_maps)
-            RNS.log("Including request data: "+str(request_data), RNS.LOG_DEBUG)
-
-        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)
-                self.browser_footer = urwid.Text("Opening link to: "+str(link_target))
             try:
-                    self.retrieve_url(link_target, request_data)
+                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)
+            RNS.log("Browser aleady hadling 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 = LXMF.display_name_from_app_data(display_name_data)
-
-            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):
@@ -316,11 +147,7 @@ class Browser:
         self.browser_header = urwid.Text("")
         self.browser_footer = urwid.Text("")
 
-        self.page_pile = None
+        self.browser_body = urwid.Filler(urwid.Text("Disconnected\n"+self.g["arrow_l"]+"  "+self.g["arrow_r"], align="center"), "middle")
-        self.browser_body = urwid.Filler(
-            urwid.Text("Disconnected\n"+self.g["arrow_l"]+"  "+self.g["arrow_r"], align=urwid.CENTER),
-            urwid.MIDDLE,
-        )
 
         self.frame = BrowserFrame(self.browser_body, header=self.browser_header, footer=self.browser_footer)
         self.frame.delegate = self
@@ -329,14 +156,7 @@ class Browser:
 
     def make_status_widget(self):
         if self.response_progress > 0:
-            if self.page_background_color != None or self.page_foreground_color != None:
+            pb = ResponseProgressBar("progress_empty" , "progress_full", current=self.response_progress, done=1.0, satt=None)
-                style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
-                style_name_inverted = make_style(default_state(bg=self.page_foreground_color, fg=self.page_background_color))
-            else:
-                style_name = "progress_empty"
-                style_name_inverted = "progress_full"
-
-            pb = ResponseProgressBar(style_name , style_name_inverted, current=self.response_progress, done=1.0, satt=None, owner=self)
             widget = urwid.Pile([urwid.Divider(self.g["divider1"]), pb])
         else:
             widget = urwid.Pile([urwid.Divider(self.g["divider1"]), urwid.Text(self.status_text())])
@@ -354,44 +174,34 @@ class Browser:
             self.update_display()
 
         columns = urwid.Columns([
-            (urwid.WEIGHT, 0.5, urwid.Text(" ")),
+            ("weight", 0.5, urwid.Text(" ")),
             (8, urwid.Button("Back", on_press=back_action)),
-            (urwid.WEIGHT, 0.5, urwid.Text(" ")),
+            ("weight", 0.5, urwid.Text(" "))
         ])
 
         if len(self.attr_maps) > 0:
             pile = urwid.Pile([
-                urwid.Text("!\n\n"+self.status_text()+"\n", align=urwid.CENTER),
+                    urwid.Text("!\n\n"+self.status_text()+"\n", align="center"),
                     columns
             ])
         else:
-            pile = urwid.Pile([urwid.Text("!\n\n"+self.status_text(), align=urwid.CENTER)])
+            pile = urwid.Pile([
+                    urwid.Text("!\n\n"+self.status_text(), align="center")
+            ])
 
-        return urwid.Filler(pile, urwid.MIDDLE)
+        return urwid.Filler(pile, "middle")
     
     def update_display(self):
         if self.status == Browser.DISCONECTED:
             self.display_widget.set_attr_map({None: "inactive_text"})
-            self.page_pile = None
+            self.browser_body = urwid.Filler(urwid.Text("Disconnected\n"+self.g["arrow_l"]+"  "+self.g["arrow_r"], align="center"), "middle")
-            self.browser_body = urwid.Filler(
-                urwid.Text("Disconnected\n"+self.g["arrow_l"]+"  "+self.g["arrow_r"], align=urwid.CENTER),
-                urwid.MIDDLE,
-            )
             self.browser_footer = urwid.Text("")
             self.browser_header = urwid.Text("")
             self.linebox.set_title("Remote Node")
         else:
             self.display_widget.set_attr_map({None: "body_text"})
             self.browser_header = self.make_control_widget()
-            if self.page_background_color != None or self.page_foreground_color != None:
-                style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
-                self.browser_header.set_attr_map({None: style_name})
-
-            if self.destination_hash != None:
             remote_display_string = self.app.directory.simplest_display_str(self.destination_hash)
-            else:
-                remote_display_string = ""
-
             if self.loopback != None and remote_display_string == RNS.prettyhexrep(self.loopback):
                 remote_display_string = self.app.node.name
 
@@ -401,32 +211,16 @@ class Browser:
                 self.browser_footer = self.make_status_widget()
                 self.update_page_display()
             
-                if self.page_background_color != None or self.page_foreground_color != None:
-                    style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
-                    self.browser_body.set_attr_map({None: style_name})
-                    self.browser_footer.set_attr_map({None: style_name})
-                    self.browser_header.set_attr_map({None: style_name})
-                    self.display_widget.set_attr_map({None: style_name})
-            
             elif self.status == Browser.LINK_TIMEOUT:
                 self.browser_body = self.make_request_failed_widget()
                 self.browser_footer = urwid.Text("")
             
             elif self.status <= Browser.REQUEST_SENT:
                 if len(self.attr_maps) == 0:
-                    self.browser_body = urwid.Filler(
+                    self.browser_body = urwid.Filler(urwid.Text("Retrieving\n["+self.current_url()+"]", align="center"), "middle")
-                        urwid.Text("Retrieving\n["+self.current_url()+"]", align=urwid.CENTER),
-                        urwid.MIDDLE,
-                    )
 
                 self.browser_footer = self.make_status_widget()
             
-                if self.page_background_color != None or self.page_foreground_color != None:
-                    style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
-                    self.browser_footer.set_attr_map({None: style_name})
-                    self.browser_header.set_attr_map({None: style_name})
-                    self.display_widget.set_attr_map({None: style_name})
-            
             elif self.status == Browser.REQUEST_FAILED:
                 self.browser_body = self.make_request_failed_widget()
                 self.browser_footer = urwid.Text("")
@@ -444,8 +238,6 @@ class Browser:
 
     def update_page_display(self):
         pile = urwid.Pile(self.attr_maps)
-        pile.automove_cursor_on_scroll = True
-        self.page_pile = pile
         self.browser_body = urwid.AttrMap(ScrollBar(Scrollable(pile, force_forward_keypress=True), thumb_char="\u2503", trough_char=" "), "scrollbar")
 
     def identify(self):
@@ -458,13 +250,9 @@ class Browser:
         if self.link != None:
             self.link.teardown()
         
-        self.request_data = None
         self.attr_maps = []
         self.status = Browser.DISCONECTED
         self.response_progress = 0
-        self.response_speed = None
-        self.progress_updated_at = None
-        self.previous_progress = 0
         self.response_size = None
         self.response_transfer_size = None
 
@@ -476,7 +264,7 @@ class Browser:
         self.update_display()
 
 
-    def retrieve_url(self, url, request_data = None):
+    def retrieve_url(self, url):
         self.previous_destination_hash = self.destination_hash
         self.previous_path = self.path
 
@@ -485,7 +273,7 @@ class Browser:
 
         components = url.split(":")
         if len(components) == 1:
-            if len(components[0]) == (RNS.Reticulum.TRUNCATED_HASHLENGTH//8)*2:
+            if len(components[0]) == 20:
                 try:
                     destination_hash = bytes.fromhex(components[0])
                 except Exception as e:
@@ -494,7 +282,7 @@ class Browser:
             else:
                 raise ValueError("Malformed URL")
         elif len(components) == 2:
-            if len(components[0]) == (RNS.Reticulum.TRUNCATED_HASHLENGTH//8)*2:
+            if len(components[0]) == 20:
                 try:
                     destination_hash = bytes.fromhex(components[0])
                 except Exception as e:
@@ -529,7 +317,6 @@ class Browser:
             else:
                 self.set_destination_hash(destination_hash)
                 self.set_path(path)
-                self.set_request_data(request_data)
                 self.load_page()
 
     def set_destination_hash(self, destination_hash):
@@ -543,8 +330,6 @@ class Browser:
     def set_path(self, path):
         self.path = path
 
-    def set_request_data(self, request_data):
-        self.request_data = request_data
 
     def set_timeout(self, timeout):
         self.timeout = timeout
@@ -575,61 +360,15 @@ class Browser:
 
             self.status = Browser.DONE
             self.response_progress = 0
-            self.response_speed = None
-            self.progress_updated_at = None
-            self.previous_progress = 0
             
         except Exception as e:
             RNS.log("An error occurred while handling file response. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
     def download_file(self, destination_hash, path):
-        if self.link == None or self.link.destination.hash != self.destination_hash:
-            if not RNS.Transport.has_path(self.destination_hash):
-                self.status = Browser.NO_PATH
-                self.update_display()
-
-                RNS.Transport.request_path(self.destination_hash)
-                self.status = Browser.PATH_REQUESTED
-                self.update_display()
-
-                pr_time = time.time()+RNS.Transport.first_hop_timeout(self.destination_hash)
-                while not RNS.Transport.has_path(self.destination_hash):
-                    now = time.time()
-                    if now > pr_time+self.timeout:
-                        self.request_timeout()
-                        return
-
-                    time.sleep(0.25)
-
-            self.status = Browser.ESTABLISHING_LINK
-            self.update_display()
-
-            identity = RNS.Identity.recall(self.destination_hash)
-            destination = RNS.Destination(
-                identity,
-                RNS.Destination.OUT,
-                RNS.Destination.SINGLE,
-                self.app_name,
-                self.aspects
-            )
-
-            self.link = RNS.Link(destination, established_callback = self.link_established, closed_callback = self.link_closed)
-
-            while self.status == Browser.ESTABLISHING_LINK:
-                time.sleep(0.1)
-
-            if self.status != Browser.LINK_ESTABLISHED:
-                return
-
-            self.update_display()
-
         if self.link != None and self.link.destination.hash == self.destination_hash:
             # Send the request
             self.status = Browser.REQUESTING
             self.response_progress = 0
-            self.response_speed = None
-            self.progress_updated_at = None
-            self.previous_progress = 0
             self.response_size = None
             self.response_transfer_size = None
             self.saved_file_name = None
@@ -686,7 +425,7 @@ class Browser:
             self.load_page()
 
     def close_dialogs(self):
-        options = self.delegate.columns.options(urwid.WEIGHT, self.delegate.right_area_width)
+        options = self.delegate.columns.options("weight", self.delegate.right_area_width)
         self.delegate.columns.contents[1] = (self.display_widget, options)
 
     def url_dialog(self):
@@ -696,22 +435,13 @@ class Browser:
             self.close_dialogs()
 
         def confirmed(sender):
-            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(
             urwid.Pile([
                 e_url,
-                urwid.Columns([
+                urwid.Columns([("weight", 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Go", on_press=confirmed))])
-                    (urwid.WEIGHT, 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)),
-                    (urwid.WEIGHT, 0.1, urwid.Text("")),
-                    (urwid.WEIGHT, 0.45, urwid.Button("Go", on_press=confirmed)),
-                ])
             ]), title="Enter URL"
         )
         e_url.confirmed = confirmed
@@ -719,106 +449,22 @@ class Browser:
         dialog.delegate = self
         bottom = self.display_widget
 
-        overlay = urwid.Overlay(
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 65), valign="middle", height="pack", left=2, right=2)
-            dialog,
-            bottom,
-            align=urwid.CENTER,
-            width=(urwid.RELATIVE, 65),
-            valign=urwid.MIDDLE,
-            height=urwid.PACK,
-            left=2,
-            right=2,
-        )
 
-        options = self.delegate.columns.options(urwid.WEIGHT, self.delegate.right_area_width)
+        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 save_node_dialog(self):
-        if self.destination_hash != None:
-            try:
-                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([
-                            (urwid.WEIGHT, 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)),
-                            (urwid.WEIGHT, 0.1, urwid.Text("")),
-                            (urwid.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=urwid.CENTER,
-                    width=(urwid.RELATIVE, 50),
-                    valign=urwid.MIDDLE,
-                    height=urwid.PACK,
-                    left=2,
-                    right=2,
-                )
-
-                options = self.delegate.columns.options(urwid.WEIGHT, self.delegate.right_area_width)
-                self.delegate.columns.contents[1] = (overlay, options)
-                self.delegate.columns.focus_position = 1
-
-            except Exception as e:
-                pass
 
     def load_page(self):
-        if self.request_data == None:
         cached = self.get_cached(self.current_url())
-        else:
-            cached = None
-
         if cached:
             self.status = Browser.DONE
             self.page_data = cached
             self.markup = self.page_data.decode("utf-8")
-            
+            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
-            self.page_background_color = None
-            bgpos = self.markup.find("#!bg=")
-            if bgpos:
-                endpos = self.markup.find("\n", bgpos)
-                if endpos-(bgpos+5) == 3:
-                    bg = self.markup[bgpos+5:endpos]
-                    self.page_background_color = bg
-
-            self.page_foreground_color = None
-            fgpos = self.markup.find("#!fg=")
-            if fgpos:
-                endpos = self.markup.find("\n", fgpos)
-                if endpos-(fgpos+5) == 3:
-                    fg = self.markup[fgpos+5:endpos]
-                    self.page_foreground_color = fg
-
-            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
             
             self.response_progress = 0
-            self.response_speed = None
-            self.progress_updated_at = None
-            self.previous_progress = 0
             self.response_size = None
             self.response_transfer_size = None
             self.saved_file_name = None
@@ -845,15 +491,7 @@ class Browser:
                 page_data = b"The requested local page did not exist in the file system"
                 if os.path.isfile(page_path):
                     if os.access(page_path, os.X_OK):
-                        if self.request_data != None:
+                        generated = subprocess.run([page_path], stdout=subprocess.PIPE)
-                            env_map = self.request_data
-                        else:
-                            env_map = {}
-                            
-                        if "PATH" in os.environ:
-                            env_map["PATH"] = os.environ["PATH"]
-
-                        generated = subprocess.run([page_path], stdout=subprocess.PIPE, env=env_map)
                         page_data = generated.stdout
                     else:
                         file = open(page_path, "rb")
@@ -863,29 +501,9 @@ class Browser:
                 self.status = Browser.DONE
                 self.page_data = page_data
                 self.markup = self.page_data.decode("utf-8")
-                
+                self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
-                self.page_background_color = None
-                bgpos = self.markup.find("#!bg=")
-                if bgpos:
-                    endpos = self.markup.find("\n", bgpos)
-                    if endpos-(bgpos+5) == 3:
-                        bg = self.markup[bgpos+5:endpos]
-                        self.page_background_color = bg
-
-                self.page_foreground_color = None
-                fgpos = self.markup.find("#!fg=")
-                if fgpos:
-                    endpos = self.markup.find("\n", fgpos)
-                    if endpos-(fgpos+5) == 3:
-                        fg = self.markup[fgpos+5:endpos]
-                        self.page_foreground_color = fg
-
-                self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
                 
                 self.response_progress = 0
-                self.response_speed = None
-                self.progress_updated_at = None
-                self.previous_progress = 0
                 self.response_size = None
                 self.response_transfer_size = None
                 self.saved_file_name = None
@@ -904,7 +522,7 @@ class Browser:
     def __load(self):
         # If an established link exists, but it doesn't match the target
         # destination, we close and clear it.
-        if self.link != None and (self.link.destination.hash != self.destination_hash or self.link.status != RNS.Link.ACTIVE):
+        if self.link != None and self.link.destination.hash != self.destination_hash:
             self.link.teardown()
             self.link = None
 
@@ -918,7 +536,7 @@ class Browser:
                 self.status = Browser.PATH_REQUESTED
                 self.update_display()
 
-                pr_time = time.time()+RNS.Transport.first_hop_timeout(self.destination_hash)
+                pr_time = time.time()
                 while not RNS.Transport.has_path(self.destination_hash):
                     now = time.time()
                     if now > pr_time+self.timeout:
@@ -952,9 +570,6 @@ class Browser:
         # Send the request
         self.status = Browser.REQUESTING
         self.response_progress = 0
-        self.response_speed = None
-        self.progress_updated_at = None
-        self.previous_progress = 0
         self.response_size = None
         self.response_transfer_size = None
         self.saved_file_name = None
@@ -963,7 +578,7 @@ class Browser:
         self.update_display()
         receipt = self.link.request(
             self.path,
-            data = self.request_data,
+            data = None,
             response_callback = self.response_received,
             failed_callback = self.request_failed,
             progress_callback = self.response_progressed
@@ -982,10 +597,6 @@ class Browser:
     def link_established(self, link):
         self.status = Browser.LINK_ESTABLISHED
 
-        if self.app.directory.should_identify_on_connect(self.destination_hash):
-            RNS.log("Link established, identifying to remote system...", RNS.LOG_VERBOSE)
-            self.link.identify(self.app.identity)
-
 
     def link_closed(self, link):
         if self.status == Browser.DISCONECTED or self.status == Browser.DONE:
@@ -1000,9 +611,6 @@ class Browser:
     def link_establishment_timeout(self):
         self.status = Browser.LINK_TIMEOUT
         self.response_progress = 0
-        self.response_speed = None
-        self.progress_updated_at = None
-        self.previous_progress = 0
         self.response_size = None
         self.response_transfer_size = None
         self.link = None
@@ -1015,28 +623,8 @@ class Browser:
             self.status = Browser.DONE
             self.page_data = request_receipt.response
             self.markup = self.page_data.decode("utf-8")
-
+            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
-            self.page_background_color = None
-            bgpos = self.markup.find("#!bg=")
-            if bgpos:
-                endpos = self.markup.find("\n", bgpos)
-                if endpos-(bgpos+5) == 3:
-                    bg = self.markup[bgpos+5:endpos]
-                    self.page_background_color = bg
-
-            self.page_foreground_color = None
-            fgpos = self.markup.find("#!fg=")
-            if fgpos:
-                endpos = self.markup.find("\n", fgpos)
-                if endpos-(fgpos+5) == 3:
-                    fg = self.markup[fgpos+5:endpos]
-                    self.page_foreground_color = fg
-
-            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
             self.response_progress = 0
-            self.response_speed = None
-            self.progress_updated_at = None
-            self.previous_progress = 0
             self.loaded_from_cache = False
 
             # Simple header handling. Should be expanded when more
@@ -1109,22 +697,6 @@ class Browser:
                 
         return None
 
-    def clean_cache(self):
-        files = os.listdir(self.app.cachepath)
-        for file in files:
-            cachepath = self.app.cachepath+"/"+file
-            try:
-                components = file.split("_")
-                if len(components) == 2 and len(components[0]) == 64 and len(components[1]) > 0:
-                    expires = float(components[1])
-
-                    if time.time() > expires:
-                        RNS.log("Removing stale cache entry "+str(file), RNS.LOG_DEBUG)
-                        os.unlink(cachepath)
-
-            except Exception as e:
-                pass
-
 
     def cache_page(self, cache_time):
         url_hash = self.url_hash(self.current_url())
@@ -1148,10 +720,8 @@ class Browser:
 
     def file_received(self, request_receipt):
         try:
-            if type(request_receipt.response) == io.BufferedReader:
+            file_name = request_receipt.response[0]
-                if request_receipt.metadata != None:
+            file_data = request_receipt.response[1]
-                    file_name   = os.path.basename(request_receipt.metadata["name"].decode("utf-8"))
-                    file_handle = request_receipt.response
             file_destination = self.app.downloads_path+"/"+file_name
             
             counter = 0
@@ -1159,30 +729,13 @@ class Browser:
                 counter += 1
                 file_destination = self.app.downloads_path+"/"+file_name+"."+str(counter)
 
-                    shutil.move(file_handle.name, file_destination)
-
-            else:
-                file_name = request_receipt.response[0]
-                file_data = request_receipt.response[1]
-                file_destination_name = os.path.basename(file_name)
-                file_destination = self.app.downloads_path+"/"+file_destination_name
-
-                counter = 0
-                while os.path.isfile(file_destination):
-                    counter += 1
-                    file_destination = self.app.downloads_path+"/"+file_destination_name+"."+str(counter)
-
             fh = open(file_destination, "wb")
             fh.write(file_data)
             fh.close()
 
             self.saved_file_name = file_destination.replace(self.app.downloads_path+"/", "", 1)
-                    
             self.status = Browser.DONE
             self.response_progress = 0
-            self.response_speed = None
-            self.progress_updated_at = None
-            self.previous_progress = 0
 
             self.update_display()
         except Exception as e:
@@ -1194,50 +747,26 @@ class Browser:
             if request_receipt.request_id == self.last_request_id:
                 self.status = Browser.REQUEST_FAILED
                 self.response_progress = 0
-                self.response_speed = None
-                self.progress_updated_at = None
-                self.previous_progress = 0
                 self.response_size = None
                 self.response_transfer_size = None
 
                 self.update_display()
-                if self.link != None:
-                    try:
-                        self.link.teardown()
-                    except Exception as e:
-                        pass
         else:
             self.status = Browser.REQUEST_FAILED
             self.response_progress = 0
-            self.response_speed = None
-            self.progress_updated_at = None
-            self.previous_progress = 0
             self.response_size = None
             self.response_transfer_size = None
 
             self.update_display()
-            if self.link != None:
-                try:
-                    self.link.teardown()
-                except Exception as e:
-                    pass
 
 
     def request_timeout(self, request_receipt=None):
         self.status = Browser.REQUEST_TIMEOUT
         self.response_progress = 0
-        self.response_speed = None
-        self.progress_updated_at = None
-        self.previous_progress = 0
         self.response_size = None
         self.response_transfer_size = None
 
         self.update_display()
-        if self.link != None:
-            try:
-                self.link.teardown()
-            except Exception as e:
-                pass
 
 
     def response_progressed(self, request_receipt):
@@ -1245,17 +774,6 @@ class Browser:
         self.response_time          = request_receipt.get_response_time()
         self.response_size          = request_receipt.response_size
         self.response_transfer_size = request_receipt.response_transfer_size
-        
-        now = time.time()
-        if self.progress_updated_at == None: self.progress_updated_at = now
-        if now > self.progress_updated_at+1:
-            td = now - self.progress_updated_at
-            pd = self.response_progress - self.previous_progress
-            bd = pd*self.response_size
-            self.response_speed = (bd/td)*8
-            self.previous_progress = self.response_progress
-            self.progress_updated_at = now
-
         self.update_display()
 
 
@@ -1306,14 +824,8 @@ class Browser:
 
 
 class ResponseProgressBar(urwid.ProgressBar):
-    def __init__(self, empty, full, current=None, done=None, satt=None, owner=None):
-        super().__init__(empty, full, current=current, done=done, satt=satt)
-        self.owner = owner
-
     def get_text(self):
-        if self.owner.response_speed: speed_str = " "+RNS.prettyspeed(self.owner.response_speed)
+        return "Receiving response "+super().get_text()
-        else: speed_str = ""
-        return "Receiving response "+super().get_text().replace(" %", "%")+speed_str
 
 # A convenience function for printing a human-
 # readable file size

nomadnet/ui/textui/Config.py

@@ -12,13 +12,13 @@ class ConfigDisplayShortcuts():
 class ConfigFiller(urwid.WidgetWrap):
     def __init__(self, widget, app):
         self.app = app
-        self.filler = urwid.Filler(widget, urwid.TOP)
+        self.filler = urwid.Filler(widget, "top")
-        super().__init__(self.filler)
+        urwid.WidgetWrap.__init__(self, self.filler)
 
 
     def keypress(self, size, key):
         if key == "up":
-            self.app.ui.main_display.frame.focus_position = "header"
+            self.app.ui.main_display.frame.set_focus("header")
             
         return super(ConfigFiller, self).keypress(size, key)
 
@@ -31,20 +31,12 @@ class ConfigDisplay():
             self.editor_term = EditorTerminal(self.app, self)
             self.widget = urwid.LineBox(self.editor_term)
             self.app.ui.main_display.update_active_sub_display()
-            self.app.ui.main_display.frame.focus_position = "body"
+            self.app.ui.main_display.frame.set_focus("body")
             self.editor_term.term.change_focus(True)
 
         pile = urwid.Pile([
-            urwid.Text(
+            urwid.Text(("body_text", "\nTo change the configuration, edit the config file located at:\n\n"+self.app.configpath+"\n\nRestart Nomad Network for changes to take effect\n"), align="center"),
-                (
+            urwid.Padding(urwid.Button("Open Editor", on_press=open_editor), width=15, align="center"),
-                    "body_text",
-                    "\nTo change the configuration, edit the config file located at:\n\n"
-                    +self.app.configpath
-                    +"\n\nRestart Nomad Network for changes to take effect\n",
-                ),
-                align=urwid.CENTER,
-            ),
-            urwid.Padding(urwid.Button("Open Editor", on_press=open_editor), width=15, align=urwid.CENTER),
         ])
 
         self.config_explainer = ConfigFiller(pile, self.app)
@@ -79,11 +71,11 @@ class EditorTerminal(urwid.WidgetWrap):
 
         urwid.connect_signal(self.term, 'closed', quit_term)
 
-        super().__init__(self.term)
+        urwid.WidgetWrap.__init__(self, self.term)
 
 
     def keypress(self, size, key):
         # TODO: Decide whether there should be a way to get out while editing
         #if key == "up":
-        #    nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header"
+        #    nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")   
         return super(EditorTerminal, self).keypress(size, key)

nomadnet/ui/textui/Conversations.py

@@ -14,13 +14,13 @@ class ConversationListDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        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")
+        self.widget = urwid.AttrMap(urwid.Text("[Enter] Open  [C-e] Peer Info  [C-x] Delete  [C-n] New"), "shortcutbar")
 
 class ConversationDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        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")
+        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-k] Clear Editor  [C-w] Close  [C-t] Editor Type  [C-p] Purge  [C-x] Clear History"), "shortcutbar")
 
 class ConversationsArea(urwid.LineBox):
     def keypress(self, size, key):
@@ -30,16 +30,10 @@ 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.focus_position = "header"
+            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()):
-            self.delegate.app.ui.main_display.frame.focus_position = "header"
+            self.delegate.app.ui.main_display.frame.set_focus("header")
         else:
             return super(ConversationsArea, self).keypress(size, key)
 
@@ -52,13 +46,11 @@ class DialogLineBox(urwid.LineBox):
 
 class ConversationsDisplay():
     list_width = 0.33
-    given_list_width = 52
     cached_conversation_widgets = {}
 
     def __init__(self, app):
         self.app = app
         self.dialog_open = False
-        self.sync_dialog = None
         self.currently_displayed_conversation = None
 
         def disp_list_shortcuts(sender, arg1, arg2):
@@ -69,10 +61,8 @@ class ConversationsDisplay():
 
         self.columns_widget = urwid.Columns(
             [
-                # (urwid.WEIGHT, ConversationsDisplay.list_width, self.listbox),
+                ("weight", ConversationsDisplay.list_width, self.listbox),
-                # (urwid.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),
-                (urwid.WEIGHT, 1, self.make_conversation_widget(None))
             ],
             dividechars=0, focus_column=0, box_columns=[0]
         )
@@ -105,15 +95,12 @@ class ConversationsDisplay():
             highlight_offFocus="list_off_focus"
         )
 
-        self.listbox = ConversationsArea(urwid.Filler(self.ilb, height=urwid.RELATIVE_100), title="Conversations")
+        self.listbox = ConversationsArea(urwid.Filler(self.ilb, height=("relative", 100)))
         self.listbox.delegate = self
 
     def delete_selected_conversation(self):
         self.dialog_open = True
-        item = self.ilb.get_selected_item()
+        source_hash = self.ilb.get_selected_item().source_hash
-        if item == None:
-            return
-        source_hash = item.source_hash
 
         def dismiss_dialog(sender):
             self.update_conversation_list()
@@ -127,42 +114,22 @@ class ConversationsDisplay():
 
         dialog = DialogLineBox(
             urwid.Pile([
-                urwid.Text(
+                urwid.Text("Delete conversation with\n"+self.app.directory.simplest_display_str(bytes.fromhex(source_hash))+"\n", align="center"),
-                    "Delete conversation with\n"+self.app.directory.simplest_display_str(bytes.fromhex(source_hash))+"\n",
+                urwid.Columns([("weight", 0.45, urwid.Button("Yes", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("No", on_press=dismiss_dialog))])
-                    align=urwid.CENTER,
-                ),
-                urwid.Columns([
-                    (urwid.WEIGHT, 0.45, urwid.Button("Yes", on_press=confirmed)),
-                    (urwid.WEIGHT, 0.1, urwid.Text("")),
-                    (urwid.WEIGHT, 0.45, urwid.Button("No", on_press=dismiss_dialog)),
-                ])
             ]), title="?"
         )
         dialog.delegate = self
         bottom = self.listbox
 
-        overlay = urwid.Overlay(
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
-            dialog,
-            bottom,
-            align=urwid.CENTER,
-            width=urwid.RELATIVE_100,
-            valign=urwid.MIDDLE,
-            height=urwid.PACK,
-            left=2,
-            right=2,
-        )
 
-        # options = self.columns_widget.options(urwid.WEIGHT, ConversationsDisplay.list_width)
+        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
-        options = self.columns_widget.options(urwid.GIVEN, ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def edit_selected_in_directory(self):
         g = self.app.ui.glyphs
         self.dialog_open = True
-        item = self.ilb.get_selected_item()
+        source_hash_text = self.ilb.get_selected_item().source_hash
-        if item == None:
-            return
-        source_hash_text = item.source_hash
         display_name = self.ilb.get_selected_item().display_name
         if display_name == None:
             display_name = ""
@@ -177,9 +144,6 @@ class ConversationsDisplay():
         unknown_selected   = True
         trusted_selected   = False
 
-        direct_selected     = True
-        propagated_selected = False
-
         try:
             if self.app.directory.find(bytes.fromhex(source_hash_text)):
                 trust_level = self.app.directory.trust_level(bytes.fromhex(source_hash_text))
@@ -195,11 +159,6 @@ class ConversationsDisplay():
                     untrusted_selected = False
                     unknown_selected   = False
                     trusted_selected   = True
-
-                if self.app.directory.preferred_delivery(bytes.fromhex(source_hash_text)) == DirectoryEntry.PROPAGATED:
-                    direct_selected = False
-                    propagated_selected = True
-                    
         except Exception as e:
             pass
 
@@ -208,10 +167,6 @@ class ConversationsDisplay():
         r_unknown   = urwid.RadioButton(trust_button_group, "Unknown", state=unknown_selected)
         r_trusted   = urwid.RadioButton(trust_button_group, "Trusted", state=trusted_selected)
 
-        method_button_group = []
-        r_direct     = urwid.RadioButton(method_button_group, "Deliver directly", state=direct_selected)
-        r_propagated = urwid.RadioButton(method_button_group, "Use propagation nodes", state=propagated_selected)
-
         def dismiss_dialog(sender):
             self.update_conversation_list()
             self.dialog_open = False
@@ -226,11 +181,7 @@ class ConversationsDisplay():
                 elif r_trusted.state == True:
                     trust_level = DirectoryEntry.TRUSTED
 
-                delivery = DirectoryEntry.DIRECT
+                entry = DirectoryEntry(source_hash, display_name, trust_level)
-                if r_propagated.state == True:
-                    delivery = DirectoryEntry.PROPAGATED
-
-                entry = DirectoryEntry(source_hash, display_name, trust_level, preferred_delivery=delivery)
                 self.app.directory.remember(entry)
                 self.update_conversation_list()
                 self.dialog_open = False
@@ -239,12 +190,9 @@ class ConversationsDisplay():
                 RNS.log("Could not save directory entry. 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=urwid.PACK)
+                    options = dialog_pile.options(height_type="pack")
                     dialog_pile.contents.append((urwid.Text(""), options))
-                    dialog_pile.contents.append((
+                    dialog_pile.contents.append((urwid.Text(("error_text", "Could not save entry. Check your input."), align="center"), options))
-                        urwid.Text(("error_text", "Could not save entry. Check your input."), align=urwid.CENTER),
-                        options,)
-                    )
 
         source_is_known = self.app.directory.is_known(bytes.fromhex(source_hash_text))
         if source_is_known:
@@ -253,23 +201,13 @@ class ConversationsDisplay():
             def query_action(sender, user_data):
                 self.close_conversation_by_hash(user_data)
                 nomadnet.Conversation.query_for_peer(user_data)
-                options = dialog_pile.options(height_type=urwid.PACK)
+                options = dialog_pile.options(height_type="pack")
                 dialog_pile.contents = [
                     (urwid.Text("Query sent"), options),
                     (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([
+            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"])])
-                urwid.Divider(g["divider1"]),
-                urwid.Text(g["info"]+"\n", align=urwid.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=urwid.CENTER,
-                ),
-                query_button,
-                urwid.Divider(g["divider1"]),
-            ])
 
         dialog_pile = urwid.Pile([
             selected_id_widget,
@@ -278,15 +216,8 @@ class ConversationsDisplay():
             r_untrusted,
             r_unknown,
             r_trusted,
-            urwid.Divider(g["divider1"]),
-            r_direct,
-            r_propagated,
             known_section,
-            urwid.Columns([
+            urwid.Columns([("weight", 0.45, urwid.Button("Save", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Back", on_press=dismiss_dialog))])
-                (urwid.WEIGHT, 0.45, urwid.Button("Save", on_press=confirmed)),
-                (urwid.WEIGHT, 0.1, urwid.Text("")),
-                (urwid.WEIGHT, 0.45, urwid.Button("Back", on_press=dismiss_dialog)),
-            ])
         ])
         dialog_pile.error_display = False
 
@@ -294,19 +225,9 @@ class ConversationsDisplay():
         dialog.delegate = self
         bottom = self.listbox
 
-        overlay = urwid.Overlay(
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
-            dialog,
-            bottom,
-            align=urwid.CENTER,
-            width=urwid.RELATIVE_100,
-            valign=urwid.MIDDLE,
-            height=urwid.PACK,
-            left=2,
-            right=2,
-        )
 
-        # options = self.columns_widget.options(urwid.WEIGHT, ConversationsDisplay.list_width)
+        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
-        options = self.columns_widget.options(urwid.GIVEN, ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def new_conversation(self):
@@ -344,7 +265,6 @@ 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)
@@ -354,15 +274,9 @@ class ConversationsDisplay():
                 RNS.log("Could not start conversation. 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=urwid.PACK)
+                    options = dialog_pile.options(height_type="pack")
                     dialog_pile.contents.append((urwid.Text(""), options))
-                    dialog_pile.contents.append((
+                    dialog_pile.contents.append((urwid.Text(("error_text", "Could not start conversation. Check your input."), align="center"), options))
-                        urwid.Text(
-                            ("error_text", "Could not start conversation. Check your input."),
-                            align=urwid.CENTER,
-                        ),
-                        options,
-                    ))
 
         dialog_pile = urwid.Pile([
             e_id,
@@ -372,11 +286,7 @@ class ConversationsDisplay():
             r_unknown,
             r_trusted,
             urwid.Text(""),
-            urwid.Columns([
+            urwid.Columns([("weight", 0.45, urwid.Button("Create", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Back", on_press=dismiss_dialog))])
-                (urwid.WEIGHT, 0.45, urwid.Button("Create", on_press=confirmed)),
-                (urwid.WEIGHT, 0.1, urwid.Text("")),
-                (urwid.WEIGHT, 0.45, urwid.Button("Back", on_press=dismiss_dialog)),
-            ])
         ])
         dialog_pile.error_display = False
 
@@ -384,172 +294,9 @@ class ConversationsDisplay():
         dialog.delegate = self
         bottom = self.listbox
 
-        overlay = urwid.Overlay(
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
-            dialog,
-            bottom,
-            align=urwid.CENTER,
-            width=urwid.RELATIVE_100,
-            valign=urwid.MIDDLE,
-            height=urwid.PACK,
-            left=2,
-            right=2,
-        )
 
-        # options = self.columns_widget.options(urwid.WEIGHT, ConversationsDisplay.list_width)
+        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
-        options = self.columns_widget.options(urwid.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([
-                            (urwid.WEIGHT, 0.6, urwid.Text("")),
-                            (urwid.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=urwid.CENTER,
-                        width=urwid.RELATIVE_100,
-                        valign=urwid.MIDDLE,
-                        height=urwid.PACK,
-                        left=2,
-                        right=2,
-                    )
-
-                    options = self.columns_widget.options(urwid.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([
-                            (urwid.WEIGHT, 0.6, urwid.Text("")),
-                            (urwid.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=urwid.CENTER,
-                        width=urwid.RELATIVE_100,
-                        valign=urwid.MIDDLE,
-                        height=urwid.PACK,
-                        left=2,
-                        right=2,
-                    )
-
-                    options = self.columns_widget.options(urwid.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([
-                            (urwid.WEIGHT, 0.6, urwid.Text("")),
-                            (urwid.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=urwid.CENTER,
-                        width=urwid.RELATIVE_100,
-                        valign=urwid.MIDDLE,
-                        height=urwid.PACK,
-                        left=2,
-                        right=2,
-                    )
-
-                    options = self.columns_widget.options(urwid.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=urwid.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=urwid.CENTER), options))
-
-        dialog_pile = urwid.Pile([
-            e_uri,
-            urwid.Text(""),
-            urwid.Columns([
-                (urwid.WEIGHT, 0.45, urwid.Button("Ingest", on_press=confirmed)),
-                (urwid.WEIGHT, 0.1, urwid.Text("")),
-                (urwid.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=urwid.CENTER,
-            width=urwid.RELATIVE_100,
-            valign=urwid.MIDDLE,
-            height=urwid.PACK,
-            left=2,
-            right=2,
-        )
-
-        options = self.columns_widget.options(urwid.GIVEN, ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def delete_conversation(self, source_hash):
@@ -557,180 +304,18 @@ 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
-        
-        def dismiss_dialog(sender):
-            self.dialog_open = False
-            self.sync_dialog = None
-            self.update_conversation_list()
-            if self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
-                self.app.cancel_lxmf_sync()
-
-        max_messages_group = []
-        r_mall = urwid.RadioButton(max_messages_group, "Download all", state=True)
-        r_mlim = urwid.RadioButton(max_messages_group, "Limit to", state=False)
-        ie_lim = urwid.IntEdit("", 5)
-        rbs = urwid.GridFlow([r_mlim, ie_lim], 12, 1, 0, align=urwid.LEFT)
-
-        def sync_now(sender):
-            limit = None
-            if r_mlim.get_state():
-                limit = ie_lim.value()
-            self.app.request_lxmf_sync(limit)
-            self.update_sync_dialog()
-
-        def cancel_sync(sender):
-            self.app.cancel_lxmf_sync()
-            self.update_sync_dialog()
-
-        cancel_button = urwid.Button("Close", on_press=dismiss_dialog)
-        sync_progress = SyncProgressBar("progress_empty" , "progress_full", current=self.app.get_sync_progress(), done=1.0, satt=None)
-
-        real_sync_button = urwid.Button("Sync Now", on_press=sync_now)
-        hidden_sync_button = urwid.Button("Cancel Sync", on_press=cancel_sync)
-
-        if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
-            sync_button = real_sync_button
-        else:
-            sync_button = hidden_sync_button
-
-        button_columns = urwid.Columns([
-            (urwid.WEIGHT, 0.45, sync_button),
-            (urwid.WEIGHT, 0.1, urwid.Text("")),
-            (urwid.WEIGHT, 0.45, cancel_button),
-        ])
-        real_sync_button.bc = button_columns
-
-        pn_ident = None
-        if self.app.get_default_propagation_node() != None:
-            pn_hash = self.app.get_default_propagation_node()
-            pn_ident = RNS.Identity.recall(pn_hash)
-
-            if pn_ident == None:
-                RNS.log("Propagation node identity is unknown, requesting from network...", RNS.LOG_DEBUG)
-                RNS.Transport.request_path(pn_hash)
-
-        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"]+pn_display_str, align=urwid.CENTER),
-                    urwid.Divider(g["divider1"]),
-                    sync_progress,
-                    urwid.Divider(g["divider1"]),
-                    r_mall,
-                    rbs,
-                    urwid.Text(""),
-                    button_columns
-                ]), title="Message Sync"
-            )
-        else:
-            button_columns = urwid.Columns([
-                (urwid.WEIGHT, 0.45, urwid.Text("" )),
-                (urwid.WEIGHT, 0.1, urwid.Text("")),
-                (urwid.WEIGHT, 0.45, cancel_button),
-            ])
-            dialog = DialogLineBox(
-                urwid.Pile([
-                    urwid.Text(""),
-                    urwid.Text("No trusted nodes found, cannot sync!\n", align=urwid.CENTER),
-                    urwid.Text(
-                        "To synchronise 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=urwid.LEFT,
-                    ),
-                    urwid.Text(""),
-                    button_columns
-                ]), title="Message Sync"
-            )
-
-        dialog.delegate = self
-        dialog.sync_progress = sync_progress
-        dialog.cancel_button = cancel_button
-        dialog.real_sync_button = real_sync_button
-        dialog.hidden_sync_button = hidden_sync_button
-        dialog.bc = button_columns
-
-        self.sync_dialog = dialog
-        bottom = self.listbox
-
-        overlay = urwid.Overlay(
-            dialog,
-            bottom,
-            align=urwid.CENTER,
-            width=urwid.RELATIVE_100,
-            valign=urwid.MIDDLE,
-            height=urwid.PACK,
-            left=2,
-            right=2,
-        )
-
-        # options = self.columns_widget.options(urwid.WEIGHT, ConversationsDisplay.list_width)
-        options = self.columns_widget.options(urwid.GIVEN, ConversationsDisplay.given_list_width)
-        self.columns_widget.contents[0] = (overlay, options)
-
-    def update_sync_dialog(self, loop = None, sender = None):
-        if self.dialog_open and self.sync_dialog != None:
-            self.sync_dialog.sync_progress.set_completion(self.app.get_sync_progress())
-
-            if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
-                self.sync_dialog.bc.contents[0] = (self.sync_dialog.real_sync_button, self.sync_dialog.bc.options(urwid.WEIGHT, 0.45))
-            else:
-                self.sync_dialog.bc.contents[0] = (self.sync_dialog.hidden_sync_button, self.sync_dialog.bc.options(urwid.WEIGHT, 0.45))
-
-            self.app.ui.loop.set_alarm_in(0.2, self.update_sync_dialog)
-
-
     def conversation_list_selection(self, arg1, arg2):
         pass
 
     def update_conversation_list(self):
         ilb_position = self.ilb.get_selected_position()
         self.update_listbox()
-        # options = self.columns_widget.options(urwid.WEIGHT, ConversationsDisplay.list_width)
+        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
-        options = self.columns_widget.options(urwid.GIVEN, ConversationsDisplay.given_list_width)
-        if not (self.dialog_open and self.sync_dialog != None):
         self.columns_widget.contents[0] = (self.listbox, options)
-        else:
-            bottom = self.listbox
-            overlay = urwid.Overlay(
-                self.sync_dialog,
-                bottom,
-                align=urwid.CENTER,
-                width=urwid.RELATIVE_100,
-                valign=urwid.MIDDLE,
-                height=urwid.PACK,
-                left=2,
-                right=2,
-            )
-            self.columns_widget.contents[0] = (overlay, options)
-
         if ilb_position != None:
             self.ilb.select_item(ilb_position)
         nomadnet.NomadNetworkApp.get_shared_instance().ui.loop.draw_screen()
 
-        if self.app.ui.main_display.sub_displays.active_display == self.app.ui.main_display.sub_displays.conversations_display:
         if self.currently_displayed_conversation != None:
             if self.app.conversation_is_unread(self.currently_displayed_conversation):
                 self.app.mark_conversation_read(self.currently_displayed_conversation)
@@ -749,17 +334,16 @@ class ConversationsDisplay():
                 self.app.mark_conversation_read(self.currently_displayed_conversation)
 
         self.currently_displayed_conversation = source_hash
-        # options = self.widget.options(urwid.WEIGHT, 1-ConversationsDisplay.list_width)
+        options = self.widget.options("weight", 1-ConversationsDisplay.list_width)
-        options = self.widget.options(urwid.WEIGHT, 1)
         self.widget.contents[1] = (self.make_conversation_widget(source_hash), options)
         if source_hash == None:
-            self.widget.focus_position = 0
+            self.widget.set_focus_column(0)
         else:
             if self.app.conversation_is_unread(source_hash):
                 self.app.mark_conversation_read(source_hash)
                 self.update_conversation_list()
 
-            self.widget.focus_position = 1
+            self.widget.set_focus_column(1)
             conversation_position = None
             index = 0
             for widget in self.list_widgets:
@@ -838,8 +422,7 @@ class ConversationsDisplay():
 
         if trust_level != DirectoryEntry.TRUSTED:
             display_text += " <"+source_hash+">"
-        
+        else:
-        if trust_level != DirectoryEntry.UNTRUSTED:
             if unread:
                 if source_hash != self.currently_displayed_conversation:
                     display_text += " "+g["unread"]
@@ -891,17 +474,15 @@ 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":
             y = self.get_cursor_coords(size)[1]
             if y == 0:
                 if self.delegate.full_editor_active and self.name == "title_editor":
-                    self.delegate.frame.focus_position = "body"
+                    self.delegate.frame.set_focus("body")
                 elif not self.delegate.full_editor_active and self.name == "content_editor":
-                    self.delegate.frame.focus_position = "body"
+                    self.delegate.frame.set_focus("body")
                 else:
                     return super(MessageEdit, self).keypress(size, key)
             else:
@@ -912,11 +493,11 @@ class MessageEdit(urwid.Edit):
 
 class ConversationFrame(urwid.Frame):
     def keypress(self, size, key):
-        if self.focus_position == "body":
+        if self.get_focus() == "body":
             if key == "up" and self.delegate.messagelist.top_is_visible:
-                nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header"
+                nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
             elif key == "down" and self.delegate.messagelist.bottom_is_visible:
-                self.focus_position = "footer"
+                self.set_focus("footer")
             else:
                 return super(ConversationFrame, self).keypress(size, key)
         elif key == "ctrl k":
@@ -931,7 +512,7 @@ class ConversationWidget(urwid.WidgetWrap):
         if source_hash == None:
             self.frame = None
             display_widget = urwid.LineBox(urwid.Filler(urwid.Text("\n  No conversation selected"), "top"))
-            super().__init__(display_widget)
+            urwid.WidgetWrap.__init__(self, display_widget)
         else:
             if source_hash in ConversationsDisplay.cached_conversation_widgets:
                 return ConversationsDisplay.cached_conversation_widgets[source_hash]
@@ -939,7 +520,6 @@ class ConversationWidget(urwid.WidgetWrap):
                 self.source_hash = source_hash
                 self.conversation = nomadnet.Conversation(source_hash, nomadnet.NomadNetworkApp.get_shared_instance())
                 self.message_widgets = []
-                self.sort_by_timestamp = False
                 self.updating_message_widgets = False
 
                 self.update_message_widgets()
@@ -958,11 +538,7 @@ class ConversationWidget(urwid.WidgetWrap):
 
                 header = None
                 if self.conversation.trust_level == DirectoryEntry.UNTRUSTED:
-                    header = urwid.AttrMap(
+                    header = urwid.AttrMap(urwid.Padding(urwid.Text(g["warning"]+" Warning: Conversation with untrusted peer "+g["warning"], align="center")), "msg_warning_untrusted")
-                        urwid.Padding(
-                            urwid.Text(g["warning"]+" Warning: Conversation with untrusted peer "+g["warning"], align=urwid.CENTER)),
-                        "msg_warning_untrusted",
-                    )
 
                 self.minimal_editor = urwid.AttrMap(msg_editor, "msg_editor")
                 self.minimal_editor.name = "minimal_editor"
@@ -999,7 +575,7 @@ class ConversationWidget(urwid.WidgetWrap):
                     self.frame
                 )
                 
-                super().__init__(self.display_widget)
+                urwid.WidgetWrap.__init__(self, self.display_widget)
 
     def clear_history_dialog(self):
         def dismiss_dialog(sender):
@@ -1014,30 +590,17 @@ class ConversationWidget(urwid.WidgetWrap):
 
         dialog = DialogLineBox(
             urwid.Pile([
-                urwid.Text("Clear conversation history\n", align=urwid.CENTER),
+                urwid.Text("Clear conversation history\n", align="center"),
-                urwid.Columns([
+                urwid.Columns([("weight", 0.45, urwid.Button("Yes", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("No", on_press=dismiss_dialog))])
-                    (urwid.WEIGHT, 0.45, urwid.Button("Yes", on_press=confirmed)),
-                    (urwid.WEIGHT, 0.1, urwid.Text("")),
-                    (urwid.WEIGHT, 0.45, urwid.Button("No", on_press=dismiss_dialog)),
-                ])
             ]), title="?"
         )
         dialog.delegate = self
         bottom = self.messagelist
 
-        overlay = urwid.Overlay(
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=34, valign="middle", height="pack", left=2, right=2)
-            dialog,
-            bottom,
-            align=urwid.CENTER,
-            width=34,
-            valign=urwid.MIDDLE,
-            height=urwid.PACK,
-            left=2,
-            right=2,
-        )
 
         self.frame.contents["body"] = (overlay, self.frame.options())
-        self.frame.focus_position = "body"
+        self.frame.set_focus("body")
     
     def toggle_editor(self):
         if self.full_editor_active:
@@ -1054,17 +617,7 @@ class ConversationWidget(urwid.WidgetWrap):
             if allowed:
                 self.frame.contents["footer"] = (self.minimal_editor, None)
             else:
-                warning = urwid.AttrMap(
+                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")
-                    urwid.Padding(urwid.Text(
-                        "\n"+g["info"]+"\n\nYou cannot currently message this peer, since its identity keys are not known. "
-                                       "The keys have been requested from the network and should arrive shortly, if available. "
-                                       "Close this conversation and reopen it to try again.\n\n"
-                                       "To query the network manually, select this conversation in the conversation list, "
-                                       "press Ctrl-E, and use the query button.\n",
-                        align=urwid.CENTER,
-                    )),
-                    "msg_header_caution",
-                )
                 self.frame.contents["footer"] = (warning, None)
 
     def toggle_focus_area(self):
@@ -1075,27 +628,22 @@ class ConversationWidget(urwid.WidgetWrap):
             pass
 
         if name == "messagelist":
-            self.frame.focus_position = "footer"
+            self.frame.set_focus("footer")
         elif name == "minimal_editor" or name == "full_editor":
-            self.frame.focus_position = "body"
+            self.frame.set_focus("body")
 
     def keypress(self, size, key):
         if key == "tab":
             self.toggle_focus_area()
         elif key == "ctrl w":
             self.close()
-        elif key == "ctrl u":
+        elif key == "ctrl p":
             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)
         else:
             return super(ConversationWidget, self).keypress(size, key)
 
@@ -1116,10 +664,7 @@ class ConversationWidget(urwid.WidgetWrap):
                 message_widget = LXMessageWidget(message)
                 self.message_widgets.append(message_widget)
         
-        if self.sort_by_timestamp:
         self.message_widgets.sort(key=lambda m: m.timestamp, reverse=False)
-        else:
-            self.message_widgets.sort(key=lambda m: m.sort_timestamp, reverse=False)
 
         from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox
         self.messagelist = IndicativeListBox(self.message_widgets, position = len(self.message_widgets)-1)
@@ -1144,127 +689,6 @@ class ConversationWidget(urwid.WidgetWrap):
             else:
                 pass
 
-    def paper_message_saved(self, path):
-        g = self.app.ui.glyphs
-        def dismiss_dialog(sender):
-            self.dialog_open = False
-            self.conversation_changed(None)
-
-        dialog = DialogLineBox(
-            urwid.Pile([
-                urwid.Text("The paper message was saved to:\n\n"+str(path)+"\n", align=urwid.CENTER),
-                urwid.Columns([
-                    (urwid.WEIGHT, 0.6, urwid.Text("")),
-                    (urwid.WEIGHT, 0.4, urwid.Button("OK", on_press=dismiss_dialog)),
-                ])
-            ]), title=g["papermsg"].replace(" ", "")
-        )
-        dialog.delegate = self
-        bottom = self.messagelist
-
-        overlay = urwid.Overlay(dialog, bottom, align=urwid.CENTER, width=60, valign=urwid.MIDDLE, height=urwid.PACK, left=2, right=2)
-
-        self.frame.contents["body"] = (overlay, self.frame.options())
-        self.frame.focus_position = "body"
-
-    def print_paper_message_qr(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 save_paper_message_qr(self):
-        content = self.content_editor.get_edit_text()
-        title = self.title_editor.get_edit_text()
-        if not content == "":
-            output_result = self.conversation.paper_output(content, title, mode="save_qr")
-            if output_result != False:
-                self.clear_editor()
-                self.paper_message_saved(output_result)
-            else:
-                self.paper_message_failed()
-
-    def save_paper_message_uri(self):
-        content = self.content_editor.get_edit_text()
-        title = self.title_editor.get_edit_text()
-        if not content == "":
-            output_result = self.conversation.paper_output(content, title, mode="save_uri")
-            if output_result != False:
-                self.clear_editor()
-                self.paper_message_saved(output_result)
-            else:
-                self.paper_message_failed()
-
-    def paper_message(self):
-        def dismiss_dialog(sender):
-            self.dialog_open = False
-            self.conversation_changed(None)
-
-        def print_qr(sender):
-            dismiss_dialog(self)
-            self.print_paper_message_qr()
-
-        def save_qr(sender):
-            dismiss_dialog(self)
-            self.save_paper_message_qr()
-
-        def save_uri(sender):
-            dismiss_dialog(self)
-            self.save_paper_message_uri()
-
-        dialog = DialogLineBox(
-            urwid.Pile([
-                urwid.Text(
-                    "Select the desired paper message output method.\nSaved files will be written to:\n\n"+str(self.app.downloads_path)+"\n",
-                    align=urwid.CENTER,
-                ),
-                urwid.Columns([
-                    (urwid.WEIGHT, 0.5, urwid.Button("Print QR", on_press=print_qr)),
-                    (urwid.WEIGHT, 0.1, urwid.Text("")),
-                    (urwid.WEIGHT, 0.5, urwid.Button("Save QR", on_press=save_qr)),
-                    (urwid.WEIGHT, 0.1, urwid.Text("")),
-                    (urwid.WEIGHT, 0.5, urwid.Button("Save URI", on_press=save_uri)),
-                    (urwid.WEIGHT, 0.1, urwid.Text("")),
-                    (urwid.WEIGHT, 0.5, urwid.Button("Cancel", on_press=dismiss_dialog))
-                ])
-            ]), title="Create Paper Message"
-        )
-        dialog.delegate = self
-        bottom = self.messagelist
-
-        overlay = urwid.Overlay(dialog, bottom, align=urwid.CENTER, width=60, valign=urwid.MIDDLE, height=urwid.PACK, left=2, right=2)
-
-        self.frame.contents["body"] = (overlay, self.frame.options())
-        self.frame.focus_position = "body"
-
-    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=urwid.CENTER,
-                ),
-                urwid.Columns([
-                    (urwid.WEIGHT, 0.6, urwid.Text("")),
-                    (urwid.WEIGHT, 0.4, urwid.Button("OK", on_press=dismiss_dialog)),
-                ])
-            ]), title="!"
-        )
-        dialog.delegate = self
-        bottom = self.messagelist
-
-        overlay = urwid.Overlay(dialog, bottom, align=urwid.CENTER, width=34, valign=urwid.MIDDLE, height=urwid.PACK, left=2, right=2)
-
-        self.frame.contents["body"] = (overlay, self.frame.options())
-        self.frame.focus_position = "body"
-
     def close(self):
         self.delegate.close_conversation(self)
 
@@ -1274,7 +698,6 @@ class LXMessageWidget(urwid.WidgetWrap):
         app = nomadnet.NomadNetworkApp.get_shared_instance()
         g = app.ui.glyphs
         self.timestamp = message.get_timestamp()
-        self.sort_timestamp = message.sort_timestamp
         time_format = app.time_format
         message_time = datetime.fromtimestamp(self.timestamp)
         encryption_string = ""
@@ -1292,15 +715,6 @@ class LXMessageWidget(urwid.WidgetWrap):
             elif message.lxm.state == LXMF.LXMessage.FAILED:
                 header_style = "msg_header_failed"
                 title_string = g["cross"]+" "+title_string
-            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
             else:
                 header_style = "msg_header_sent"
                 title_string = g["arrow_r"]+" "+title_string
@@ -1323,13 +737,4 @@ class LXMessageWidget(urwid.WidgetWrap):
             urwid.Text("")
         ])
 
-        super().__init__(display_widget)
+        urwid.WidgetWrap.__init__(self, display_widget)
-
-class SyncProgressBar(urwid.ProgressBar):
-    def get_text(self):
-        status = nomadnet.NomadNetworkApp.get_shared_instance().get_sync_status()
-        show_percent = nomadnet.NomadNetworkApp.get_shared_instance().sync_status_show_percent()
-        if show_percent:
-            return status+" "+super().get_text()
-        else:
-            return status

nomadnet/ui/textui/Directory.py

@@ -15,7 +15,7 @@ class DirectoryDisplay():
         ])
 
         self.shortcuts_display = DirectoryDisplayShortcuts(self.app)
-        self.widget = urwid.Filler(pile, urwid.TOP)
+        self.widget = urwid.Filler(pile, 'top')
 
     def shortcuts(self):
         return self.shortcuts_display

nomadnet/ui/textui/Extras.py

@@ -5,15 +5,57 @@ class IntroDisplay():
 
         font = urwid.font.HalfBlock5x4Font()
 
-        big_text = urwid.BigText(("intro_title", self.app.config["textui"]["intro_text"]), font)
+        big_text = urwid.BigText(("intro_title", "Nomad Network"), font)
-        big_text = urwid.Padding(big_text, align=urwid.CENTER, width=urwid.CLIP)
+        big_text = urwid.Padding(big_text, align="center", width="clip")
 
         intro = urwid.Pile([
             big_text,
-            urwid.Text(("Version %s" % (str(self.app.version))), align=urwid.CENTER),
+            urwid.Text(("Version %s" % (str(self.app.version))), align="center"),
             urwid.Divider(),
-            urwid.Text(("-= Starting =- "), align=urwid.CENTER),
+            urwid.Text(("-= Starting =- "), align="center"),
         ])
 
         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/Log.py

@@ -1,11 +1,6 @@
-import os
-import sys
-import itertools
-import mmap
 import urwid
 import nomadnet
 
-
 class LogDisplayShortcuts():
     def __init__(self, app):
         import urwid
@@ -13,115 +8,31 @@ class LogDisplayShortcuts():
 
         self.widget = urwid.AttrMap(urwid.Text(""), "shortcutbar")
 
-
 class LogDisplay():
     def __init__(self, app):
+        import urwid
         self.app = app
+        self.log_term = LogTerminal(self.app)
 
         self.shortcuts_display = LogDisplayShortcuts(self.app)
-        self.widget = None
+        self.widget = urwid.LineBox(self.log_term)
-
-    @property
-    def log_term(self):
-        return self.widget
-
-    def show(self):
-        if self.widget is None:
-            self.widget = log_widget(self.app)
-
-    def kill(self):
-        if self.widget is not None:
-            self.widget.terminate()
-            self.widget = None
         
     def shortcuts(self):
         return self.shortcuts_display
 
-
 class LogTerminal(urwid.WidgetWrap):
     def __init__(self, app):
         self.app = app
         self.log_term = urwid.Terminal(
             ("tail", "-fn50", self.app.logfilepath),
             encoding='utf-8',
-            escape_sequence="up",
+            escape_sequence="up"
-            main_loop=self.app.ui.loop,
         )
-        self.widget = urwid.LineBox(self.log_term)
+        urwid.WidgetWrap.__init__(self, self.log_term)
-        super().__init__(self.widget)
-
-    def terminate(self):
-        self.log_term.terminate()
 
 
     def keypress(self, size, key):
         if key == "up":
-            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header"
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
             
         return super(LogTerminal, self).keypress(size, key)
-
-
-class LogTail(urwid.WidgetWrap):
-    def __init__(self, app):
-        self.app = app
-        self.log_tail = urwid.Text(tail(self.app.logfilepath, 50))
-        self.log = urwid.Scrollable(self.log_tail)
-        self.log.set_scrollpos(-1)
-        self.log_scrollbar = urwid.ScrollBar(self.log)
-        # We have this here because ui.textui.Main depends on this field to kill it
-        self.log_term = None
-
-        super().__init__(self.log_scrollbar)
-
-    def terminate(self):
-        pass
-
-
-def log_widget(app, platform=sys.platform):
-    if platform == "win32":
-        return LogTail(app)
-    else:
-        return LogTerminal(app)
-
-# https://stackoverflow.com/a/34029605/3713120
-def _tail(f_name, n, offset=0):
-    def skip_back_lines(mm: mmap.mmap, numlines: int, startidx: int) -> int:
-        '''Factored out to simplify handling of n and offset'''
-        for _ in itertools.repeat(None, numlines):
-            startidx = mm.rfind(b'\n', 0, startidx)
-            if startidx < 0:
-                break
-        return startidx
-
-    # Open file in binary mode
-    with open(f_name, 'rb') as binf, mmap.mmap(binf.fileno(), 0, access=mmap.ACCESS_READ) as mm:
-        # len(mm) - 1 handles files ending w/newline by getting the prior line
-        startofline = skip_back_lines(mm, offset, len(mm) - 1)
-        if startofline < 0:
-            return []  # Offset lines consumed whole file, nothing to return
-            # If using a generator function (yield-ing, see below),
-            # this should be a plain return, no empty list
-
-        endoflines = startofline + 1  # Slice end to omit offset lines
-
-        # Find start of lines to capture (add 1 to move from newline to beginning of following line)
-        startofline = skip_back_lines(mm, n, startofline) + 1
-
-        # Passing True to splitlines makes it return the list of lines without
-        # removing the trailing newline (if any), so list mimics f.readlines()
-        # return mm[startofline:endoflines].splitlines(True)
-        # If Windows style \r\n newlines need to be normalized to \n
-        return mm[startofline:endoflines].replace(os.linesep.encode(sys.getdefaultencoding()), b'\n').splitlines(True)
-
-
-def tail(f_name, n):
-    """
-    Return the last n lines of a given file name, f_name.
-    Akin to `tail -<n> <f_name>`
-    """
-    def decode(b):
-        return b.decode(encoding)
-
-    encoding = sys.getdefaultencoding()
-    lines = map(decode, _tail(f_name=f_name, n=n))
-    return ''.join(lines)

nomadnet/ui/textui/Main.py

@@ -1,10 +1,10 @@
 import RNS
+import time
 
 from .Network import *
 from .Conversations import *
 from .Directory import *
 from .Config import *
-from .Interfaces import *
 from .Map import *
 from .Log import *
 from .Guide import *
@@ -17,7 +17,6 @@ class SubDisplays():
         self.conversations_display = ConversationsDisplay(self.app)
         self.directory_display = DirectoryDisplay(self.app)
         self.config_display = ConfigDisplay(self.app)
-        self.interface_display = InterfaceDisplay(self.app)
         self.map_display = MapDisplay(self.app)
         self.log_display = LogDisplay(self.app)
         self.guide_display = GuideDisplay(self.app)
@@ -115,14 +114,8 @@ class MainDisplay():
         self.sub_displays.active_display = self.sub_displays.config_display
         self.update_active_sub_display()
 
-    def show_interfaces(self, user_data):
-        self.sub_displays.active_display = self.sub_displays.interface_display
-        self.update_active_sub_display()
-        self.sub_displays.interface_display.start()
-
     def show_log(self, user_data):
         self.sub_displays.active_display = self.sub_displays.log_display
-        self.sub_displays.log_display.show()
         self.update_active_sub_display()
 
     def show_guide(self, user_data):
@@ -132,91 +125,49 @@ class MainDisplay():
     def update_active_sub_display(self):
         self.frame.contents["body"] = (self.sub_displays.active().widget, None)
         self.update_active_shortcuts()
-        if self.sub_displays.active_display != self.sub_displays.log_display:
-            self.sub_displays.log_display.kill()
 
     def update_active_shortcuts(self):
         self.frame.contents["footer"] = (self.sub_displays.active().shortcuts().widget, None)
 
-    def request_redraw(self, extra_delay=0.0):
+    def request_redraw(self):
-        self.app.ui.loop.set_alarm_in(0.25+extra_delay, self.redraw_now)
+        self.app.ui.loop.set_alarm_in(0.25, self.redraw_now)
     
     def redraw_now(self, sender=None, data=None):
-        self.app.ui.loop.screen.clear()
+        self.app.ui.loop.draw_screen()
-        #self.app.ui.loop.draw_screen()
-
-    def start(self):
-        self.menu_display.start()
 
     def quit(self, sender=None):
-        logterm_pid = None
-        if True or RNS.vendor.platformutils.is_android():
-            if self.sub_displays.log_display != None and self.sub_displays.log_display.log_term != None:
-                if self.sub_displays.log_display.log_term.log_term != None:
-                    logterm_pid = self.sub_displays.log_display.log_term.log_term.pid
-                    if logterm_pid != None:
-                        import os, signal
-                        os.kill(logterm_pid, signal.SIGKILL)
-
         raise urwid.ExitMainLoop
 
 
 class MenuColumns(urwid.Columns):
     def keypress(self, size, key):
         if key == "tab" or key == "down":
-            self.handler.frame.focus_position = "body"
+            self.handler.frame.set_focus("body")
 
         return super(MenuColumns, self).keypress(size, key)
 
 class MenuDisplay():
-    UPDATE_INTERVAL = 2
-
     def __init__(self, app, handler):
         self.app = app
-        self.update_interval = MenuDisplay.UPDATE_INTERVAL
+        g = self.app.ui.glyphs
-        self.g = self.app.ui.glyphs
 
-        self.menu_indicator  = urwid.Text("")
+        menu_text            = ("pack", urwid.Text(g["decoration_menu"]))
-
-        menu_text             = (urwid.PACK, self.menu_indicator)
         button_network       = (11, MenuButton("Network", on_press=handler.show_network))
         button_conversations = (17, MenuButton("Conversations", on_press=handler.show_conversations))
         button_directory     = (13, MenuButton("Directory", on_press=handler.show_directory))
         button_map           = (7,  MenuButton("Map", on_press=handler.show_map))
         button_log           = (7,  MenuButton("Log", on_press=handler.show_log))
         button_config        = (10, MenuButton("Config", on_press=handler.show_config))
-        button_interfaces     = (14, MenuButton("Interfaces", on_press=handler.show_interfaces))
         button_guide         = (9,  MenuButton("Guide", on_press=handler.show_guide))
         button_quit          = (8,  MenuButton("Quit", on_press=handler.quit))
 
         # buttons = [menu_text, button_conversations, button_node, button_directory, button_map]
         if self.app.config["textui"]["hide_guide"]:
-            buttons = [menu_text, button_conversations, button_network, button_log, button_interfaces, button_config, button_quit]
+            buttons = [menu_text, button_conversations, button_network, button_log, button_config, button_quit]
         else:
-            buttons = [menu_text, button_conversations, button_network, button_log, button_interfaces, button_config, button_guide, button_quit]
+            buttons = [menu_text, button_conversations, button_network, button_log, button_config, button_guide, button_quit]
 
         columns = MenuColumns(buttons, dividechars=1)
         columns.handler = handler
 
-        self.update_display()
-
         self.widget = urwid.AttrMap(columns, "menubar")
-
-    def start(self):
-        self.update_display_job()
-
-    def update_display_job(self, event = None, sender = None):
-        self.update_display()
-        self.app.ui.loop.set_alarm_in(self.update_interval, self.update_display_job)
-
-    def update_display(self):
-        if self.app.has_unread_conversations():
-            self.indicate_unread()
-        else:
-            self.indicate_normal()
-
-    def indicate_normal(self):
-        self.menu_indicator.set_text(self.g["decoration_menu"])
-
-    def indicate_unread(self):
-        self.menu_indicator.set_text(self.g["unread_menu"])

nomadnet/ui/textui/Map.py

@@ -15,7 +15,7 @@ class MapDisplay():
         ])
 
         self.shortcuts_display = MapDisplayShortcuts(self.app)
-        self.widget = urwid.Filler(pile, urwid.TOP)
+        self.widget = urwid.Filler(pile, 'top')
 
     def shortcuts(self):
         return self.shortcuts_display

nomadnet/ui/textui/MicronParser.py

@@ -1,9 +1,9 @@
 import nomadnet
 import urwid
-import random
 import time
 from urwid.util import is_mouse_press
 from urwid.text_layout import calc_coords
+import re
 
 DEFAULT_FG_DARK  = "ddd"
 DEFAULT_FG_LIGHT = "222"
@@ -31,14 +31,20 @@ SYNTH_SPECS  = {}
 SECTION_INDENT = 2
 INDENT_RIGHT   = 1
 
-def default_state(fg=None, bg=None):
+def markup_to_attrmaps(markup, url_delegate = None):
-    if fg == None: fg = SELECTED_STYLES["plain"]["fg"]
+    global SELECTED_STYLES
-    if bg == None: bg = DEFAULT_BG
+    if nomadnet.NomadNetworkApp.get_shared_instance().config["textui"]["theme"] == nomadnet.ui.TextUI.THEME_DARK:
+        SELECTED_STYLES = STYLES_DARK
+    else:
+        SELECTED_STYLES = STYLES_LIGHT
+
+    attrmaps = []
+
     state = {
         "literal": False,
         "depth": 0,
-        "fg_color": fg,
+        "fg_color": SELECTED_STYLES["plain"]["fg"],
-        "bg_color": bg,
+        "bg_color": DEFAULT_BG,
         "formatting": {
             "bold": False,
             "underline": False,
@@ -48,25 +54,7 @@ def default_state(fg=None, bg=None):
         },
         "default_align": "left",
         "align": "left",
-        "default_fg": fg,
-        "default_bg": bg,
     }
-    return state
-
-def markup_to_attrmaps(markup, url_delegate = None, fg_color=None, bg_color=None):
-    global SELECTED_STYLES
-    if nomadnet.NomadNetworkApp.get_shared_instance().config["textui"]["theme"] == nomadnet.ui.TextUI.THEME_DARK:
-        SELECTED_STYLES = STYLES_DARK
-    else:
-        SELECTED_STYLES = STYLES_LIGHT
-
-    attrmaps = []
-
-    fgc = None; bgc = DEFAULT_BG
-    if bg_color != None: bgc = bg_color
-    if fg_color != None: fgc = fg_color
-
-    state = default_state(fgc, bgc)
 
     # Split entire document into lines for
     # processing.
@@ -74,19 +62,18 @@ def markup_to_attrmaps(markup, url_delegate = None, fg_color=None, bg_color=None
 
     for line in lines:
         if len(line) > 0:
-            display_widgets = parse_line(line, state, url_delegate)
+            display_widget = parse_line(line, state, url_delegate)
         else:
-            display_widgets = [urwid.Text("")]
+            display_widget = urwid.Text("")
         
-        if display_widgets != None and len(display_widgets) != 0:
+        if display_widget != None:
-            for display_widget in display_widgets:
             attrmap = urwid.AttrMap(display_widget, make_style(state))
             attrmaps.append(attrmap)
 
     return attrmaps
 
+
 def parse_line(line, state, url_delegate):
-    pre_escape = False
     if len(line) > 0:
         first_char = line[0]
 
@@ -100,7 +87,6 @@ def parse_line(line, state, url_delegate):
             # Check if the command is an escape
             if first_char == "\\":
                 line = line[1:]
-                pre_escape = True
 
             # Check for comments
             elif first_char == "#":
@@ -138,7 +124,7 @@ def parse_line(line, state, url_delegate):
 
                         heading_style = first_style
                         output.insert(0, " "*left_indent(state))
-                        return [urwid.AttrMap(urwid.Text(output, align=state["align"]), heading_style)]
+                        return urwid.AttrMap(urwid.Text(output, align=state["align"]), heading_style)
                     else:
                         return None
                 else:
@@ -151,85 +137,22 @@ def parse_line(line, state, url_delegate):
                 else:
                     divider_char = "\u2500"
                 if state["depth"] == 0:
-                    return [urwid.Divider(divider_char)]
+                    return urwid.Divider(divider_char)
                 else:
-                    return [urwid.Padding(urwid.Divider(divider_char), left=left_indent(state), right=right_indent(state))]
+                    return urwid.Padding(urwid.Divider(divider_char), left=left_indent(state), right=right_indent(state))
 
-        output = make_output(state, line, url_delegate, pre_escape)
+        output = make_output(state, line, url_delegate)
 
         if output != None:
-            text_only = True
-            for o in output:
-                if not isinstance(o, tuple):
-                    text_only = False
-                    break
-
-            if not text_only:
-                widgets = []
-                for o in output:
-                    if isinstance(o, tuple):
-                        if url_delegate != None:
-                            tw = LinkableText(o, align=state["align"], delegate=url_delegate)
-                            tw.in_columns = True
-                        else:
-                            tw = urwid.Text(o, align=state["align"])
-                        widgets.append((urwid.PACK, tw))
-                    else:
-                        if o["type"] == "field":
-                            fw = o["width"]
-                            fd = o["data"]
-                            fn = o["name"]
-                            fs = o["style"]
-                            fmask = "*" if o["masked"] else None
-                            f = urwid.Edit(caption="", edit_text=fd, align=state["align"], multiline=True, mask=fmask)
-                            f.field_name = fn
-                            fa = urwid.AttrMap(f, fs)
-                            widgets.append((fw, fa))
-                        elif o["type"] == "checkbox":
-                            fn = o["name"]
-                            fv = o["value"]
-                            flabel = o["label"]
-                            fs = o["style"]
-                            fprechecked = o.get("prechecked", False)  
-                            f = urwid.CheckBox(flabel, state=fprechecked)
-                            f.field_name = fn
-                            f.field_value = fv
-                            fa = urwid.AttrMap(f, fs)
-                            widgets.append((urwid.PACK, fa))
-                        elif o["type"] == "radio":
-                            fn = o["name"]
-                            fv = o["value"]
-                            flabel = o["label"]
-                            fs = o["style"]
-                            fprechecked = o.get("prechecked", False)  
-                            if "radio_groups" not in state:
-                                state["radio_groups"] = {}
-                            if fn not in state["radio_groups"]:
-                                state["radio_groups"][fn] = []
-                            group = state["radio_groups"][fn]
-                            f = urwid.RadioButton(group, flabel, state=fprechecked, user_data=fv)
-                            f.field_name = fn
-                            f.field_value = fv
-                            fa = urwid.AttrMap(f, fs)
-                            widgets.append((urwid.PACK, fa))
-
-
-
-
-                columns_widget = urwid.Columns(widgets, dividechars=0)
-                text_widget = columns_widget
-                # text_widget = urwid.Text("<"+output+">", align=state["align"])
-
-            else:
             if url_delegate != None:
                 text_widget = LinkableText(output, align=state["align"], delegate=url_delegate)
             else:
                 text_widget = urwid.Text(output, align=state["align"])
 
             if state["depth"] == 0:
-                return [text_widget]
+                return text_widget
             else:
-                return [urwid.Padding(text_widget, left=left_indent(state), right=right_indent(state))]
+                return urwid.Padding(text_widget, left=left_indent(state), right=right_indent(state))
         else:
             return None
     else:
@@ -262,155 +185,14 @@ def style_to_state(style, state):
 def make_style(state):
     def mono_color(fg, bg):
         return "default"
-
     def low_color(color):
-        try:
+        # TODO: Implement low-color mapper
-            result = "default"
+        return "default"
-            if color == "default":
-                result = "default"
-
-            elif len(color) == 6:
-                r = str(color[0])
-                g = str(color[2])
-                b = str(color[4])
-                color = r+g+b
-
-            if len(color) == 3:
-                t = 7
-
-                if color[0] == "g":
-                    val = int(color[1:2])
-                    if val < 25:
-                        result = "black"
-                    elif val < 50:
-                        result = "dark gray"
-                    elif val < 75:
-                        result = "light gray"
-                    else:
-                        result = "white"
-                else:
-                    r = int(color[0], 16)
-                    g = int(color[1], 16)
-                    b = int(color[2], 16)
-
-                    if r == g == b:
-                        val = int(color[0], 16)*6
-                        if val < 12:
-                            result = "black"
-                        elif val < 50:
-                            result = "dark gray"
-                        elif val < 80:
-                            result = "light gray"
-                        else:
-                            result = "white"
-
-                    else:
-                        if r == b:
-                            if r > g:
-                                if r > t:
-                                    result = "light magenta"
-                                else:
-                                    result = "dark magenta"
-                            else:
-                                if g > t:
-                                    result = "light green"
-                                else:
-                                    result = "dark green"
-                        if b == g:
-                            if b > r:
-                                if b > t:
-                                    result = "light cyan"
-                                else:
-                                    result = "dark cyan"
-                            else:
-                                if r > t:
-                                    result = "light red"
-                                else:
-                                    result = "dark red"
-                        if g == r:
-                            if g > b:
-                                if g > t:
-                                    result = "yellow"
-                                else:
-                                    result = "brown"
-                            else:
-                                if b > t:
-                                    result = "light blue"
-                                else:
-                                    result = "dark blue"
-
-                        if r > g and r > b:
-                            if r > t:
-                                result = "light red"
-                            else:
-                                result = "dark red"
-                        if g > r and g > b:
-                            if g > t:
-                                result = "light green"
-                            else:
-                                result = "dark green"
-                        if b > g and b > r:
-                            if b > t:
-                                result = "light blue"
-                            else:
-                                result = "dark blue"
-
-        except Exception as e:
-            result = "default"
-
-        return result
-
     def high_color(color):
-        def parseval_hex(char):
-            return hex(max(0,min(int(char, 16),16)))[2:]
-
-        def parseval_dec(char):
-            return str(max(0,min(int(char), 9)))
-
         if color == "default":
-            return "default"
-        else:
-            if len(color) == 6:
-                try:
-                    v1 = parseval_hex(color[0])
-                    v2 = parseval_hex(color[1])
-                    v3 = parseval_hex(color[2])
-                    v4 = parseval_hex(color[3])
-                    v5 = parseval_hex(color[4])
-                    v6 = parseval_hex(color[5])
-                    color = "#"+v1+v2+v3+v4+v5+v6
-
-                except Exception as e:
-                    return "default"
-
             return color
-
-            elif len(color) == 3:
-                if color[0] == "g":
-                    try:
-                        v1 = parseval_dec(color[1])
-                        v2 = parseval_dec(color[2])
-
-                    except Exception as e:
-                        return "default"
-
-                    return "g"+v1+v2
-                
         else:
-                    try:
+            return "#"+color
-                        v1 = parseval_hex(color[0])
-                        v2 = parseval_hex(color[1])
-                        v3 = parseval_hex(color[2])
-                        color = v1+v2+v3
-                        
-                    except Exception as e:
-                        return "default"
-
-                    r = color[0]
-                    g = color[1]
-                    b = color[2]
-                    return "#"+r+r+g+g+b+b
-
 
     bold      = state["formatting"]["bold"]
     underline = state["formatting"]["underline"]
@@ -438,7 +220,7 @@ def make_style(state):
 
     return name
 
-def make_output(state, line, url_delegate, pre_escape=False):
+def make_output(state, line, url_delegate):
     output = []
     if state["literal"]:
         if line == "\\`=":
@@ -447,9 +229,8 @@ def make_output(state, line, url_delegate, pre_escape=False):
     else:
         part = ""
         mode = "text"
-        escape = pre_escape
+        escape = False
         skip = 0
-
         for i in range(0, len(line)):
             c = line[i]
             if skip > 0:
@@ -468,20 +249,20 @@ def make_output(state, line, url_delegate, pre_escape=False):
                             state["fg_color"] = color
                             skip = 3
                     elif c == "f":
-                        state["fg_color"] = state["default_fg"]
+                        state["fg_color"] = SELECTED_STYLES["plain"]["fg"]
                     elif c == "B":
                         if len(line) >= i+4:
                             color = line[i+1:i+4]
                             state["bg_color"] = color
                             skip = 3
                     elif c == "b":
-                        state["bg_color"] = state["default_bg"]
+                        state["bg_color"] = DEFAULT_BG
                     elif c == "`":
                         state["formatting"]["bold"]      = False 
                         state["formatting"]["underline"] = False
                         state["formatting"]["italic"]    = False
-                        state["fg_color"] = state["default_fg"]
+                        state["fg_color"] = SELECTED_STYLES["plain"]["fg"]
-                        state["bg_color"] = state["default_bg"]
+                        state["bg_color"] = DEFAULT_BG
                         state["align"] = state["default_align"]
                     elif c == "c":
                         if state["align"] != "center":
@@ -501,100 +282,6 @@ def make_output(state, line, url_delegate, pre_escape=False):
                     elif c == "a":
                         state["align"] = state["default_align"]
 
-                    elif c == '<':
-                        if len(part) > 0:
-                            output.append(make_part(state, part))
-                            part = ""
-                        try:
-                            field_start = i + 1  # position after '<'
-                            backtick_pos = line.find('`', field_start)
-                            if backtick_pos == -1:
-                                pass  # No '`', invalid field
-                            else:
-                                field_content = line[field_start:backtick_pos]
-                                field_masked = False
-                                field_width = 24
-                                field_type = "field"
-                                field_name = field_content
-                                field_value = ""
-                                field_data = ""
-                                field_prechecked = False  
-
-                                # check if field_content contains '|'
-                                if '|' in field_content:
-                                    f_components = field_content.split('|')
-                                    field_flags = f_components[0]
-                                    field_name = f_components[1]
-
-                                    # handle field type indicators
-                                    if '^' in field_flags:
-                                        field_type = "radio"
-                                        field_flags = field_flags.replace("^", "")
-                                    elif '?' in field_flags:
-                                        field_type = "checkbox"
-                                        field_flags = field_flags.replace("?", "")
-                                    elif '!' in field_flags:
-                                        field_flags = field_flags.replace("!", "")
-                                        field_masked = True
-
-                                    # Handle field width
-                                    if len(field_flags) > 0:
-                                        try:
-                                            field_width = min(int(field_flags), 256)
-                                        except ValueError:
-                                            pass  # Ignore invalid width
-
-                                    # Check for value and pre-checked flag
-                                    if len(f_components) > 2:
-                                        field_value = f_components[2]
-                                    else:
-                                        field_value = ""
-                                    if len(f_components) > 3:
-                                        if f_components[3] == '*':
-                                            field_prechecked = True
-
-                                else:
-                                    # No '|', so field_name is field_content
-                                    field_name = field_content
-                                    field_type = "field"
-                                    field_masked = False
-                                    field_width = 24
-                                    field_value = ""
-                                    field_prechecked = False
-
-                                # Find the closing '>' character
-                                field_end = line.find('>', backtick_pos)
-                                if field_end == -1:
-                                    pass  # No closing '>', invalid field
-                                else:
-                                    field_data = line[backtick_pos+1:field_end]
-
-                                    # Now, we have all field data
-                                    if field_type in ["checkbox", "radio"]:
-                                        # for checkboxes and radios, field_data is the label
-                                        output.append({
-                                            "type": field_type,
-                                            "name": field_name,
-                                            "value": field_value if field_value else field_data,
-                                            "label": field_data,
-                                            "prechecked": field_prechecked,
-                                            "style": make_style(state)
-                                        })
-                                    else:
-                                        # For text fields field_data is the initial text
-                                        output.append({
-                                            "type": "field",
-                                            "name": field_name,
-                                            "width": field_width,
-                                            "masked": field_masked,
-                                            "data": field_data,
-                                            "style": make_style(state)
-                                        })
-                                    skip = field_end - i
-                        except Exception as e:
-                            pass
-
-                    
                     elif c == "[":
                         endpos = line[i:].find("]")
                         if endpos == -1:
@@ -606,20 +293,13 @@ def make_output(state, line, url_delegate, pre_escape=False):
                             link_components = link_data.split("`")
                             if len(link_components) == 1:
                                 link_label = ""
-                                link_fields = ""
                                 link_url = link_data
                             elif len(link_components) == 2:
                                 link_label = link_components[0]
                                 link_url = link_components[1]
-                                link_fields = ""
-                            elif len(link_components) == 3:
-                                link_label = link_components[0]
-                                link_url = link_components[1]
-                                link_fields = link_components[2]
                             else:
                                 link_url = ""
                                 link_label = ""
-                                link_fields = ""
 
                             if len(link_url) != 0:
                                 if link_label == "":
@@ -647,11 +327,6 @@ def make_output(state, line, url_delegate, pre_escape=False):
 
                                 if url_delegate != None:
                                     linkspec = LinkSpec(link_url, orig_spec)
-                                    if link_fields != "":
-                                        lf = link_fields.split("|")
-                                        if len(lf) > 0:
-                                            linkspec.link_fields = lf
-
                                     output.append((linkspec, link_label))
                                 else:
                                     output.append(make_part(state, link_label)) 
@@ -664,10 +339,6 @@ def make_output(state, line, url_delegate, pre_escape=False):
 
                 elif mode == "text":
                     if c == "\\":
-                        if escape:
-                            part += c
-                            escape = False
-                        else:
                         escape = True
                     elif c == "`":
                         if escape:
@@ -680,7 +351,6 @@ def make_output(state, line, url_delegate, pre_escape=False):
                                 part = ""
                     else:
                         part += c
-                        escape = False
 
             if i == len(line)-1:
                 if len(part) > 0:
@@ -695,9 +365,8 @@ def make_output(state, line, url_delegate, pre_escape=False):
 class LinkSpec(urwid.AttrSpec):
     def __init__(self, link_target, orig_spec):
         self.link_target = link_target
-        self.link_fields = None
 
-        super().__init__(orig_spec.foreground, orig_spec.background)
+        urwid.AttrSpec.__init__(self, orig_spec.foreground, orig_spec.background)
 
 
 class LinkableText(urwid.Text):
@@ -707,17 +376,17 @@ class LinkableText(urwid.Text):
     signals = ["click", "change"]
 
     def __init__(self, text, align=None, cursor_position=0, delegate=None):
-        super().__init__(text, align=align)
+        self.__super.__init__(text, align=align)
         self.delegate = delegate
         self._cursor_position = 0
         self.key_timeout = 3
-        self.in_columns = False
         if self.delegate != None:
             self.delegate.last_keypress = 0
 
-    def handle_link(self, link_target, link_fields):
+    def handle_link(self, link_target):
         if self.delegate != None:
-            self.delegate.handle_link(link_target, link_fields)
+            self.delegate.handle_link(link_target)
+
 
     def find_next_part_pos(self, pos, part_positions):
         for position in part_positions:
@@ -775,7 +444,7 @@ class LinkableText(urwid.Text):
             item = self.find_item_at_pos(self._cursor_position)
             if item != None:
                 if isinstance(item, LinkSpec):
-                    self.handle_link(item.link_target, item.link_fields)
+                    self.handle_link(item.link_target)
 
         elif key == "up":
             self._cursor_position = 0
@@ -786,23 +455,11 @@ class LinkableText(urwid.Text):
             return key
         
         elif key == "right":
-            old = self._cursor_position
             self._cursor_position = self.find_next_part_pos(self._cursor_position, part_positions)
-
-            if self._cursor_position == old:
-                if self.in_columns:
-                    return "right"
-                else:
-                    self._cursor_position = 0
-                    return "down"
-
             self._invalidate()
         
         elif key == "left":
             if self._cursor_position > 0:
-                if self.in_columns:
-                    return "left"
-                else:
                 self._cursor_position = self.find_prev_part_pos(self._cursor_position, part_positions)
                 self._invalidate()
 
@@ -818,7 +475,7 @@ class LinkableText(urwid.Text):
 
     def render(self, size, focus=False):
         now = time.time()
-        c = super().render(size, focus)
+        c = self.__super.render(size, focus)
 
         if focus and (self.delegate == None or now < self.delegate.last_keypress+self.key_timeout):
             c = urwid.CompositeCanvas(c)
@@ -840,45 +497,17 @@ class LinkableText(urwid.Text):
             return x, y
 
     def mouse_event(self, size, event, button, x, y, focus):
-        try:
         if button != 1 or not is_mouse_press(event):
             return False
         else:
-                (maxcol,) = size
+            pos = (y * size[0]) + x
-                translation = self.get_line_translation(maxcol)
-                line_offset = 0
-
-                if self.align == "center":
-                    line_offset = translation[y][1][1]-translation[y][0][0]
-                    if x < translation[y][0][0]:
-                        x = translation[y][0][0]
-
-                    if x > translation[y][1][0]+translation[y][0][0]:
-                        x = translation[y][1][0]+translation[y][0][0]
-
-                elif self.align == "right":
-                    line_offset = translation[y][1][1]-translation[y][0][0]
-                    if x < translation[y][0][0]:
-                        x = translation[y][0][0]
-
-                else:
-                    line_offset = translation[y][0][1]
-                    if x > translation[y][0][0]:
-                        x = translation[y][0][0]
-
-                pos = line_offset+x
-
             self._cursor_position = pos
             item = self.find_item_at_pos(self._cursor_position)
-
             if item != None:
                 if isinstance(item, LinkSpec):
-                        self.handle_link(item.link_target, item.link_fields)
+                    self.handle_link(item.link_target)
 
             self._invalidate()
             self._emit("change")
             
             return True
-            
-        except Exception as e:
-            return False

nomadnet/vendor/AsciiChart.py

@@ -1,91 +0,0 @@
-from __future__ import division
-from math import ceil, floor, isnan
-# Derived from asciichartpy |  https://github.com/kroitor/asciichart/blob/master/asciichartpy/__init__.py
-class AsciiChart:
-    def __init__(self, glyphset="unicode"):
-        self.symbols = ['┼', '┤', '╶', '╴', '─', '╰', '╭', '╮', '╯', '│']
-        if glyphset == "plain":
-            self.symbols = ['+', '|', '-', '-', '-', '\'', ',', '.', '`', '|']
-    def plot(self, series, cfg=None):
-        if len(series) == 0:
-            return ''
-        if not isinstance(series[0], list):
-            if all(isnan(n) for n in series):
-                return ''
-            else:
-                series = [series]
-        cfg = cfg or {}
-        minimum = cfg.get('min', min(filter(lambda n: not isnan(n), [j for i in series for j in i])))
-        maximum = cfg.get('max', max(filter(lambda n: not isnan(n), [j for i in series for j in i])))
-        symbols = cfg.get('symbols', self.symbols)
-        if minimum > maximum:
-            raise ValueError('The min value cannot exceed the max value.')
-        interval = maximum - minimum
-        offset = cfg.get('offset', 3)
-        height = cfg.get('height', interval)
-        ratio = height / interval if interval > 0 else 1
-
-        min2 = int(floor(minimum * ratio))
-        max2 = int(ceil(maximum * ratio))
-
-        def clamp(n):
-            return min(max(n, minimum), maximum)
-
-        def scaled(y):
-            return int(round(clamp(y) * ratio) - min2)
-
-        rows = max2 - min2
-
-        width = 0
-        for i in range(0, len(series)):
-            width = max(width, len(series[i]))
-        width += offset
-
-        placeholder = cfg.get('format', '{:8.2f} ')
-
-        result = [[' '] * width for i in range(rows + 1)]
-
-        for y in range(min2, max2 + 1):
-            if callable(placeholder):
-                label = placeholder(maximum - ((y - min2) * interval / (rows if rows else 1))).rjust(12)
-            else:
-                label = placeholder.format(maximum - ((y - min2) * interval / (rows if rows else 1)))
-
-            result[y - min2][max(offset - len(label), 0)] = label
-            result[y - min2][offset - 1] = symbols[0] if y == 0 else symbols[1]
-
-        d0 = series[0][0]
-        if not isnan(d0):
-            result[rows - scaled(d0)][offset - 1] = symbols[0]
-
-        for i in range(0, len(series)):
-            for x in range(0, len(series[i]) - 1):
-                d0 = series[i][x + 0]
-                d1 = series[i][x + 1]
-
-                if isnan(d0) and isnan(d1):
-                    continue
-
-                if isnan(d0) and not isnan(d1):
-                    result[rows - scaled(d1)][x + offset] = symbols[2]
-                    continue
-
-                if not isnan(d0) and isnan(d1):
-                    result[rows - scaled(d0)][x + offset] = symbols[3]
-                    continue
-
-                y0 = scaled(d0)
-                y1 = scaled(d1)
-                if y0 == y1:
-                    result[rows - y0][x + offset] = symbols[4]
-                    continue
-
-                result[rows - y1][x + offset] = symbols[5] if y0 > y1 else symbols[6]
-                result[rows - y0][x + offset] = symbols[7] if y0 > y1 else symbols[8]
-
-                start = min(y0, y1) + 1
-                end = max(y0, y1)
-                for y in range(start, end):
-                    result[rows - y][x + offset] = symbols[9]
-
-        return '\n'.join([''.join(row).rstrip() for row in result])

nomadnet/vendor/Scrollable.py

@@ -50,7 +50,7 @@ class Scrollable(urwid.WidgetDecoration):
         self._old_cursor_coords = None
         self._rows_max_cached = 0
         self.force_forward_keypress = force_forward_keypress
-        super().__init__(widget)
+        self.__super.__init__(widget)
 
     def render(self, size, focus=False):
         maxcol, maxrow = size
@@ -107,51 +107,6 @@ class Scrollable(urwid.WidgetDecoration):
             if canv_full.cursor is not None:
                 # Full canvas contains the cursor, but scrolled out of view
                 self._forward_keypress = False
-                
-                # Reset cursor position on page/up down scrolling
-                try:
-                    if hasattr(ow, "automove_cursor_on_scroll") and ow.automove_cursor_on_scroll:
-                        pwi = 0
-                        ch = 0
-                        last_hidden = False
-                        first_visible = False
-                        for w,o in ow.contents:
-                            wcanv = w.render((maxcol,))
-                            wh = wcanv.rows()
-                            if wh:
-                                ch += wh
-
-                            if not last_hidden and ch >= self._trim_top:
-                                last_hidden = True
-
-                            elif last_hidden:
-                                if not first_visible:
-                                    first_visible = True
-
-                                if w.selectable():
-                                    ow.focus_item = pwi
-
-                                    st = None
-                                    nf = ow.get_focus()
-                                    if hasattr(nf, "key_timeout"):
-                                        st = nf
-                                    elif hasattr(nf, "original_widget"):
-                                        no = nf.original_widget
-                                        if hasattr(no, "original_widget"):
-                                            st = no.original_widget
-                                        else:
-                                            if hasattr(no, "key_timeout"):
-                                                st = no
-                                    
-                                    if st and hasattr(st, "key_timeout") and hasattr(st, "keypress") and callable(st.keypress):
-                                        st.keypress(None, None)
-                                    
-                                    break
-
-                            pwi += 1
-                except Exception as e:
-                    pass
-
             else:
                 # Original widget does not have a cursor, but may be selectable
 
@@ -268,10 +223,10 @@ class Scrollable(urwid.WidgetDecoration):
     def _get_original_widget_size(self, size):
         ow = self._original_widget
         sizing = ow.sizing()
-        if FLOW in sizing:
+        if FIXED in sizing:
-            return (size[0],)
-        elif FIXED in sizing:
             return ()
+        elif FLOW in sizing:
+            return (size[0],)
 
     def get_scrollpos(self, size=None, focus=False):
         """Current scrolling position
@@ -340,7 +295,7 @@ class ScrollBar(urwid.WidgetDecoration):
         """
         if BOX not in widget.sizing():
             raise ValueError('Not a box widget: %r' % widget)
-        super().__init__(widget)
+        self.__super.__init__(widget)
         self._thumb_char = thumb_char
         self._trough_char = trough_char
         self.scrollbar_side = side

nomadnet/vendor/additional_urwid_widgets/FormWidgets.py

@@ -1,537 +0,0 @@
-import urwid
-
-class DialogLineBox(urwid.LineBox):
-    def __init__(self, body, parent=None, title="?"):
-        super().__init__(body, title=title)
-        self.parent = parent
-
-    def keypress(self, size, key):
-        if key == "esc":
-            if self.parent and hasattr(self.parent, "dismiss_dialog"):
-                self.parent.dismiss_dialog()
-            return None
-        return super().keypress(size, key)
-
-class Placeholder(urwid.Edit):
-    def __init__(self, caption="", edit_text="", placeholder="", **kwargs):
-        super().__init__(caption, edit_text, **kwargs)
-        self.placeholder = placeholder
-
-    def render(self, size, focus=False):
-        if not self.edit_text and not focus:
-            placeholder_widget = urwid.Text(("placeholder", self.placeholder))
-            return placeholder_widget.render(size, focus)
-        else:
-            return super().render(size, focus)
-
-class Dropdown(urwid.WidgetWrap):
-    signals = ['change'] # emit for urwid.connect_signal fn
-
-    def __init__(self, label, options, default=None):
-        self.label = label
-        self.options = options
-        self.selected = default if default is not None else options[0]
-
-        self.main_text = f"{self.selected}"
-        self.main_button = urwid.SelectableIcon(self.main_text, 0)
-        self.main_button = urwid.AttrMap(self.main_button, "button_normal", "button_focus")
-
-        self.option_widgets = []
-        for opt in options:
-            icon = urwid.SelectableIcon(opt, 0)
-            icon = urwid.AttrMap(icon, "list_normal", "list_focus")
-            self.option_widgets.append(icon)
-
-        self.options_walker = urwid.SimpleFocusListWalker(self.option_widgets)
-        self.options_listbox = urwid.ListBox(self.options_walker)
-        self.dropdown_box = None  # will be created on open_dropdown
-
-        self.pile = urwid.Pile([self.main_button])
-        self.dropdown_visible = False
-
-        super().__init__(self.pile)
-
-    def open_dropdown(self):
-        if not self.dropdown_visible:
-            height = len(self.options)
-            self.dropdown_box = urwid.BoxAdapter(self.options_listbox, height)
-            self.pile.contents.append((self.dropdown_box, self.pile.options()))
-            self.dropdown_visible = True
-            self.pile.focus_position = 1
-            self.options_walker.set_focus(0)
-
-    def close_dropdown(self):
-        if self.dropdown_visible:
-            self.pile.contents.pop()  # remove the dropdown_box
-            self.dropdown_visible = False
-            self.pile.focus_position = 0
-            self.dropdown_box = None
-
-    def keypress(self, size, key):
-        if not self.dropdown_visible:
-            if key == "enter":
-                self.open_dropdown()
-                return None
-            return self.main_button.keypress(size, key)
-        else:
-            if key == "enter":
-                focus_result = self.options_walker.get_focus()
-                if focus_result is not None:
-                    focus_widget = focus_result[0]
-                    new_val = focus_widget.base_widget.text
-                    old_val = self.selected
-                    self.selected = new_val
-                    self.main_button.base_widget.set_text(f"{self.selected}")
-
-                    if old_val != new_val:
-                        self._emit('change', new_val)
-
-                self.close_dropdown()
-                return None
-            return self.dropdown_box.keypress(size, key)
-
-    def get_value(self):
-        return self.selected
-
-class ValidationError(urwid.Text):
-    def __init__(self, message=""):
-        super().__init__(("error", message))
-
-class FormField:
-    def __init__(self, config_key, transform=None):
-        self.config_key = config_key
-        self.transform = transform or (lambda x: x)
-
-class FormEdit(Placeholder, FormField):
-    def __init__(self, config_key, caption="", edit_text="", placeholder="", validation_types=None, transform=None, **kwargs):
-        Placeholder.__init__(self, caption, edit_text, placeholder, **kwargs)
-        FormField.__init__(self, config_key, transform)
-        self.validation_types = validation_types or []
-        self.error_widget = urwid.Text("")
-        self.error = None
-
-    def get_value(self):
-        return self.transform(self.edit_text.strip())
-
-    def validate(self):
-        value = self.edit_text.strip()
-        self.error = None
-
-        for validation in self.validation_types:
-            if validation == "required":
-                if not value:
-                    self.error = "This field is required"
-                    break
-            elif validation == "number":
-                if value and not value.replace('-', '').replace('.', '').isdigit():
-                    self.error = "This field must be a number"
-                    break
-            elif validation == "float":
-                try:
-                    if value:
-                        float(value)
-                except ValueError:
-                    self.error = "This field must be decimal number"
-                    break
-
-        self.error_widget.set_text(("error", self.error or ""))
-        return self.error is None
-
-class FormCheckbox(urwid.CheckBox, FormField):
-    def __init__(self, config_key, label="", state=False, validation_types=None, transform=None, **kwargs):
-        urwid.CheckBox.__init__(self, label, state, **kwargs)
-        FormField.__init__(self, config_key, transform)
-        self.validation_types = validation_types or []
-        self.error_widget = urwid.Text("")
-        self.error = None
-
-    def get_value(self):
-        return self.transform(self.get_state())
-
-    def validate(self):
-
-        value = self.get_state()
-        self.error = None
-
-        for validation in self.validation_types:
-            if validation == "required":
-                if not value:
-                    self.error = "This field is  required"
-                    break
-
-        self.error_widget.set_text(("error", self.error or ""))
-        return self.error is None
-
-class FormDropdown(Dropdown, FormField):
-    signals = ['change']
-
-    def __init__(self, config_key, label, options, default=None, validation_types=None, transform=None):
-        self.options = [str(opt) for opt in options]
-
-        if default is not None:
-            default_str = str(default)
-            if default_str in self.options:
-                default = default_str
-            elif transform:
-                try:
-                    default_transformed = transform(default_str)
-                    for opt in self.options:
-                        if transform(opt) == default_transformed:
-                            default = opt
-                            break
-                except:
-                    default = self.options[0]
-            else:
-                default = self.options[0]
-        else:
-            default = self.options[0]
-
-        Dropdown.__init__(self, label, self.options, default)
-        FormField.__init__(self, config_key, transform)
-
-        self.validation_types = validation_types or []
-        self.error_widget = urwid.Text("")
-        self.error = None
-
-        if hasattr(self, 'main_button'):
-            self.main_button.base_widget.set_text(str(default))
-
-    def get_value(self):
-        return self.transform(self.selected)
-
-    def validate(self):
-        value = self.get_value()
-        self.error = None
-
-        for validation in self.validation_types:
-            if validation == "required":
-                if not value:
-                    self.error = "This field is required"
-                    break
-
-        self.error_widget.set_text(("error", self.error or ""))
-        return self.error is None
-
-    def open_dropdown(self):
-        if not self.dropdown_visible:
-            super().open_dropdown()
-            try:
-                current_index = self.options.index(self.selected)
-                self.options_walker.set_focus(current_index)
-            except ValueError:
-                pass
-
-class FormMultiList(urwid.Pile, FormField):
-    def __init__(self, config_key, placeholder="", validation_types=None, transform=None, **kwargs):
-        self.entries = []
-        self.error_widget = urwid.Text("")
-        self.error = None
-        self.placeholder = placeholder
-        self.validation_types = validation_types or []
-
-        first_entry = self.create_entry_row()
-        self.entries.append(first_entry)
-
-        self.add_button = urwid.Button("+ Add Another", on_press=self.add_entry)
-        add_button_padded = urwid.Padding(self.add_button, left=2, right=2)
-
-        pile_widgets = [first_entry, add_button_padded]
-        urwid.Pile.__init__(self, pile_widgets)
-        FormField.__init__(self, config_key, transform)
-
-    def create_entry_row(self):
-        edit = urwid.Edit("", "")
-        entry_row = urwid.Columns([
-            ('weight', 1, edit),
-            (3, urwid.Button("×", on_press=lambda button: self.remove_entry(button, entry_row))),
-        ])
-        return entry_row
-
-    def remove_entry(self, button, entry_row):
-        if len(self.entries) > 1:
-            self.entries.remove(entry_row)
-            self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
-
-    def add_entry(self, button):
-        new_entry = self.create_entry_row()
-        self.entries.append(new_entry)
-
-        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
-
-    def get_pile_widgets(self):
-        return self.entries + [urwid.Padding(self.add_button, left=2, right=2)]
-
-    def get_value(self):
-        values = []
-        for entry in self.entries:
-            edit_widget = entry.contents[0][0]
-            value = edit_widget.edit_text.strip()
-            if value:
-                values.append(value)
-        return self.transform(values)
-
-    def validate(self):
-        values = self.get_value()
-        self.error = None
-
-        for validation in self.validation_types:
-            if validation == "required" and not values:
-                self.error = "At least one entry is required"
-                break
-
-        self.error_widget.set_text(("error", self.error or ""))
-        return self.error is None
-
-
-class FormMultiTable(urwid.Pile, FormField):
-    def __init__(self, config_key, fields, validation_types=None, transform=None, **kwargs):
-        self.entries = []
-        self.fields = fields
-        self.error_widget = urwid.Text("")
-        self.error = None
-        self.validation_types = validation_types or []
-
-        header_columns = [('weight', 3, urwid.Text(("list_focus", "Name")))]
-        for field_key, field_config in self.fields.items():
-            header_columns.append(('weight', 2, urwid.Text(("list_focus", field_config.get("label", field_key)))))
-        header_columns.append((4, urwid.Text(("list_focus", ""))))
-
-        self.header_row = urwid.Columns(header_columns)
-
-        first_entry = self.create_entry_row()
-        self.entries.append(first_entry)
-
-        self.add_button = urwid.Button("+ Add ", on_press=self.add_entry)
-        add_button_padded = urwid.Padding(self.add_button, left=2, right=2)
-
-        pile_widgets = [
-            self.header_row,
-            urwid.Divider("-"),
-            first_entry,
-            add_button_padded
-        ]
-
-        urwid.Pile.__init__(self, pile_widgets)
-        FormField.__init__(self, config_key, transform)
-
-    def create_entry_row(self, name="", values=None):
-        if values is None:
-            values = {}
-
-        name_edit = urwid.Edit("", name)
-
-        columns = [('weight', 3, name_edit)]
-
-        field_widgets = {}
-        for field_key, field_config in self.fields.items():
-            field_value = values.get(field_key, "")
-
-            if field_config.get("type") == "checkbox":
-                widget = urwid.CheckBox("", state=bool(field_value))
-            elif field_config.get("type") == "dropdown":
-                # TODO: dropdown in MultiTable
-                widget = urwid.Edit("", str(field_value))
-            else:
-                widget = urwid.Edit("", str(field_value))
-
-            field_widgets[field_key] = widget
-            columns.append(('weight', 2, widget))
-
-        remove_button = urwid.Button("×", on_press=lambda button: self.remove_entry(button, entry_row))
-        columns.append((4, remove_button))
-
-        entry_row = urwid.Columns(columns)
-        entry_row.name_edit = name_edit
-        entry_row.field_widgets = field_widgets
-
-        return entry_row
-
-    def remove_entry(self, button, entry_row):
-        if len(self.entries) > 1:
-            self.entries.remove(entry_row)
-            self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
-
-    def add_entry(self, button):
-        new_entry = self.create_entry_row()
-        self.entries.append(new_entry)
-
-        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
-
-    def get_pile_widgets(self):
-        return [
-            self.header_row,
-            urwid.Divider("-")
-        ] + self.entries + [
-            urwid.Padding(self.add_button, left=2, right=2)
-        ]
-
-    def get_value(self):
-        values = {}
-        for entry in self.entries:
-            name = entry.name_edit.edit_text.strip()
-            if name:
-                subinterface = {}
-                subinterface["interface_enabled"] = True
-
-                for field_key, widget in entry.field_widgets.items():
-                    field_config = self.fields.get(field_key, {})
-
-                    if hasattr(widget, "get_state"):
-                        value = widget.get_state()
-                    elif hasattr(widget, "edit_text"):
-                        value = widget.edit_text.strip()
-
-                        transform = field_config.get("transform")
-                        if transform and value:
-                            try:
-                                value = transform(value)
-                            except (ValueError, TypeError):
-                                value = ""
-
-                    if value:
-                        subinterface[field_key] = value
-
-                values[name] = subinterface
-
-        return self.transform(values) if self.transform else values
-
-    def set_value(self, value):
-        self.entries = []
-
-        if not value:
-            self.entries.append(self.create_entry_row())
-        else:
-            for name, config in value.items():
-                self.entries.append(self.create_entry_row(name=name, values=config))
-
-        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
-
-    def validate(self):
-        values = self.get_value()
-        self.error = None
-
-        for validation in self.validation_types:
-            if validation == "required" and not values:
-                self.error = "At least one subinterface is required"
-                break
-
-        self.error_widget.set_text(("error", self.error or ""))
-        return self.error is None
-
-
-class FormKeyValuePairs(urwid.Pile, FormField):
-    def __init__(self, config_key, validation_types=None, transform=None, **kwargs):
-        self.entries = []
-        self.error_widget = urwid.Text("")
-        self.error = None
-        self.validation_types = validation_types or []
-
-        header_columns = [
-            ('weight', 1, urwid.AttrMap(urwid.Text("Parameter Key"), "multitable_header")),
-            ('weight', 1, urwid.AttrMap(urwid.Text("Parameter Value"), "multitable_header")),
-            (4, urwid.AttrMap(urwid.Text("Action"), "multitable_header"))
-        ]
-
-        self.header_row = urwid.AttrMap(urwid.Columns(header_columns), "multitable_header")
-
-        first_entry = self.create_entry_row()
-        self.entries.append(first_entry)
-
-        self.add_button = urwid.Button("+ Add Parameter", on_press=self.add_entry)
-        add_button_padded = urwid.Padding(self.add_button, left=2, right=2)
-
-        pile_widgets = [
-            self.header_row,
-            urwid.Divider("-"),
-            first_entry,
-            add_button_padded
-        ]
-
-        urwid.Pile.__init__(self, pile_widgets)
-        FormField.__init__(self, config_key, transform)
-
-    def create_entry_row(self, key="", value=""):
-        key_edit = urwid.Edit("", key)
-        value_edit = urwid.Edit("", value)
-
-        remove_button = urwid.Button("×", on_press=lambda button: self.remove_entry(button, entry_row))
-
-        entry_row = urwid.Columns([
-            ('weight', 1, key_edit),
-            ('weight', 1, value_edit),
-            (4, remove_button)
-        ])
-
-        entry_row.key_edit = key_edit
-        entry_row.value_edit = value_edit
-
-        return entry_row
-
-    def remove_entry(self, button, entry_row):
-        if len(self.entries) > 1:
-            self.entries.remove(entry_row)
-            self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
-
-    def add_entry(self, button):
-        new_entry = self.create_entry_row()
-        self.entries.append(new_entry)
-
-        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
-
-    def get_pile_widgets(self):
-        return [
-            self.header_row,
-            urwid.Divider("-")
-        ] + self.entries + [
-            urwid.Padding(self.add_button, left=2, right=2)
-        ]
-
-    def get_value(self):
-        values = {}
-        for entry in self.entries:
-            key = entry.key_edit.edit_text.strip()
-            value = entry.value_edit.edit_text.strip()
-
-            if key:
-                if value.isdigit():
-                    values[key] = int(value)
-                elif value.replace('.', '', 1).isdigit() and value.count('.') <= 1:
-                    values[key] = float(value)
-                elif value.lower() == 'true':
-                    values[key] = True
-                elif value.lower() == 'false':
-                    values[key] = False
-                else:
-                    values[key] = value
-
-        return self.transform(values) if self.transform else values
-
-    def set_value(self, value):
-        self.entries = []
-
-        if not value or not isinstance(value, dict):
-            self.entries.append(self.create_entry_row())
-        else:
-            for key, val in value.items():
-                self.entries.append(self.create_entry_row(key=key, value=str(val)))
-
-        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
-
-    def validate(self):
-        values = self.get_value()
-        self.error = None
-
-        keys = [entry.key_edit.edit_text.strip() for entry in self.entries
-                if entry.key_edit.edit_text.strip()]
-        if len(keys) != len(set(keys)):
-            self.error = "Duplicate keys are not allowed"
-            self.error_widget.set_text(("error", self.error))
-            return False
-
-        for validation in self.validation_types:
-            if validation == "required" and not values:
-                self.error = "Atleast one parameter is required"
-                break
-
-        self.error_widget.set_text(("error", self.error or ""))
-        return self.error is None

nomadnet/vendor/additional_urwid_widgets/widgets/indicative_listbox.py

@@ -269,13 +269,11 @@ class IndicativeListBox(urwid.WidgetWrap):
             
             # mousewheel up
             elif button == 4.0:
-                # was_handeled = self._pass_key_to_contained_listbox(modified_size, "page up")
+                was_handeled = self._pass_key_to_contained_listbox(modified_size, "page up")
-                was_handeled = self._pass_key_to_contained_listbox(modified_size, "up")
                 
             # mousewheel down
             elif button == 5.0:
-                # was_handeled = self._pass_key_to_contained_listbox(modified_size, "page down")
+                was_handeled = self._pass_key_to_contained_listbox(modified_size, "page down")
-                was_handeled = self._pass_key_to_contained_listbox(modified_size, "down")
                 
             focus_position_after_input = self.get_selected_position()
             

nomadnet/vendor/quotes.py

@@ -1,7 +1,5 @@
 quotes = [
     ("I want the wisdom that wise men revere. I want more.", "Faithless"),
     ("That's enough entropy for you my friend", "Unknown"),
-    ("Any time two people connect online, it's financed by a third person who believes they can manipulate the first two", "Jaron Lanier"),
+    ("Any time two people connect online, it's financed by a third person who believes they can manipulate the first two", "Jaron Lanier")
-    ("The landscape of the future is set, but how one will march across it is not determined", "Terence McKenna")
-    ("Freedom originates in the division of power, despotism in its concentration.", "John Acton")
 ]

setup.py

@@ -5,12 +5,6 @@ exec(open("nomadnet/_version.py", "r").read())
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-package_data = {
-"": [
-    "examples/messageboard/*",
-    ]
-}
-
 setuptools.setup(
     name="nomadnet",
     version=__version__,
@@ -21,7 +15,6 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url="https://github.com/markqvist/nomadnet",
     packages=setuptools.find_packages(),
-    package_data=package_data,
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
@@ -30,6 +23,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=["rns>=0.9.6", "lxmf>=0.7.1", "urwid>=2.6.16", "qrcode"],
+    install_requires=['rns>=0.2.5', 'lxmf>=0.0.9', 'urwid>=2.1.2'],
-    python_requires=">=3.7",
+    python_requires='>=3.6',
 )