Compare commits

..

No commits in common. "master" and "0.2.9" have entirely different histories.

32 changed files with 3047 additions and 2614 deletions

View File

@ -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

View File

@ -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.

View File

@ -1,4 +1,4 @@
FROM python:3.12-alpine as build FROM python:3.11-rc-alpine3.14 as build
RUN apk add --no-cache build-base linux-headers libffi-dev cargo RUN apk add --no-cache build-base linux-headers libffi-dev cargo
@ -8,10 +8,10 @@ ENV PATH="/opt/venv/bin:$PATH"
RUN pip3 install setuptools-rust pyopenssl cryptography RUN pip3 install setuptools-rust pyopenssl cryptography
COPY . /app/ COPY . /app/
RUN cd /app/ && pip3 install . RUN cd /app/ && python3 setup.py install
# Use multi-stage build, as we don't need rust compilation on the final image # Use multi-stage build, as we don't need rust compilation on the final image
FROM python:3.12-alpine FROM python:3.11-rc-alpine3.14
LABEL org.opencontainers.image.documentation="https://github.com/markqvist/NomadNet#nomad-network-daemon-with-docker" LABEL org.opencontainers.image.documentation="https://github.com/markqvist/NomadNet#nomad-network-daemon-with-docker"

View File

@ -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 ###########################################

View File

@ -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

View File

@ -4,11 +4,11 @@ Off-grid, resilient mesh communication with strong encryption, forward secrecy a
![Screenshot](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png) ![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. 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.
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 optics.
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 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. 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.
@ -22,41 +22,15 @@ If you'd rather want to use an LXMF client with a graphical user interface, you
- An easy to use and bandwidth efficient markup language for writing pages - An easy to use and bandwidth efficient markup language for writing pages
- Page caching in browser - 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.
## How do I get started? ## How do I get started?
The easiest way to install Nomad Network is via pip: The easiest way to install Nomad Network is via pip:
```bash ```bash
# Install Nomad Network and dependencies # 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:
```text
[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 # Run the client
nomadnet nomadnet
@ -118,23 +92,6 @@ $ docker run -d \
$ docker run -i ghcr.io/markqvist/nomadnet:master --daemon --console $ 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 ## 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). 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).
@ -148,11 +105,11 @@ You can help support the continued development of open, free and private communi
``` ```
- Ethereum - Ethereum
``` ```
0xFDabC71AC4c0C78C95aDDDe3B4FA19d6273c5E73 0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
``` ```
- Bitcoin - Bitcoin
``` ```
35G9uWVzrpJJibzUwpNUQGQNFzLirhrYAH 3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
``` ```
- Ko-Fi: https://ko-fi.com/markqvist - Ko-Fi: https://ko-fi.com/markqvist
@ -161,6 +118,7 @@ You can help support the continued development of open, free and private communi
- New major features - New major features
- Network-wide propagated bulletins and discussion threads - Network-wide propagated bulletins and discussion threads
- Collaborative maps and geospatial information sharing - Collaborative maps and geospatial information sharing
- Facilitation of trade and barter
- Minor improvements and fixes - Minor improvements and fixes
- Link status (RSSI and SNR) in conversation or conv list - Link status (RSSI and SNR) in conversation or conv list
- Ctrl-M shorcut for jumping to menu - Ctrl-M shorcut for jumping to menu

View File

@ -27,13 +27,6 @@ class Conversation:
if Conversation.created_callback != None: if Conversation.created_callback != None:
Conversation.created_callback() 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 # Add the announce to the directory announce
# stream logger # stream logger
app.directory.lxmf_announce_received(destination_hash, app_data) app.directory.lxmf_announce_received(destination_hash, app_data)
@ -102,7 +95,7 @@ class Conversation:
unread = True unread = True
if display_name == None and app_data: 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: if display_name == None:
sort_name = "" sort_name = ""
@ -149,7 +142,7 @@ class Conversation:
self.__changed_callback = None self.__changed_callback = None
if not RNS.Identity.recall(bytes.fromhex(self.source_hash)): if not RNS.Transport.has_path(bytes.fromhex(source_hash)):
RNS.Transport.request_path(bytes.fromhex(source_hash)) RNS.Transport.request_path(bytes.fromhex(source_hash))
self.source_identity = RNS.Identity.recall(bytes.fromhex(self.source_hash)) self.source_identity = RNS.Identity.recall(bytes.fromhex(self.source_hash))
@ -216,16 +209,8 @@ class Conversation:
if self.app.directory.preferred_delivery(dest.hash) == DirectoryEntry.PROPAGATED: if self.app.directory.preferred_delivery(dest.hash) == DirectoryEntry.PROPAGATED:
if self.app.message_router.get_outbound_propagation_node() != None: if self.app.message_router.get_outbound_propagation_node() != None:
desired_method = LXMF.LXMessage.PROPAGATED 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 lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
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_delivery_callback(self.message_notification)
lxm.register_failed_callback(self.message_notification) lxm.register_failed_callback(self.message_notification)
@ -242,7 +227,7 @@ class Conversation:
RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE) RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
return False return False
def paper_output(self, content="", title="", mode="print_qr"): def paper_output(self, content="", title=""):
if self.send_destination: if self.send_destination:
try: try:
dest = self.send_destination dest = self.send_destination
@ -250,8 +235,6 @@ class Conversation:
desired_method = LXMF.LXMessage.PAPER desired_method = LXMF.LXMessage.PAPER
lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method) lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
if mode == "print_qr":
qr_code = lxm.as_qr() qr_code = lxm.as_qr()
qr_tmp_path = self.app.tmpfilespath+"/"+str(RNS.hexrep(lxm.hash, delimit=False)) qr_tmp_path = self.app.tmpfilespath+"/"+str(RNS.hexrep(lxm.hash, delimit=False))
qr_code.save(qr_tmp_path) qr_code.save(qr_tmp_path)
@ -265,27 +248,6 @@ class Conversation:
return print_result 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: except Exception as e:
RNS.log("An error occurred while generating paper message, the contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("An error occurred while generating paper message, the contained exception was: "+str(e), RNS.LOG_ERROR)
return False return False
@ -296,13 +258,9 @@ class Conversation:
def message_notification(self, message): 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 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) RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE)
message.try_propagation_on_fail = None message.try_propagation_on_fail = None
message.delivery_attempts = 0 message.delivery_attempts = 0
if hasattr(message, "next_delivery_attempt"):
del message.next_delivery_attempt del message.next_delivery_attempt
message.packed = None message.packed = None
message.desired_method = LXMF.LXMessage.PROPAGATED message.desired_method = LXMF.LXMessage.PROPAGATED
@ -337,17 +295,12 @@ class ConversationMessage:
self.timestamp = self.lxm.timestamp self.timestamp = self.lxm.timestamp
self.sort_timestamp = os.path.getmtime(self.file_path) 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 found = False
for pending in nomadnet.NomadNetworkApp.get_shared_instance().message_router.pending_outbound: for pending in nomadnet.NomadNetworkApp.get_shared_instance().message_router.pending_outbound:
if pending.hash == self.lxm.hash: if pending.hash == self.lxm.hash:
found = True 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: if not found:
self.lxm.state = LXMF.LXMessage.FAILED self.lxm.state = LXMF.LXMessage.FAILED

View File

@ -3,7 +3,6 @@ import RNS
import LXMF import LXMF
import time import time
import nomadnet import nomadnet
import threading
import RNS.vendor.umsgpack as msgpack import RNS.vendor.umsgpack as msgpack
class PNAnnounceHandler: class PNAnnounceHandler:
@ -30,12 +29,11 @@ class PNAnnounceHandler:
RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG) RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
class Directory: class Directory:
ANNOUNCE_STREAM_MAXLENGTH = 256 ANNOUNCE_STREAM_MAXLENGTH = 64
aspect_filter = "nomadnetwork.node" aspect_filter = "nomadnetwork.node"
@staticmethod @staticmethod
def received_announce(destination_hash, announced_identity, app_data): def received_announce(destination_hash, announced_identity, app_data):
try:
app = nomadnet.NomadNetworkApp.get_shared_instance() app = nomadnet.NomadNetworkApp.get_shared_instance()
if not destination_hash in app.ignored_list: if not destination_hash in app.ignored_list:
@ -47,16 +45,11 @@ class Directory:
else: else:
RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG) 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): def __init__(self, app):
self.directory_entries = {} self.directory_entries = {}
self.announce_stream = [] self.announce_stream = []
self.app = app self.app = app
self.announce_lock = threading.Lock()
self.load_from_disk() self.load_from_disk()
self.pn_announce_handler = PNAnnounceHandler(self) self.pn_announce_handler = PNAnnounceHandler(self)
@ -68,7 +61,7 @@ class Directory:
packed_list = [] packed_list = []
for source_hash in self.directory_entries: for source_hash in self.directory_entries:
e = self.directory_entries[source_hash] 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, e.preferred_delivery, e.identify))
directory = { directory = {
"entry_list": packed_list, "entry_list": packed_list,
@ -93,9 +86,6 @@ class Directory:
entries = {} entries = {}
for e in unpacked_list: for e in unpacked_list:
if e[1] == None:
e[1] = "Undefined"
if len(e) > 3: if len(e) > 3:
hosts_node = e[3] hosts_node = e[3]
else: else:
@ -111,61 +101,28 @@ class Directory:
else: else:
identify = False identify = False
if len(e) > 6: entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery, identify_on_connect=identify)
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.directory_entries = entries
self.announce_stream = unpacked_directory["announce_stream"] self.announce_stream = unpacked_directory["announce_stream"]
except Exception as e: except Exception as e:
RNS.log("Could not load directory from disk. The contained exception was: "+str(e), RNS.LOG_ERROR) 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): def lxmf_announce_received(self, source_hash, app_data):
with self.announce_lock:
if app_data != None: 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() timestamp = time.time()
self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer")) self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer"))
while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH: while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
self.announce_stream.pop() self.announce_stream.pop()
if hasattr(self.app, "ui") and self.app.ui != None:
if hasattr(self.app.ui, "main_display"): if hasattr(self.app.ui, "main_display"):
self.app.ui.main_display.sub_displays.network_display.directory_change_callback() self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
def node_announce_received(self, source_hash, app_data, associated_peer): def node_announce_received(self, source_hash, app_data, associated_peer):
with self.announce_lock:
if app_data != None: 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() timestamp = time.time()
self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node")) self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node"))
while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH: while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
@ -181,7 +138,6 @@ class Directory:
self.app.ui.main_display.sub_displays.network_display.directory_change_callback() 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): def pn_announce_received(self, source_hash, app_data, associated_peer, associated_node):
with self.announce_lock:
found_node = None found_node = None
for sh in self.directory_entries: for sh in self.directory_entries:
if sh == associated_node: if sh == associated_node:
@ -194,25 +150,12 @@ class Directory:
break break
if not found_node: 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() timestamp = time.time()
self.announce_stream.insert(0, (timestamp, source_hash, app_data, "pn")) self.announce_stream.insert(0, (timestamp, source_hash, app_data, "pn"))
while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH: while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
self.announce_stream.pop() self.announce_stream.pop()
if hasattr(self.app, "ui") and hasattr(self.app.ui, "main_display"): if hasattr(self.app.ui, "main_display"):
self.app.ui.main_display.sub_displays.network_display.directory_change_callback() self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
def remove_announce_with_timestamp(self, timestamp): def remove_announce_with_timestamp(self, timestamp):
@ -233,13 +176,6 @@ class Directory:
def simplest_display_str(self, source_hash): def simplest_display_str(self, source_hash):
trust_level = self.trust_level(source_hash) trust_level = self.trust_level(source_hash)
if trust_level == DirectoryEntry.WARNING or trust_level == DirectoryEntry.UNTRUSTED: 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)+">" return "<"+RNS.hexrep(source_hash, delimit=False)+">"
else: else:
if source_hash in self.directory_entries: if source_hash in self.directory_entries:
@ -263,7 +199,6 @@ class Directory:
if announced_display_name == None: if announced_display_name == None:
return self.directory_entries[source_hash].trust_level return self.directory_entries[source_hash].trust_level
else: else:
if not self.directory_entries[source_hash].trust_level == DirectoryEntry.TRUSTED:
for entry in self.directory_entries: for entry in self.directory_entries:
e = self.directory_entries[entry] e = self.directory_entries[entry]
if e.display_name == announced_display_name: if e.display_name == announced_display_name:
@ -274,18 +209,6 @@ class Directory:
else: else:
return DirectoryEntry.UNKNOWN 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): def preferred_delivery(self, source_hash):
if source_hash in self.directory_entries: if source_hash in self.directory_entries:
return self.directory_entries[source_hash].preferred_delivery return self.directory_entries[source_hash].preferred_delivery
@ -345,7 +268,6 @@ class Directory:
if e.hosts_node: if e.hosts_node:
node_list.append(e) 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 return node_list
def number_of_known_nodes(self): def number_of_known_nodes(self):
@ -370,11 +292,10 @@ class DirectoryEntry:
DIRECT = 0x01 DIRECT = 0x01
PROPAGATED = 0x02 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): def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None, identify_on_connect=False):
if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8: if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
self.source_hash = source_hash self.source_hash = source_hash
self.display_name = display_name self.display_name = display_name
self.sort_rank = sort_rank
if preferred_delivery == None: if preferred_delivery == None:
self.preferred_delivery = DirectoryEntry.DIRECT self.preferred_delivery = DirectoryEntry.DIRECT

View File

@ -1,6 +1,4 @@
import os import os
import sys
import RNS import RNS
import time import time
import threading import threading
@ -17,11 +15,7 @@ class Node:
self.identity = self.app.identity self.identity = self.app.identity
self.destination = RNS.Destination(self.identity, RNS.Destination.IN, RNS.Destination.SINGLE, "nomadnetwork", "node") self.destination = RNS.Destination(self.identity, RNS.Destination.IN, RNS.Destination.SINGLE, "nomadnetwork", "node")
self.last_announce = time.time() self.last_announce = time.time()
self.last_file_refresh = time.time()
self.last_page_refresh = time.time()
self.announce_interval = self.app.node_announce_interval 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.job_interval = Node.JOB_INTERVAL
self.should_run_jobs = True self.should_run_jobs = True
self.app_data = None self.app_data = None
@ -52,8 +46,6 @@ class Node:
def register_pages(self): def register_pages(self):
# TODO: Deregister previously registered pages
# that no longer exist.
self.servedpages = [] self.servedpages = []
self.scan_pages(self.app.pagespath) self.scan_pages(self.app.pagespath)
@ -73,8 +65,6 @@ class Node:
) )
def register_files(self): def register_files(self):
# TODO: Deregister previously registered files
# that no longer exist.
self.servedfiles = [] self.servedfiles = []
self.scan_files(self.app.filespath) self.scan_files(self.app.filespath)
@ -107,7 +97,7 @@ class Node:
for directory in directories: for directory in directories:
self.scan_files(base_path+"/"+directory) 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) RNS.log("Page request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_VERBOSE)
try: try:
self.app.peer_settings["served_page_requests"] += 1 self.app.peer_settings["served_page_requests"] += 1
@ -161,21 +151,8 @@ class Node:
try: try:
if request_allowed: if request_allowed:
RNS.log("Serving page: "+file_path, RNS.LOG_VERBOSE) 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 return generated.stdout
else: else:
fh = open(file_path, "rb") fh = open(file_path, "rb")
@ -233,16 +210,6 @@ class Node:
if now > self.last_announce + self.announce_interval*60: if now > self.last_announce + self.announce_interval*60:
self.announce() 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) time.sleep(self.job_interval)
def peer_connected(self, link): def peer_connected(self, link):

View File

@ -19,7 +19,7 @@ from datetime import datetime
import RNS.vendor.umsgpack as msgpack import RNS.vendor.umsgpack as msgpack
from ._version import __version__ from ._version import __version__
from RNS.vendor.configobj import ConfigObj from .vendor.configobj import ConfigObj
class NomadNetworkApp: class NomadNetworkApp:
time_format = "%Y-%m-%d %H:%M:%S" time_format = "%Y-%m-%d %H:%M:%S"
@ -111,7 +111,6 @@ class NomadNetworkApp:
self.pagespath = self.configdir+"/storage/pages" self.pagespath = self.configdir+"/storage/pages"
self.filespath = self.configdir+"/storage/files" self.filespath = self.configdir+"/storage/files"
self.cachepath = self.configdir+"/storage/cache" self.cachepath = self.configdir+"/storage/cache"
self.examplespath = self.configdir+"/examples"
self.downloads_path = os.path.expanduser("~/Downloads") self.downloads_path = os.path.expanduser("~/Downloads")
@ -119,25 +118,13 @@ class NomadNetworkApp:
self.should_run_jobs = True self.should_run_jobs = True
self.job_interval = 5 self.job_interval = 5
self.defer_jobs = 90 self.defer_jobs = 90
self.page_refresh_interval = 0
self.file_refresh_interval = 0
self.peer_announce_at_start = True self.peer_announce_at_start = True
self.try_propagation_on_fail = True self.try_propagation_on_fail = True
self.disable_propagation = False
self.notify_on_new_message = True
self.lxmf_max_propagation_size = None
self.lxmf_max_incoming_size = None
self.periodic_lxmf_sync = True self.periodic_lxmf_sync = True
self.lxmf_sync_interval = 360*60 self.lxmf_sync_interval = 360*60
self.lxmf_sync_limit = 8 self.lxmf_sync_limit = 8
self.compact_stream = False
self.required_stamp_cost = None
self.accept_invalid_stamps = False
if not os.path.isdir(self.storagepath): if not os.path.isdir(self.storagepath):
os.makedirs(self.storagepath) os.makedirs(self.storagepath)
@ -180,16 +167,6 @@ class NomadNetworkApp:
RNS.log("Check your configuration file for errors!", RNS.LOG_ERROR) RNS.log("Check your configuration file for errors!", RNS.LOG_ERROR)
nomadnet.panic() nomadnet.panic()
else: else:
if not os.path.isdir(self.examplespath):
try:
import shutil
examplespath = os.path.join(os.path.dirname(__file__), "examples")
shutil.copytree(examplespath, self.examplespath, ignore=shutil.ignore_patterns("__pycache__"))
except Exception as e:
RNS.log("Could not copy examples into the "+self.examplespath+" directory.", RNS.LOG_ERROR)
RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
RNS.log("Could not load config file, creating default configuration file...") RNS.log("Could not load config file, creating default configuration file...")
self.createDefaultConfig() self.createDefaultConfig()
self.firstrun = True self.firstrun = True
@ -290,30 +267,14 @@ class NomadNetworkApp:
self.directory = nomadnet.Directory(self) self.directory = nomadnet.Directory(self)
static_peers = [] self.message_router = LXMF.LXMRouter(identity = self.identity, storagepath = self.storagepath, autopeer = True)
for static_peer in self.static_peers:
try:
dh = bytes.fromhex(static_peer)
if len(dh) != RNS.Reticulum.TRUNCATED_HASHLENGTH//8:
raise ValueError("Invalid destination length")
static_peers.append(dh)
except Exception as e:
RNS.log(f"Could not decode static peer destination hash {static_peer}: {e}", RNS.LOG_ERROR)
self.message_router = LXMF.LXMRouter(
identity = self.identity, storagepath = self.storagepath, autopeer = True,
propagation_limit = self.lxmf_max_propagation_size, delivery_limit = self.lxmf_max_incoming_size,
max_peers = self.max_peers, static_peers = static_peers,
)
self.message_router.register_delivery_callback(self.lxmf_delivery) self.message_router.register_delivery_callback(self.lxmf_delivery)
for destination_hash in self.ignored_list: for destination_hash in self.ignored_list:
self.message_router.ignore_destination(destination_hash) self.message_router.ignore_destination(destination_hash)
self.lxmf_destination = self.message_router.register_delivery_identity(self.identity, display_name=self.peer_settings["display_name"], stamp_cost=self.required_stamp_cost) self.lxmf_destination = self.message_router.register_delivery_identity(self.identity, display_name=self.peer_settings["display_name"])
if not self.accept_invalid_stamps: self.lxmf_destination.set_default_app_data(self.get_display_name_bytes)
self.message_router.enforce_stamps()
RNS.Identity.remember( RNS.Identity.remember(
packet_hash=None, packet_hash=None,
@ -335,27 +296,15 @@ class NomadNetworkApp:
except Exception as e: except Exception as e:
RNS.log("Cannot prioritise "+str(dest_str)+", it is not a valid destination hash", RNS.LOG_ERROR) RNS.log("Cannot prioritise "+str(dest_str)+", it is not a valid destination hash", RNS.LOG_ERROR)
if self.disable_propagation:
if os.path.isfile(self.pnannouncedpath):
try:
RNS.log("Sending indication to peered LXMF Propagation Node that this node is no longer participating", RNS.LOG_DEBUG)
self.message_router.disable_propagation()
os.unlink(self.pnannouncedpath)
except Exception as e:
RNS.log("An error ocurred while indicating that this LXMF Propagation Node is no longer participating. The contained exception was: "+str(e), RNS.LOG_ERROR)
else:
self.message_router.enable_propagation() self.message_router.enable_propagation()
try: try:
with open(self.pnannouncedpath, "wb") as pnf: with open(self.pnannouncedpath, "wb") as pnf:
pnf.write(msgpack.packb(time.time())) pnf.write(msgpack.packb(time.time()))
pnf.close() pnf.close()
except Exception as e: except Exception as e:
RNS.log("An error ocurred while writing Propagation Node announce timestamp. The contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("An error ocurred while writing Propagation Node announce timestamp. The contained exception was: "+str(e), RNS.LOG_ERROR)
if not self.disable_propagation:
RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash)) RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash))
self.node = nomadnet.Node(self) self.node = nomadnet.Node(self)
else: else:
self.node = None self.node = None
@ -453,24 +402,16 @@ class NomadNetworkApp:
return "Receiving messages" return "Receiving messages"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_RECEIVED: elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_RECEIVED:
return "Messages received" return "Messages received"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_NO_PATH:
return "No path to node"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_FAILED:
return "Link establisment failed"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_TRANSFER_FAILED:
return "Sync request failed"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_NO_IDENTITY_RCVD:
return "Remote got no identity"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_NO_ACCESS:
return "Node rejected request"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_FAILED:
return "Sync failed"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE: elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
new_msgs = self.message_router.propagation_transfer_last_result new_msgs = self.message_router.propagation_transfer_last_result
if new_msgs == 0: if new_msgs == 0:
return "Done, no new messages" return "Done, no new messages"
else: else:
return "Downloaded "+str(new_msgs)+" new messages" return "Downloaded "+str(new_msgs)+" new messages"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_NO_IDENTITY_RCVD:
return "Node did not receive identification"
elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_NO_ACCESS:
return "Node did not allow request"
else: else:
return "Unknown" return "Unknown"
@ -508,17 +449,16 @@ class NomadNetworkApp:
self.message_router.cancel_propagation_node_requests() self.message_router.cancel_propagation_node_requests()
def announce_now(self): def announce_now(self):
self.message_router.set_inbound_stamp_cost(self.lxmf_destination.hash, self.required_stamp_cost) self.lxmf_destination.announce()
self.lxmf_destination.display_name = self.peer_settings["display_name"]
self.message_router.announce(self.lxmf_destination.hash)
self.peer_settings["last_announce"] = time.time() self.peer_settings["last_announce"] = time.time()
self.save_peer_settings() self.save_peer_settings()
def autoselect_propagation_node(self): def autoselect_propagation_node(self):
selected_node = None selected_node = None
if "propagation_node" in self.peer_settings and self.peer_settings["propagation_node"] != None: if "propagation_node" in self.peer_settings:
selected_node = self.peer_settings["propagation_node"] selected_node = self.peer_settings["propagation_node"]
else: else:
nodes = self.directory.known_nodes() nodes = self.directory.known_nodes()
trusted_nodes = [] trusted_nodes = []
@ -537,7 +477,7 @@ class NomadNetworkApp:
RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network, or a propagation node is manually selected.", RNS.LOG_WARNING) RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network, or a propagation node is manually selected.", RNS.LOG_WARNING)
else: else:
pn_name_str = "" pn_name_str = ""
RNS.log("Selecting "+RNS.prettyhexrep(selected_node)+pn_name_str+" as default LXMF propagation node", RNS.LOG_DEBUG) RNS.log("Selecting "+RNS.prettyhexrep(selected_node)+pn_name_str+" as default LXMF propagation node", RNS.LOG_INFO)
self.message_router.set_outbound_propagation_node(selected_node) self.message_router.set_outbound_propagation_node(selected_node)
def get_user_selected_propagation_node(self): def get_user_selected_propagation_node(self):
@ -572,9 +512,6 @@ class NomadNetworkApp:
nomadnet.Conversation.ingest(message, self) nomadnet.Conversation.ingest(message, self)
if self.notify_on_new_message:
self.notify_message_recieved()
if self.should_print(message): if self.should_print(message):
self.print_message(message) self.print_message(message)
@ -678,11 +615,6 @@ class NomadNetworkApp:
if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"): if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"):
os.unlink(self.conversationpath + "/" + source_hash + "/unread") os.unlink(self.conversationpath + "/" + source_hash + "/unread")
def notify_message_recieved(self):
if self.uimode == nomadnet.ui.UI_TEXT:
sys.stdout.write("\a")
sys.stdout.flush()
def clear_tmp_dir(self): def clear_tmp_dir(self):
if os.path.isdir(self.tmpfilespath): if os.path.isdir(self.tmpfilespath):
for file in os.listdir(self.tmpfilespath): for file in os.listdir(self.tmpfilespath):
@ -756,40 +688,6 @@ class NomadNetworkApp:
else: else:
self.lxmf_sync_limit = None self.lxmf_sync_limit = None
if option == "required_stamp_cost":
value = self.config["client"][option]
if value.lower() == "none":
self.required_stamp_cost = None
else:
value = self.config["client"].as_int(option)
if value > 0:
if value > 255:
value = 255
self.required_stamp_cost = value
else:
self.required_stamp_cost = None
if option == "accept_invalid_stamps":
value = self.config["client"].as_bool(option)
self.accept_invalid_stamps = value
if option == "max_accepted_size":
value = self.config["client"].as_float(option)
if value > 0:
self.lxmf_max_incoming_size = value
else:
self.lxmf_max_incoming_size = 500
if option == "compact_announce_stream":
value = self.config["client"].as_bool(option)
self.compact_stream = value
if option == "notify_on_new_message":
value = self.config["client"].as_bool(option)
self.notify_on_new_message = value
if option == "user_interface": if option == "user_interface":
value = value.lower() value = value.lower()
if value == "none": if value == "none":
@ -808,7 +706,7 @@ class NomadNetworkApp:
self.config["textui"]["intro_text"] = "Nomad Network" self.config["textui"]["intro_text"] = "Nomad Network"
if not "editor" in self.config["textui"]: if not "editor" in self.config["textui"]:
self.config["textui"]["editor"] = "nano" self.config["textui"]["editor"] = "editor"
if not "glyphs" in self.config["textui"]: if not "glyphs" in self.config["textui"]:
self.config["textui"]["glyphs"] = "unicode" self.config["textui"]["glyphs"] = "unicode"
@ -875,19 +773,6 @@ class NomadNetworkApp:
else: else:
self.node_name = self.config["node"]["node_name"] self.node_name = self.config["node"]["node_name"]
if not "disable_propagation" in self.config["node"]:
self.disable_propagation = False
else:
self.disable_propagation = self.config["node"].as_bool("disable_propagation")
if not "max_transfer_size" in self.config["node"]:
self.lxmf_max_propagation_size = 256
else:
value = self.config["node"].as_float("max_transfer_size")
if value < 1:
value = 1
self.lxmf_max_propagation_size = value
if not "announce_at_start" in self.config["node"]: if not "announce_at_start" in self.config["node"]:
self.node_announce_at_start = False self.node_announce_at_start = False
else: else:
@ -905,45 +790,14 @@ class NomadNetworkApp:
if "pages_path" in self.config["node"]: if "pages_path" in self.config["node"]:
self.pagespath = self.config["node"]["pages_path"] self.pagespath = self.config["node"]["pages_path"]
if not "page_refresh_interval" in self.config["node"]:
self.page_refresh_interval = 0
else:
value = self.config["node"].as_int("page_refresh_interval")
if value < 0:
value = 0
self.page_refresh_interval = value
if "files_path" in self.config["node"]: if "files_path" in self.config["node"]:
self.filespath = self.config["node"]["files_path"] self.filespath = self.config["node"]["files_path"]
if not "file_refresh_interval" in self.config["node"]:
self.file_refresh_interval = 0
else:
value = self.config["node"].as_int("file_refresh_interval")
if value < 0:
value = 0
self.file_refresh_interval = value
if "prioritise_destinations" in self.config["node"]: if "prioritise_destinations" in self.config["node"]:
self.prioritised_lxmf_destinations = self.config["node"].as_list("prioritise_destinations") self.prioritised_lxmf_destinations = self.config["node"].as_list("prioritise_destinations")
else: else:
self.prioritised_lxmf_destinations = [] self.prioritised_lxmf_destinations = []
if "static_peers" in self.config["node"]:
self.static_peers = self.config["node"].as_list("static_peers")
else:
self.static_peers = []
if not "max_peers" in self.config["node"]:
self.max_peers = None
else:
value = self.config["node"].as_int("max_peers")
if value < 0:
value = 0
self.max_peers = value
if not "message_storage_limit" in self.config["node"]: if not "message_storage_limit" in self.config["node"]:
self.message_storage_limit = 2000 self.message_storage_limit = 2000
else: else:
@ -1038,7 +892,6 @@ destination = file
enable_client = yes enable_client = yes
user_interface = text user_interface = text
downloads_path = ~/Downloads downloads_path = ~/Downloads
notify_on_new_message = yes
# By default, the peer is announced at startup # By default, the peer is announced at startup
# to let other peers reach it immediately. # to let other peers reach it immediately.
@ -1066,37 +919,6 @@ lxmf_sync_interval = 360
# the limit, and download everything every time. # the limit, and download everything every time.
lxmf_sync_limit = 8 lxmf_sync_limit = 8
# You can specify a required stamp cost for
# inbound messages to be accepted. Specifying
# a stamp cost will require untrusted senders
# that message you to include a cryptographic
# stamp in their messages. Performing this
# operation takes the sender an amount of time
# proportional to the stamp cost. As a rough
# estimate, a stamp cost of 8 will take less
# than a second to compute, and a stamp cost
# of 20 could take several minutes, even on
# a fast computer.
required_stamp_cost = None
# You can signal stamp requirements to senders,
# but still accept messages with invalid stamps
# by setting this option to True.
accept_invalid_stamps = False
# The maximum accepted unpacked size for mes-
# sages received directly from other peers,
# specified in kilobytes. Messages larger than
# this will be rejected before the transfer
# begins.
max_accepted_size = 500
# The announce stream will only show one entry
# per destination or node by default. You can
# change this to show as many announces as have
# been received, for every destination.
compact_announce_stream = yes
[textui] [textui]
# Amount of time to show intro screen # Amount of time to show intro screen
@ -1136,8 +958,10 @@ glyphs = unicode
# application. On by default. # application. On by default.
mouse_enabled = True mouse_enabled = True
# What editor to use for editing text. # What editor to use for editing text. By
editor = nano # default the operating systems "editor"
# alias will be used.
editor = editor
# If you don't want the Guide section to # If you don't want the Guide section to
# show up in the menu, you can disable it. # show up in the menu, you can disable it.
@ -1160,16 +984,6 @@ announce_interval = 360
# Whether to announce when the node starts. # Whether to announce when the node starts.
announce_at_start = Yes announce_at_start = Yes
# When Nomad Network is hosting a page-serving
# node, it can also act as an LXMF propagation
# node. If there is already a large amount of
# propagation nodes on the network, or you
# simply want to run a pageserving-only node,
# you can disable running a propagation node.
# Due to lots of propagation nodes being
# available, this is currently the default.
disable_propagation = Yes
# The maximum amount of storage to use for # The maximum amount of storage to use for
# the LXMF Propagation Node message store, # the LXMF Propagation Node message store,
# specified in megabytes. When this limit # specified in megabytes. When this limit
@ -1181,18 +995,6 @@ disable_propagation = Yes
# and defaults to 2 gigabytes. # and defaults to 2 gigabytes.
# message_storage_limit = 2000 # message_storage_limit = 2000
# The maximum accepted transfer size per in-
# coming propagation transfer, in kilobytes.
# This also sets the upper limit for the size
# of single messages accepted onto this node.
#
# If a node wants to propagate a larger number
# of messages to this node, than what can fit
# within this limit, it will prioritise sending
# the smallest, newest messages first, and try
# with any remaining messages at a later point.
max_transfer_size = 256
# You can tell the LXMF message router to # You can tell the LXMF message router to
# prioritise storage for one or more # prioritise storage for one or more
# destinations. If the message store reaches # destinations. If the message store reaches
@ -1202,29 +1004,6 @@ max_transfer_size = 256
# and generally you do not need to use it. # and generally you do not need to use it.
# prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf # prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf
# You can configure the maximum number of other
# propagation nodes that this node will peer
# with automatically. The default is 50.
# max_peers = 25
# You can configure a list of static propagation
# node peers, that this node will always be
# peered with, by specifying a list of
# destination hashes.
# static_peers = e17f833c4ddf8890dd3a79a6fea8161d, 5a2d0029b6e5ec87020abaea0d746da4
# You can specify the interval in minutes for
# rescanning the hosted pages path. By default,
# this option is disabled, and the pages path
# will only be scanned on startup.
# page_refresh_interval = 0
# You can specify the interval in minutes for
# rescanning the hosted files path. By default,
# this option is disabled, and the files path
# will only be scanned on startup.
# file_refresh_interval = 0
[printing] [printing]
# You can configure Nomad Network to print # You can configure Nomad Network to print

View File

@ -1 +1 @@
__version__ = "0.6.2" __version__ = "0.2.9"

View File

@ -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

View File

@ -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()

View File

@ -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)

View File

@ -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))

View File

@ -45,8 +45,6 @@ THEMES = {
("list_normal", "dark gray", "default", "default", "#bbb", "default"), ("list_normal", "dark gray", "default", "default", "#bbb", "default"),
("list_untrusted", "dark red", "default", "default", "#a22", "default"), ("list_untrusted", "dark red", "default", "default", "#a22", "default"),
("list_focus_untrusted", "black", "light gray", "standout", "#810", "#aaa"), ("list_focus_untrusted", "black", "light gray", "standout", "#810", "#aaa"),
("list_unresponsive", "yellow", "default", "default", "#b92", "default"),
("list_focus_unresponsive", "black", "light gray", "standout", "#530", "#aaa"),
("topic_list_normal", "light gray", "default", "default", "#ddd", "default"), ("topic_list_normal", "light gray", "default", "default", "#ddd", "default"),
("browser_controls", "light gray", "default", "default", "#bbb", "default"), ("browser_controls", "light gray", "default", "default", "#bbb", "default"),
("progress_full", "black", "light gray", "standout", "#111", "#bbb"), ("progress_full", "black", "light gray", "standout", "#111", "#bbb"),
@ -80,8 +78,6 @@ THEMES = {
("list_normal", "dark gray", "default", "default", "#444", "default"), ("list_normal", "dark gray", "default", "default", "#444", "default"),
("list_untrusted", "dark red", "default", "default", "#a22", "default"), ("list_untrusted", "dark red", "default", "default", "#a22", "default"),
("list_focus_untrusted", "black", "dark gray", "standout", "#810", "#aaa"), ("list_focus_untrusted", "black", "dark gray", "standout", "#810", "#aaa"),
("list_unresponsive", "yellow", "default", "default", "#b92", "default"),
("list_focus_unresponsive", "black", "light gray", "standout", "#530", "#aaa"),
("topic_list_normal", "dark gray", "default", "default", "#222", "default"), ("topic_list_normal", "dark gray", "default", "default", "#222", "default"),
("browser_controls", "dark gray", "default", "default", "#444", "default"), ("browser_controls", "dark gray", "default", "default", "#444", "default"),
("progress_full", "black", "dark gray", "standout", "#111", "#bbb"), ("progress_full", "black", "dark gray", "standout", "#111", "#bbb"),
@ -97,10 +93,10 @@ GLYPHSETS = {
} }
if platform.system() == "Darwin": if platform.system() == "Darwin":
urm_char = " \uf0e0" urm_char = " \uf0e0 "
ur_char = "\uf0e0 " ur_char = "\uf0e0 "
else: else:
urm_char = " \uf003" urm_char = " \uf003 "
ur_char = "\uf003 " ur_char = "\uf003 "
GLYPHS = { GLYPHS = {
@ -115,17 +111,17 @@ GLYPHS = {
("arrow_u", "/\\", "\u2191", "\u2191"), ("arrow_u", "/\\", "\u2191", "\u2191"),
("arrow_d", "\\/", "\u2193", "\u2193"), ("arrow_d", "\\/", "\u2193", "\u2193"),
("warning", "!", "\u26a0", "\uf12a"), ("warning", "!", "\u26a0", "\uf12a"),
("info", "i", "\u2139", "\U000f064e"), ("info", "i", "\u2139", "\ufb4d"),
("unread", "[!]", "\u2709", ur_char), ("unread", "[!]", "\u2709", ur_char),
("divider1", "-", "\u2504", "\u2504"), ("divider1", "-", "\u2504", "\u2504"),
("peer", "[P]", "\u24c5 ", "\uf415"), ("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), ("unread_menu", " !", " \u2709", urm_char),
("globe", "", "", "\uf484"), ("globe", "", "", "\uf484"),
("sent", "/\\", "\u2191", "\U000f0cd8"), ("sent", "/\\", "\u2191", "\ufbf4"),
("papermsg", "P", "\u25a4", "\uf719"), ("papermsg", "P", "\u25a4", "\uf719"),
("qrcode", "QR", "\u25a4", "\uf029"), ("qrcode", "QR", "\u25a4", "\uf029"),
} }
@ -221,8 +217,6 @@ class TextUI:
def unhandled_input(self, key): def unhandled_input(self, key):
if key == "ctrl q": if key == "ctrl q":
raise urwid.ExitMainLoop raise urwid.ExitMainLoop
elif key == "ctrl e":
pass
def display_main(self, loop, user_data): def display_main(self, loop, user_data):
self.loop.widget = self.main_display.widget self.loop.widget = self.main_display.widget

View File

@ -1,5 +1,4 @@
import RNS import RNS
import LXMF
import os import os
import time import time
import urwid import urwid
@ -24,37 +23,16 @@ class BrowserFrame(urwid.Frame):
self.delegate.url_dialog() self.delegate.url_dialog()
elif key == "ctrl s": elif key == "ctrl s":
self.delegate.save_node_dialog() self.delegate.save_node_dialog()
elif key == "ctrl b":
self.delegate.save_node_dialog()
elif key == "ctrl g": elif key == "ctrl g":
nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.network_display.toggle_fullscreen() nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.network_display.toggle_fullscreen()
elif self.focus_position == "body": elif self.get_focus() == "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) 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: else:
return super(BrowserFrame, self).keypress(size, key) return super(BrowserFrame, self).keypress(size, key)
@ -84,7 +62,6 @@ class Browser:
self.aspects = aspects self.aspects = aspects
self.destination_hash = destination_hash self.destination_hash = destination_hash
self.path = path self.path = path
self.request_data = None
self.timeout = Browser.DEFAULT_TIMEOUT self.timeout = Browser.DEFAULT_TIMEOUT
self.last_keypress = None self.last_keypress = None
@ -103,7 +80,6 @@ class Browser:
self.link_target = None self.link_target = None
self.frame = None self.frame = None
self.attr_maps = [] self.attr_maps = []
self.page_pile = None
self.build_display() self.build_display()
self.history = [] self.history = []
@ -165,66 +141,7 @@ class Browser:
else: else:
return destination_type return destination_type
def handle_link(self, link_target, link_data = None): def handle_link(self, link_target):
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("@") components = link_target.split("@")
destination_type = None destination_type = None
@ -238,9 +155,8 @@ class Browser:
if destination_type == "nomadnetwork.node": if destination_type == "nomadnetwork.node":
if self.status >= Browser.DISCONECTED: if self.status >= Browser.DISCONECTED:
RNS.log("Browser handling link to: "+str(link_target), RNS.LOG_DEBUG) RNS.log("Browser handling link to: "+str(link_target), RNS.LOG_DEBUG)
self.browser_footer = urwid.Text("Opening link to: "+str(link_target))
try: try:
self.retrieve_url(link_target, request_data) self.retrieve_url(link_target)
except Exception as e: except Exception as e:
self.browser_footer = urwid.Text("Could not open link: "+str(e)) self.browser_footer = urwid.Text("Could not open link: "+str(e))
self.frame.contents["footer"] = (self.browser_footer, self.frame.options()) self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
@ -277,7 +193,7 @@ class Browser:
display_name = None display_name = None
if display_name_data != None: if display_name_data != None:
display_name = LXMF.display_name_from_app_data(display_name_data) display_name = display_name_data.decode("utf-8")
if not source_hash_text in [c[0] for c in existing_conversations]: if not source_hash_text in [c[0] for c in existing_conversations]:
entry = DirectoryEntry(bytes.fromhex(source_hash_text), display_name=display_name) entry = DirectoryEntry(bytes.fromhex(source_hash_text), display_name=display_name)
@ -303,11 +219,7 @@ class Browser:
self.browser_header = urwid.Text("") self.browser_header = urwid.Text("")
self.browser_footer = 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 = BrowserFrame(self.browser_body, header=self.browser_header, footer=self.browser_footer)
self.frame.delegate = self self.frame.delegate = self
@ -334,29 +246,27 @@ class Browser:
self.update_display() self.update_display()
columns = urwid.Columns([ columns = urwid.Columns([
(urwid.WEIGHT, 0.5, urwid.Text(" ")), ("weight", 0.5, urwid.Text(" ")),
(8, urwid.Button("Back", on_press=back_action)), (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: if len(self.attr_maps) > 0:
pile = urwid.Pile([ 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 columns
]) ])
else: 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): def update_display(self):
if self.status == Browser.DISCONECTED: if self.status == Browser.DISCONECTED:
self.display_widget.set_attr_map({None: "inactive_text"}) 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_footer = urwid.Text("")
self.browser_header = urwid.Text("") self.browser_header = urwid.Text("")
self.linebox.set_title("Remote Node") self.linebox.set_title("Remote Node")
@ -383,10 +293,7 @@ class Browser:
elif self.status <= Browser.REQUEST_SENT: elif self.status <= Browser.REQUEST_SENT:
if len(self.attr_maps) == 0: 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() self.browser_footer = self.make_status_widget()
@ -407,8 +314,6 @@ class Browser:
def update_page_display(self): def update_page_display(self):
pile = urwid.Pile(self.attr_maps) 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") self.browser_body = urwid.AttrMap(ScrollBar(Scrollable(pile, force_forward_keypress=True), thumb_char="\u2503", trough_char=" "), "scrollbar")
def identify(self): def identify(self):
@ -421,7 +326,6 @@ class Browser:
if self.link != None: if self.link != None:
self.link.teardown() self.link.teardown()
self.request_data = None
self.attr_maps = [] self.attr_maps = []
self.status = Browser.DISCONECTED self.status = Browser.DISCONECTED
self.response_progress = 0 self.response_progress = 0
@ -436,7 +340,7 @@ class Browser:
self.update_display() 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_destination_hash = self.destination_hash
self.previous_path = self.path self.previous_path = self.path
@ -489,7 +393,6 @@ class Browser:
else: else:
self.set_destination_hash(destination_hash) self.set_destination_hash(destination_hash)
self.set_path(path) self.set_path(path)
self.set_request_data(request_data)
self.load_page() self.load_page()
def set_destination_hash(self, destination_hash): def set_destination_hash(self, destination_hash):
@ -503,8 +406,6 @@ class Browser:
def set_path(self, path): def set_path(self, path):
self.path = path self.path = path
def set_request_data(self, request_data):
self.request_data = request_data
def set_timeout(self, timeout): def set_timeout(self, timeout):
self.timeout = timeout self.timeout = timeout
@ -549,7 +450,7 @@ class Browser:
self.status = Browser.PATH_REQUESTED self.status = Browser.PATH_REQUESTED
self.update_display() 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): while not RNS.Transport.has_path(self.destination_hash):
now = time.time() now = time.time()
if now > pr_time+self.timeout: if now > pr_time+self.timeout:
@ -640,7 +541,7 @@ class Browser:
self.load_page() self.load_page()
def close_dialogs(self): 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) self.delegate.columns.contents[1] = (self.display_widget, options)
def url_dialog(self): def url_dialog(self):
@ -661,11 +562,7 @@ class Browser:
dialog = UrlDialogLineBox( dialog = UrlDialogLineBox(
urwid.Pile([ urwid.Pile([
e_url, 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" ]), title="Enter URL"
) )
e_url.confirmed = confirmed e_url.confirmed = confirmed
@ -673,24 +570,13 @@ class Browser:
dialog.delegate = self dialog.delegate = self
bottom = self.display_widget 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.contents[1] = (overlay, options)
self.delegate.columns.focus_position = 1 self.delegate.columns.focus_position = 1
def save_node_dialog(self): def save_node_dialog(self):
if self.destination_hash != None:
try:
def dismiss_dialog(sender): def dismiss_dialog(sender):
self.close_dialogs() self.close_dialogs()
@ -710,11 +596,7 @@ class Browser:
dialog = UrlDialogLineBox( dialog = UrlDialogLineBox(
urwid.Pile([ urwid.Pile([
urwid.Text("Save connected node"+disp_str+" "+RNS.prettyhexrep(self.destination_hash)+" to Known Nodes?\n"), urwid.Text("Save connected node"+disp_str+" "+RNS.prettyhexrep(self.destination_hash)+" to Known Nodes?\n"),
urwid.Columns([ urwid.Columns([("weight", 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Save", on_press=confirmed))])
(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" ]), title="Save Node"
) )
@ -722,30 +604,15 @@ class Browser:
dialog.delegate = self dialog.delegate = self
bottom = self.display_widget bottom = self.display_widget
overlay = urwid.Overlay( overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 50), valign="middle", height="pack", left=2, right=2)
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) options = self.delegate.columns.options("weight", self.delegate.right_area_width)
self.delegate.columns.contents[1] = (overlay, options) self.delegate.columns.contents[1] = (overlay, options)
self.delegate.columns.focus_position = 1 self.delegate.columns.focus_position = 1
except Exception as e:
pass
def load_page(self): def load_page(self):
if self.request_data == None:
cached = self.get_cached(self.current_url()) cached = self.get_cached(self.current_url())
else:
cached = None
if cached: if cached:
self.status = Browser.DONE self.status = Browser.DONE
self.page_data = cached self.page_data = cached
@ -779,15 +646,7 @@ class Browser:
page_data = b"The requested local page did not exist in the file system" page_data = b"The requested local page did not exist in the file system"
if os.path.isfile(page_path): if os.path.isfile(page_path):
if os.access(page_path, os.X_OK): 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 page_data = generated.stdout
else: else:
file = open(page_path, "rb") file = open(page_path, "rb")
@ -818,7 +677,7 @@ class Browser:
def __load(self): def __load(self):
# If an established link exists, but it doesn't match the target # If an established link exists, but it doesn't match the target
# destination, we close and clear it. # 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.teardown()
self.link = None self.link = None
@ -832,7 +691,7 @@ class Browser:
self.status = Browser.PATH_REQUESTED self.status = Browser.PATH_REQUESTED
self.update_display() 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): while not RNS.Transport.has_path(self.destination_hash):
now = time.time() now = time.time()
if now > pr_time+self.timeout: if now > pr_time+self.timeout:
@ -874,7 +733,7 @@ class Browser:
self.update_display() self.update_display()
receipt = self.link.request( receipt = self.link.request(
self.path, self.path,
data = self.request_data, data = None,
response_callback = self.response_received, response_callback = self.response_received,
failed_callback = self.request_failed, failed_callback = self.request_failed,
progress_callback = self.response_progressed progress_callback = self.response_progressed
@ -1038,10 +897,7 @@ class Browser:
try: try:
file_name = request_receipt.response[0] file_name = request_receipt.response[0]
file_data = request_receipt.response[1] file_data = request_receipt.response[1]
file_destination_name = file_name.split("/") file_destination = self.app.downloads_path+"/"+file_name
file_destination_name = file_destination_name[len(file_destination_name)-1]
file_destination = self.app.downloads_path+"/"+file_destination_name
counter = 0 counter = 0
while os.path.isfile(file_destination): while os.path.isfile(file_destination):
@ -1070,11 +926,6 @@ class Browser:
self.response_transfer_size = None self.response_transfer_size = None
self.update_display() self.update_display()
if self.link != None:
try:
self.link.teardown()
except Exception as e:
pass
else: else:
self.status = Browser.REQUEST_FAILED self.status = Browser.REQUEST_FAILED
self.response_progress = 0 self.response_progress = 0
@ -1082,11 +933,6 @@ class Browser:
self.response_transfer_size = None self.response_transfer_size = None
self.update_display() self.update_display()
if self.link != None:
try:
self.link.teardown()
except Exception as e:
pass
def request_timeout(self, request_receipt=None): def request_timeout(self, request_receipt=None):
@ -1096,11 +942,6 @@ class Browser:
self.response_transfer_size = None self.response_transfer_size = None
self.update_display() self.update_display()
if self.link != None:
try:
self.link.teardown()
except Exception as e:
pass
def response_progressed(self, request_receipt): def response_progressed(self, request_receipt):

View File

@ -12,13 +12,13 @@ class ConfigDisplayShortcuts():
class ConfigFiller(urwid.WidgetWrap): class ConfigFiller(urwid.WidgetWrap):
def __init__(self, widget, app): def __init__(self, widget, app):
self.app = 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): def keypress(self, size, key):
if key == "up": 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) return super(ConfigFiller, self).keypress(size, key)
@ -31,20 +31,12 @@ class ConfigDisplay():
self.editor_term = EditorTerminal(self.app, self) self.editor_term = EditorTerminal(self.app, self)
self.widget = urwid.LineBox(self.editor_term) self.widget = urwid.LineBox(self.editor_term)
self.app.ui.main_display.update_active_sub_display() 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) self.editor_term.term.change_focus(True)
pile = urwid.Pile([ 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) self.config_explainer = ConfigFiller(pile, self.app)
@ -79,11 +71,11 @@ class EditorTerminal(urwid.WidgetWrap):
urwid.connect_signal(self.term, 'closed', quit_term) urwid.connect_signal(self.term, 'closed', quit_term)
super().__init__(self.term) urwid.WidgetWrap.__init__(self, self.term)
def keypress(self, size, key): def keypress(self, size, key):
# TODO: Decide whether there should be a way to get out while editing # TODO: Decide whether there should be a way to get out while editing
#if key == "up": #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) return super(EditorTerminal, self).keypress(size, key)

View File

@ -37,9 +37,9 @@ class ConversationsArea(urwid.LineBox):
elif key == "ctrl g": elif key == "ctrl g":
self.delegate.toggle_fullscreen() self.delegate.toggle_fullscreen()
elif key == "tab": 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()): 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: else:
return super(ConversationsArea, self).keypress(size, key) return super(ConversationsArea, self).keypress(size, key)
@ -69,10 +69,10 @@ class ConversationsDisplay():
self.columns_widget = urwid.Columns( 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), (ConversationsDisplay.given_list_width, self.listbox),
(urwid.WEIGHT, 1, self.make_conversation_widget(None)) ("weight", 1, self.make_conversation_widget(None))
], ],
dividechars=0, focus_column=0, box_columns=[0] dividechars=0, focus_column=0, box_columns=[0]
) )
@ -105,15 +105,12 @@ class ConversationsDisplay():
highlight_offFocus="list_off_focus" 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)), title="Conversations")
self.listbox.delegate = self self.listbox.delegate = self
def delete_selected_conversation(self): def delete_selected_conversation(self):
self.dialog_open = True 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): def dismiss_dialog(sender):
self.update_conversation_list() self.update_conversation_list()
@ -127,42 +124,23 @@ class ConversationsDisplay():
dialog = DialogLineBox( dialog = DialogLineBox(
urwid.Pile([ 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="?" ]), title="?"
) )
dialog.delegate = self dialog.delegate = self
bottom = self.listbox 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) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
self.columns_widget.contents[0] = (overlay, options) self.columns_widget.contents[0] = (overlay, options)
def edit_selected_in_directory(self): def edit_selected_in_directory(self):
g = self.app.ui.glyphs g = self.app.ui.glyphs
self.dialog_open = True 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 display_name = self.ilb.get_selected_item().display_name
if display_name == None: if display_name == None:
display_name = "" display_name = ""
@ -239,12 +217,9 @@ class ConversationsDisplay():
RNS.log("Could not save directory entry. The contained exception was: "+str(e), RNS.LOG_VERBOSE) RNS.log("Could not save directory entry. The contained exception was: "+str(e), RNS.LOG_VERBOSE)
if not dialog_pile.error_display: if not dialog_pile.error_display:
dialog_pile.error_display = True 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((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)) source_is_known = self.app.directory.is_known(bytes.fromhex(source_hash_text))
if source_is_known: if source_is_known:
@ -253,23 +228,13 @@ class ConversationsDisplay():
def query_action(sender, user_data): def query_action(sender, user_data):
self.close_conversation_by_hash(user_data) self.close_conversation_by_hash(user_data)
nomadnet.Conversation.query_for_peer(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 = [ dialog_pile.contents = [
(urwid.Text("Query sent"), options), (urwid.Text("Query sent"), options),
(urwid.Button("OK", on_press=dismiss_dialog), 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) 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 send messages to it. You can query the network to obtain the identity.\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([ dialog_pile = urwid.Pile([
selected_id_widget, selected_id_widget,
@ -282,11 +247,7 @@ class ConversationsDisplay():
r_direct, r_direct,
r_propagated, r_propagated,
known_section, 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 dialog_pile.error_display = False
@ -294,19 +255,10 @@ class ConversationsDisplay():
dialog.delegate = self dialog.delegate = self
bottom = self.listbox 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) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
self.columns_widget.contents[0] = (overlay, options) self.columns_widget.contents[0] = (overlay, options)
def new_conversation(self): def new_conversation(self):
@ -354,15 +306,9 @@ class ConversationsDisplay():
RNS.log("Could not start conversation. The contained exception was: "+str(e), RNS.LOG_VERBOSE) RNS.log("Could not start conversation. The contained exception was: "+str(e), RNS.LOG_VERBOSE)
if not dialog_pile.error_display: if not dialog_pile.error_display:
dialog_pile.error_display = True 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((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([ dialog_pile = urwid.Pile([
e_id, e_id,
@ -372,11 +318,7 @@ class ConversationsDisplay():
r_unknown, r_unknown,
r_trusted, r_trusted,
urwid.Text(""), 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 dialog_pile.error_display = False
@ -384,19 +326,10 @@ class ConversationsDisplay():
dialog.delegate = self dialog.delegate = self
bottom = self.listbox 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) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
self.columns_widget.contents[0] = (overlay, options) self.columns_widget.contents[0] = (overlay, options)
def ingest_lxm_uri(self): def ingest_lxm_uri(self):
@ -427,10 +360,7 @@ class ConversationsDisplay():
rdialog_pile = urwid.Pile([ rdialog_pile = urwid.Pile([
urwid.Text("Message was decoded, decrypted successfully, and added to your conversation list."), urwid.Text("Message was decoded, decrypted successfully, and added to your conversation list."),
urwid.Text(""), urwid.Text(""),
urwid.Columns([ urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
(urwid.WEIGHT, 0.6, urwid.Text("")),
(urwid.WEIGHT, 0.4, urwid.Button("OK", on_press=dismiss_dialog)),
])
]) ])
rdialog_pile.error_display = False rdialog_pile.error_display = False
@ -438,28 +368,16 @@ class ConversationsDisplay():
rdialog.delegate = self rdialog.delegate = self
bottom = self.listbox bottom = self.listbox
roverlay = urwid.Overlay( roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
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) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
self.columns_widget.contents[0] = (roverlay, options) self.columns_widget.contents[0] = (roverlay, options)
elif ingest_result == duplicate_signal: elif ingest_result == duplicate_signal:
rdialog_pile = urwid.Pile([ 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("The decoded message has already been processed by the LXMF Router, and will not be ingested again."),
urwid.Text(""), urwid.Text(""),
urwid.Columns([ urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
(urwid.WEIGHT, 0.6, urwid.Text("")),
(urwid.WEIGHT, 0.4, urwid.Button("OK", on_press=dismiss_dialog)),
])
]) ])
rdialog_pile.error_display = False rdialog_pile.error_display = False
@ -467,18 +385,9 @@ class ConversationsDisplay():
rdialog.delegate = self rdialog.delegate = self
bottom = self.listbox bottom = self.listbox
roverlay = urwid.Overlay( roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
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) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
self.columns_widget.contents[0] = (roverlay, options) self.columns_widget.contents[0] = (roverlay, options)
else: else:
@ -490,10 +399,7 @@ class ConversationsDisplay():
rdialog_pile = urwid.Pile([ rdialog_pile = urwid.Pile([
urwid.Text(propagation_text), urwid.Text(propagation_text),
urwid.Text(""), urwid.Text(""),
urwid.Columns([ urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
(urwid.WEIGHT, 0.6, urwid.Text("")),
(urwid.WEIGHT, 0.4, urwid.Button("OK", on_press=dismiss_dialog)),
])
]) ])
rdialog_pile.error_display = False rdialog_pile.error_display = False
@ -501,36 +407,23 @@ class ConversationsDisplay():
rdialog.delegate = self rdialog.delegate = self
bottom = self.listbox bottom = self.listbox
roverlay = urwid.Overlay( roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
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) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
self.columns_widget.contents[0] = (roverlay, options) self.columns_widget.contents[0] = (roverlay, options)
except Exception as e: except Exception as e:
RNS.log("Could not ingest LXM URI. The contained exception was: "+str(e), RNS.LOG_VERBOSE) RNS.log("Could not ingest LXM URI. The contained exception was: "+str(e), RNS.LOG_VERBOSE)
if not dialog_pile.error_display: if not dialog_pile.error_display:
dialog_pile.error_display = True 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((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.contents.append((urwid.Text(("error_text", "Could ingest LXM from URI data. Check your input."), align="center"), options))
dialog_pile = urwid.Pile([ dialog_pile = urwid.Pile([
e_uri, e_uri,
urwid.Text(""), urwid.Text(""),
urwid.Columns([ urwid.Columns([("weight", 0.45, urwid.Button("Ingest", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Back", on_press=dismiss_dialog))])
(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_pile.error_display = False
@ -538,18 +431,9 @@ class ConversationsDisplay():
dialog.delegate = self dialog.delegate = self
bottom = self.listbox 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.GIVEN, ConversationsDisplay.given_list_width) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
self.columns_widget.contents[0] = (overlay, options) self.columns_widget.contents[0] = (overlay, options)
def delete_conversation(self, source_hash): def delete_conversation(self, source_hash):
@ -581,7 +465,7 @@ class ConversationsDisplay():
r_mall = urwid.RadioButton(max_messages_group, "Download all", state=True) r_mall = urwid.RadioButton(max_messages_group, "Download all", state=True)
r_mlim = urwid.RadioButton(max_messages_group, "Limit to", state=False) r_mlim = urwid.RadioButton(max_messages_group, "Limit to", state=False)
ie_lim = urwid.IntEdit("", 5) ie_lim = urwid.IntEdit("", 5)
rbs = urwid.GridFlow([r_mlim, ie_lim], 12, 1, 0, align=urwid.LEFT) rbs = urwid.GridFlow([r_mlim, ie_lim], 12, 1, 0, align="left")
def sync_now(sender): def sync_now(sender):
limit = None limit = None
@ -605,11 +489,7 @@ class ConversationsDisplay():
else: else:
sync_button = hidden_sync_button sync_button = hidden_sync_button
button_columns = urwid.Columns([ button_columns = urwid.Columns([("weight", 0.45, sync_button), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, cancel_button)])
(urwid.WEIGHT, 0.45, sync_button),
(urwid.WEIGHT, 0.1, urwid.Text("")),
(urwid.WEIGHT, 0.45, cancel_button),
])
real_sync_button.bc = button_columns real_sync_button.bc = button_columns
pn_ident = None pn_ident = None
@ -632,7 +512,7 @@ class ConversationsDisplay():
dialog = DialogLineBox( dialog = DialogLineBox(
urwid.Pile([ urwid.Pile([
urwid.Text(""+g["node"]+pn_display_str, align=urwid.CENTER), urwid.Text(""+g["node"]+pn_display_str, align="center"),
urwid.Divider(g["divider1"]), urwid.Divider(g["divider1"]),
sync_progress, sync_progress,
urwid.Divider(g["divider1"]), urwid.Divider(g["divider1"]),
@ -643,23 +523,12 @@ class ConversationsDisplay():
]), title="Message Sync" ]), title="Message Sync"
) )
else: else:
button_columns = urwid.Columns([ button_columns = urwid.Columns([("weight", 0.45, urwid.Text("" )), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, cancel_button)])
(urwid.WEIGHT, 0.45, urwid.Text("" )),
(urwid.WEIGHT, 0.1, urwid.Text("")),
(urwid.WEIGHT, 0.45, cancel_button),
])
dialog = DialogLineBox( dialog = DialogLineBox(
urwid.Pile([ urwid.Pile([
urwid.Text(""), urwid.Text(""),
urwid.Text("No trusted nodes found, cannot sync!\n", align=urwid.CENTER), urwid.Text("No trusted nodes found, cannot sync!\n", align="center"),
urwid.Text( urwid.Text("To syncronise messages from the network, one or more nodes must be marked as trusted in the Known Nodes list, or a node must manually be selected as the default propagation node. Nomad Network will then automatically sync from the nearest trusted node, or the manually selected one.", align="left"),
"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(""), urwid.Text(""),
button_columns button_columns
]), title="Message Sync" ]), title="Message Sync"
@ -675,19 +544,10 @@ class ConversationsDisplay():
self.sync_dialog = dialog self.sync_dialog = dialog
bottom = self.listbox 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) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
self.columns_widget.contents[0] = (overlay, options) self.columns_widget.contents[0] = (overlay, options)
def update_sync_dialog(self, loop = None, sender = None): def update_sync_dialog(self, loop = None, sender = None):
@ -695,9 +555,9 @@ class ConversationsDisplay():
self.sync_dialog.sync_progress.set_completion(self.app.get_sync_progress()) 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: 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)) self.sync_dialog.bc.contents[0] = (self.sync_dialog.real_sync_button, self.sync_dialog.bc.options("weight", 0.45))
else: else:
self.sync_dialog.bc.contents[0] = (self.sync_dialog.hidden_sync_button, self.sync_dialog.bc.options(urwid.WEIGHT, 0.45)) self.sync_dialog.bc.contents[0] = (self.sync_dialog.hidden_sync_button, self.sync_dialog.bc.options("weight", 0.45))
self.app.ui.loop.set_alarm_in(0.2, self.update_sync_dialog) self.app.ui.loop.set_alarm_in(0.2, self.update_sync_dialog)
@ -708,22 +568,13 @@ class ConversationsDisplay():
def update_conversation_list(self): def update_conversation_list(self):
ilb_position = self.ilb.get_selected_position() ilb_position = self.ilb.get_selected_position()
self.update_listbox() 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) options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
if not (self.dialog_open and self.sync_dialog != None): if not (self.dialog_open and self.sync_dialog != None):
self.columns_widget.contents[0] = (self.listbox, options) self.columns_widget.contents[0] = (self.listbox, options)
else: else:
bottom = self.listbox bottom = self.listbox
overlay = urwid.Overlay( overlay = urwid.Overlay(self.sync_dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
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) self.columns_widget.contents[0] = (overlay, options)
if ilb_position != None: if ilb_position != None:
@ -749,17 +600,17 @@ class ConversationsDisplay():
self.app.mark_conversation_read(self.currently_displayed_conversation) self.app.mark_conversation_read(self.currently_displayed_conversation)
self.currently_displayed_conversation = source_hash 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) options = self.widget.options("weight", 1)
self.widget.contents[1] = (self.make_conversation_widget(source_hash), options) self.widget.contents[1] = (self.make_conversation_widget(source_hash), options)
if source_hash == None: if source_hash == None:
self.widget.focus_position = 0 self.widget.set_focus_column(0)
else: else:
if self.app.conversation_is_unread(source_hash): if self.app.conversation_is_unread(source_hash):
self.app.mark_conversation_read(source_hash) self.app.mark_conversation_read(source_hash)
self.update_conversation_list() self.update_conversation_list()
self.widget.focus_position = 1 self.widget.set_focus_column(1)
conversation_position = None conversation_position = None
index = 0 index = 0
for widget in self.list_widgets: for widget in self.list_widgets:
@ -899,9 +750,9 @@ class MessageEdit(urwid.Edit):
y = self.get_cursor_coords(size)[1] y = self.get_cursor_coords(size)[1]
if y == 0: if y == 0:
if self.delegate.full_editor_active and self.name == "title_editor": 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": 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: else:
return super(MessageEdit, self).keypress(size, key) return super(MessageEdit, self).keypress(size, key)
else: else:
@ -912,11 +763,11 @@ class MessageEdit(urwid.Edit):
class ConversationFrame(urwid.Frame): class ConversationFrame(urwid.Frame):
def keypress(self, size, key): 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: 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: elif key == "down" and self.delegate.messagelist.bottom_is_visible:
self.focus_position = "footer" self.set_focus("footer")
else: else:
return super(ConversationFrame, self).keypress(size, key) return super(ConversationFrame, self).keypress(size, key)
elif key == "ctrl k": elif key == "ctrl k":
@ -931,7 +782,7 @@ class ConversationWidget(urwid.WidgetWrap):
if source_hash == None: if source_hash == None:
self.frame = None self.frame = None
display_widget = urwid.LineBox(urwid.Filler(urwid.Text("\n No conversation selected"), "top")) display_widget = urwid.LineBox(urwid.Filler(urwid.Text("\n No conversation selected"), "top"))
super().__init__(display_widget) urwid.WidgetWrap.__init__(self, display_widget)
else: else:
if source_hash in ConversationsDisplay.cached_conversation_widgets: if source_hash in ConversationsDisplay.cached_conversation_widgets:
return ConversationsDisplay.cached_conversation_widgets[source_hash] return ConversationsDisplay.cached_conversation_widgets[source_hash]
@ -958,11 +809,7 @@ class ConversationWidget(urwid.WidgetWrap):
header = None header = None
if self.conversation.trust_level == DirectoryEntry.UNTRUSTED: 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 = urwid.AttrMap(msg_editor, "msg_editor")
self.minimal_editor.name = "minimal_editor" self.minimal_editor.name = "minimal_editor"
@ -999,7 +846,7 @@ class ConversationWidget(urwid.WidgetWrap):
self.frame self.frame
) )
super().__init__(self.display_widget) urwid.WidgetWrap.__init__(self, self.display_widget)
def clear_history_dialog(self): def clear_history_dialog(self):
def dismiss_dialog(sender): def dismiss_dialog(sender):
@ -1014,30 +861,17 @@ class ConversationWidget(urwid.WidgetWrap):
dialog = DialogLineBox( dialog = DialogLineBox(
urwid.Pile([ 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="?" ]), title="?"
) )
dialog.delegate = self dialog.delegate = self
bottom = self.messagelist 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.contents["body"] = (overlay, self.frame.options())
self.frame.focus_position = "body" self.frame.set_focus("body")
def toggle_editor(self): def toggle_editor(self):
if self.full_editor_active: if self.full_editor_active:
@ -1054,17 +888,7 @@ class ConversationWidget(urwid.WidgetWrap):
if allowed: if allowed:
self.frame.contents["footer"] = (self.minimal_editor, None) self.frame.contents["footer"] = (self.minimal_editor, None)
else: else:
warning = urwid.AttrMap( warning = urwid.AttrMap(urwid.Padding(urwid.Text("\n"+g["info"]+"\n\nYou cannot currently message this peer, since it's identity keys are not known.\n\nWait for an announce to arrive from the peer, or query the network for it.\n\nTo query the network, select this conversation in the conversation list, press Ctrl-E, and use the query button.\n", align="center")), "msg_header_caution")
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) self.frame.contents["footer"] = (warning, None)
def toggle_focus_area(self): def toggle_focus_area(self):
@ -1075,9 +899,9 @@ class ConversationWidget(urwid.WidgetWrap):
pass pass
if name == "messagelist": if name == "messagelist":
self.frame.focus_position = "footer" self.frame.set_focus("footer")
elif name == "minimal_editor" or name == "full_editor": elif name == "minimal_editor" or name == "full_editor":
self.frame.focus_position = "body" self.frame.set_focus("body")
def keypress(self, size, key): def keypress(self, size, key):
if key == "tab": if key == "tab":
@ -1144,30 +968,7 @@ class ConversationWidget(urwid.WidgetWrap):
else: else:
pass pass
def paper_message_saved(self, path): def paper_message(self):
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() content = self.content_editor.get_edit_text()
title = self.title_editor.get_edit_text() title = self.title_editor.get_edit_text()
if not content == "": if not content == "":
@ -1176,70 +977,6 @@ class ConversationWidget(urwid.WidgetWrap):
else: else:
self.paper_message_failed() 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 paper_message_failed(self):
def dismiss_dialog(sender): def dismiss_dialog(sender):
self.dialog_open = False self.dialog_open = False
@ -1247,23 +984,17 @@ class ConversationWidget(urwid.WidgetWrap):
dialog = DialogLineBox( dialog = DialogLineBox(
urwid.Pile([ urwid.Pile([
urwid.Text( urwid.Text("Could not output paper message,\ncheck your settings. See the log\nfile for any error messages.\n", align="center"),
"Could not output paper message,\ncheck your settings. See the log\nfile for any error messages.\n", urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
align=urwid.CENTER,
),
urwid.Columns([
(urwid.WEIGHT, 0.6, urwid.Text("")),
(urwid.WEIGHT, 0.4, urwid.Button("OK", on_press=dismiss_dialog)),
])
]), title="!" ]), title="!"
) )
dialog.delegate = self dialog.delegate = self
bottom = self.messagelist bottom = self.messagelist
overlay = urwid.Overlay(dialog, bottom, align=urwid.CENTER, width=34, valign=urwid.MIDDLE, height=urwid.PACK, left=2, right=2) overlay = urwid.Overlay(dialog, bottom, align="center", width=34, valign="middle", height="pack", left=2, right=2)
self.frame.contents["body"] = (overlay, self.frame.options()) self.frame.contents["body"] = (overlay, self.frame.options())
self.frame.focus_position = "body" self.frame.set_focus("body")
def close(self): def close(self):
self.delegate.close_conversation(self) self.delegate.close_conversation(self)
@ -1323,7 +1054,7 @@ class LXMessageWidget(urwid.WidgetWrap):
urwid.Text("") urwid.Text("")
]) ])
super().__init__(display_widget) urwid.WidgetWrap.__init__(self, display_widget)
class SyncProgressBar(urwid.ProgressBar): class SyncProgressBar(urwid.ProgressBar):
def get_text(self): def get_text(self):

View File

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

View File

@ -6,13 +6,13 @@ class IntroDisplay():
font = urwid.font.HalfBlock5x4Font() font = urwid.font.HalfBlock5x4Font()
big_text = urwid.BigText(("intro_title", self.app.config["textui"]["intro_text"]), font) big_text = urwid.BigText(("intro_title", self.app.config["textui"]["intro_text"]), 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([ intro = urwid.Pile([
big_text, 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.Divider(),
urwid.Text(("-= Starting =- "), align=urwid.CENTER), urwid.Text(("-= Starting =- "), align="center"),
]) ])
self.widget = urwid.Filler(intro) self.widget = urwid.Filler(intro)

View File

@ -10,7 +10,7 @@ class GuideDisplayShortcuts():
self.app = app self.app = app
g = app.ui.glyphs g = app.ui.glyphs
self.widget = urwid.AttrMap(urwid.Padding(urwid.Text(""), align=urwid.LEFT), "shortcutbar") self.widget = urwid.AttrMap(urwid.Padding(urwid.Text(""), align="left"), "shortcutbar")
class ListEntry(urwid.Text): class ListEntry(urwid.Text):
_selectable = True _selectable = True
@ -75,7 +75,7 @@ class GuideEntry(urwid.WidgetWrap):
style = "topic_list_normal" style = "topic_list_normal"
focus_style = "list_focus" focus_style = "list_focus"
self.display_widget = urwid.AttrMap(widget, style, focus_style) self.display_widget = urwid.AttrMap(widget, style, focus_style)
super().__init__(self.display_widget) urwid.WidgetWrap.__init__(self, self.display_widget)
def display_topic(self, event, topic): def display_topic(self, event, topic):
markup = TOPICS[topic] markup = TOPICS[topic]
@ -125,12 +125,12 @@ class TopicList(urwid.WidgetWrap):
highlight_offFocus="list_off_focus" highlight_offFocus="list_off_focus"
) )
super().__init__(urwid.LineBox(self.ilb, title="Topics")) urwid.WidgetWrap.__init__(self, urwid.LineBox(self.ilb, title="Topics"))
def keypress(self, size, key): def keypress(self, size, key):
if key == "up" and (self.ilb.first_item_is_selected()): if key == "up" and (self.ilb.first_item_is_selected()):
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(TopicList, self).keypress(size, key) return super(TopicList, self).keypress(size, key)
@ -141,16 +141,16 @@ class GuideDisplay():
self.app = app self.app = app
g = self.app.ui.glyphs g = self.app.ui.glyphs
topic_text = urwid.Text("\n No topic selected", align=urwid.LEFT) topic_text = urwid.Text("\n No topic selected", align="left")
self.left_area = TopicList(self.app, self) self.left_area = TopicList(self.app, self)
self.right_area = urwid.LineBox(urwid.Filler(topic_text, urwid.TOP)) self.right_area = urwid.LineBox(urwid.Filler(topic_text, "top"))
self.columns = urwid.Columns( self.columns = urwid.Columns(
[ [
(urwid.WEIGHT, GuideDisplay.list_width, self.left_area), ("weight", GuideDisplay.list_width, self.left_area),
(urwid.WEIGHT, 1-GuideDisplay.list_width, self.right_area) ("weight", 1-GuideDisplay.list_width, self.right_area)
], ],
dividechars=0, focus_column=0 dividechars=0, focus_column=0
) )
@ -163,8 +163,9 @@ class GuideDisplay():
entry.display_topic(entry.display_topic, entry.topic_name) entry.display_topic(entry.display_topic, entry.topic_name)
def set_content_widgets(self, new_content): def set_content_widgets(self, new_content):
options = self.columns.options(width_type=urwid.WEIGHT, width_amount=1-GuideDisplay.list_width, box_widget=True) options = self.columns.options(width_type="weight", width_amount=1-GuideDisplay.list_width)
pile = urwid.Pile(new_content) pile = urwid.Pile(new_content)
#content = urwid.LineBox(urwid.Filler(pile, "top"))
content = urwid.LineBox(urwid.AttrMap(ScrollBar(Scrollable(pile), thumb_char="\u2503", trough_char=" "), "scrollbar")) content = urwid.LineBox(urwid.AttrMap(ScrollBar(Scrollable(pile), thumb_char="\u2503", trough_char=" "), "scrollbar"))
self.columns.contents[1] = (content, options) self.columns.contents[1] = (content, options)
@ -216,15 +217,6 @@ The different sections of the program has a number of keyboard shortcuts mapped,
- Ctrl-W Close conversation - Ctrl-W Close conversation
>>`!Network Window`! >>`!Network Window`!
>>>Browser
- Ctrl-D Back
- Ctrl-F Forward
- Ctrl-R Reload page
- Ctrl-U Open URL entry dialog
- Ctrl-S Save connected node
- Ctrl-G Toggle fullscreen browser window
- Ctrl-W Disconnect from node
>>>Announce Stream >>>Announce Stream
- Ctrl-L Switch to Known Nodes list - Ctrl-L Switch to Known Nodes list
- Ctrl-X Delete selected announce - Ctrl-X Delete selected announce
@ -235,10 +227,14 @@ The different sections of the program has a number of keyboard shortcuts mapped,
- Ctrl-X Delete selected node entry - Ctrl-X Delete selected node entry
- Ctrl-P Display peered LXMF Propagation Nodes - Ctrl-P Display peered LXMF Propagation Nodes
>>>Peered LXMF Propagation Nodes >>>Browser
- Ctrl-L Switch to Announce Stream or Known Nodes - Ctrl-D Back
- Ctrl-X Break peering with selected node entry - Ctrl-F Forward
- Ctrl-R Request immediate delivery sync of unhandled LXMs - Ctrl-R Reload page
- Ctrl-U Open URL entry dialog
- Ctrl-S Save connected node
- Ctrl-G Toggle fullscreen browser window
- Ctrl-W Disconnect from node
''' '''
TOPIC_CONCEPTS = '''>Concepts and Terminology TOPIC_CONCEPTS = '''>Concepts and Terminology
@ -300,59 +296,43 @@ To learn how to host your own node, read the `*Hosting a Node`* section of this
TOPIC_HOSTING = '''>Hosting a Node TOPIC_HOSTING = '''>Hosting a Node
To host a node on the network, you must enable it in the configuration file, by setting the `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is launched, and other peers on the network will be able to connect and interact with content on your node. To host a node on the network, you must enable it in the configuration file, by setting `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is launched, and other peers on the network will be able to connect and interact with content on your node.
By default, no content is defined, apart from a short placeholder home page. To learn how to add your own content, read on. By default, no content is defined, apart from a short placeholder home page. To learn how to add your own content, read on.
>>Distributed Message Store >>Distributed Message Store
All nodes on the network will automatically participate in a distributed message store that allows users to exchange messages, even when they are not connected to the network at the same time. All nodes on the network automatically form a distributed message store that allows users to exchange messages, even when they are not available at the same time.
When Nomad Network is configured to host a node, by default it also configures itself as an LXMF Propagation Node, and automatically discovers and peers with other propagation nodes on the network. This process is completely automatic and requires no configuration from the node operator. When Nomad Network is configured to host a node, it also configures itself as an LXMF Propagation Node, and automatically discovers and peers with other propagation nodes on the network. This process is completely automatic and requires no configuration from the node operator.
`!However`!, if there is already an abundance of Propagation Nodes on the network, or the operator simply wishes to host a pageserving-only node, Propagation Node hosting can be disabled in the configuration file. To view LXMF Propagation nodes that are currently peered with your node, go to the `![ Network ]`! part of the program and press `!Ctrl-P`!.
To view LXMF Propagation nodes that are currently peered with your node, go to the `![ Network ]`! part of the program and press `!Ctrl-P`!. In the list of peered Propagation Nodes, it is possible to:
- Immediately break peering with a node by pressing `!Ctrl-X`!
- Request an immediate delivery sync of all unhandled messages for a node, by pressing `!Ctrl-R`!
The distributed message store is resilient to intermittency, and will remain functional as long as at least one node remains on the network. Nodes that were offline for a time will automatically be synced up to date when they regain connectivity. The distributed message store is resilient to intermittency, and will remain functional as long as at least one node remains on the network. Nodes that were offline for a time will automatically be synced up to date when they regain connectivity.
>>Pages >>Pages
Nomad Network nodes can host pages similar to web pages, that other peers can read and interact with. Pages are written in a compact markup language called `*micron`*. To learn how to write formatted pages with micron, see the `*Markup`* section of this guide (which is, itself, written in micron). Pages can be linked together with hyperlinks, that can also link to pages (or other resources) on other nodes. Nomad Network nodes can host pages similar to web pages, that other peers can read and interact with. Pages are written in a compact markup language called `*micron`*. To learn how to write formatted pages with micron, see the `*Markup`* section of this guide (which is, itself, written in micron). Pages can be linked arbitrarily with hyperlinks, that can also link to pages (or other resources) on other nodes.
To add pages to your node, place micron files in the `*pages`* directory of your Nomad Network programs `*storage`* directory. By default, the path to this will be `!~/.nomadnetwork/storage/pages`!. You should probably create the file `!index.mu`! first, as this is the page that will get served by default to a connecting peer. To add pages to your node, place micron files in the `*pages`* directory of your Nomad Network programs `*storage`* directory. By default, the path to this will be `!~/.nomadnetwork/storage/pages`!. You should probably create the file `!index.mu`! first, as this is the page that will get served by default to a connecting peer.
You can control how long a peer will cache your pages by including the cache header in a page. To do so, the first line of your page must start with `!#!c=X`!, where `!X`! is the cache time in seconds. To tell the peer to always load the page from your node, and never cache it, set the cache time to zero. You should only do this if there is a real need, for example if your page displays dynamic content that `*must`* be updated at every page view. The default caching time is 12 hours. In most cases, you should not need to include the cache control header in your pages. You can control how long a peer will cache your pages by including the cache header in a page. To do so, the first line of your page must start with `!#!c=X`!, where `!X`! is the cache time in seconds. To tell the peer to always load the page from your node, and never cache it, set the cache time to zero. You should only do this if there is a real need, for example if your page displays dynamic content that `*must`* be updated at every page view. The default caching time is 12 hours. In most cases, you should not need to include the cache control header in your pages.
>> Dynamic Pages You can use a preprocessor such as PHP, bash, Python (or whatever you prefer) to generate dynamic pages. To do so, just set executable permissions on the relevant page file, and be sure to include the interpreter at the beginning of the file, for example `!#!/usr/bin/python3`!.
You can use a preprocessor such as PHP, bash, Python (or whatever you prefer) to generate dynamic pages and fully interactive applications running over Nomad Network. To do so, just set executable permissions on the relevant page file, and be sure to include the interpreter at the beginning of the file, for example `!#!/usr/bin/python3`!.
Data from fields and link variables will be passed to these scipts or programs as environment variables, and can simply be read by any method for accessing such.
In the `!examples`! directory, you can find various small examples for the use of this feature. The currently included examples are:
- A messageboard that receives messages over LXMF, contributed by trippcheng
- A simple demonstration on how to create fields and read entered data in node-side scripts
By default, you can find the examples in `!~/.nomadnetwork/examples`!. If you build something neat, that you feel would fit here, you are more than welcome to contribute it.
>>Authenticating Users >>Authenticating Users
Sometimes, you don't want everyone to be able to view certain pages or execute certain scripts. In such cases, you can use `*authentication`* to control who gets to run certain requests. Sometimes, you don't want everyone to be able to view certain pages or execute certain scripts. In such cases, you can use `*authentication`* to control who gets to run certain requests.
To enable authentication for any page, simply add a new file to your pages directory with ".allowed" added to the file-name of the page. If your page is named "secret_page.mu", just add a file named "secret_page.allowed". To enable authentication for any page, simply add a new file to your pages directory with ".allowed" added to the file-name of the page. If your page is named "secret_page.mu", just add a file named "secret_page.mu.allowed".
For each user allowed to access the page, add a line to this file, containing the hash of that users primary identity. Users can find their own identity hash in the `![ Network ]`! part of the program, under `!Local Peer Info`!. If you want to allow access for three different users, your file would look like this: For each user allowed to access the page, add a line to this file, containing the hash of that users primary identity. Users can find their own identity hash in the `![ Network ]`! part of the program, under `!Local Peer Info`!. If you want to allow access for three different users, your file would look like this:
`Faaa `Faaa
`= `=
d454bcdac0e64fb68ba8e267543ae110 24c2dc2248953e0a3c21
2b9ff3fb5902c9ca5ff97bdfb239ef50 564a476410f4fca2ae93
7106d5abbc7208bfb171f2dd84b36490 8bb864743f12f53395a1
`= `=
`` ``
@ -368,7 +348,7 @@ Like pages, you can place files you want to make available in the `!~/.nomadnetw
Links to pages and resources in Nomad Network use a simple URL format. Here is an example: Links to pages and resources in Nomad Network use a simple URL format. Here is an example:
`!18176ffddcc8cce1ddf8e3f72068f4a6:/page/index.mu`! `!1385edace36466a6b3dd:/page/index.mu`!
The first part is the 10 byte destination address of the node (represented as readable hexadecimal), followed by the `!:`! character. Everything after the `!:`! represents the request path. The first part is the 10 byte destination address of the node (represented as readable hexadecimal), followed by the `!:`! character. Everything after the `!:`! represents the request path.
@ -400,7 +380,7 @@ You're currently located in the guide section of the program. I'm sorry I had to
To get the most out of Nomad Network, you will need a terminal that supports UTF-8 and at least 256 colors, ideally true-color. If your terminal supports true-color, you can go to the `![ Config ]`! menu item, launch the editor and change the configuration. To get the most out of Nomad Network, you will need a terminal that supports UTF-8 and at least 256 colors, ideally true-color. If your terminal supports true-color, you can go to the `![ Config ]`! menu item, launch the editor and change the configuration.
It is recommended to use a terminal size of at least 135x32. Nomad Network will work with smaller terminal sizes, but the interface might feel a bit cramped. It is recommended to use a terminal size of at least 122x32. Nomad Network will work with smaller terminal sizes, but the interface might feel a bit cramped.
If you don't already have a Nerd Font installed (see https://www.nerdfonts.com/), I also highly recommend to do so, since it will greatly expand the amount of glyphs, icons and graphics that Nomad Network can use. Once you have your terminal set up with a Nerd Font, go to the `![ Config ]`! menu item and enable Nerd Fonts in the configuration instead of normal unicode glyphs. If you don't already have a Nerd Font installed (see https://www.nerdfonts.com/), I also highly recommend to do so, since it will greatly expand the amount of glyphs, icons and graphics that Nomad Network can use. Once you have your terminal set up with a Nerd Font, go to the `![ Config ]`! menu item and enable Nerd Fonts in the configuration instead of normal unicode glyphs.
@ -485,12 +465,6 @@ Selects which interface to use. Currently, only the `!text`! interface is availa
Sets the filesystem path to store downloaded files in. Sets the filesystem path to store downloaded files in.
< <
>>>
`!notify_on_new_message = yes`!
>>>>
Sets whether to output a notification character (bell or flash) to the terminal when a new message is received.
<
>>> >>>
`!announce_at_start = yes`! `!announce_at_start = yes`!
>>>> >>>>
@ -521,30 +495,6 @@ The number of minutes between each automatic sync. The default is equal to 6 hou
On low-bandwidth networks, it can be useful to limit the amount of messages downloaded in each sync. The default is 8. Set to 0 to download all available messages every time a sync occurs. On low-bandwidth networks, it can be useful to limit the amount of messages downloaded in each sync. The default is 8. Set to 0 to download all available messages every time a sync occurs.
< <
>>>
`!required_stamp_cost = None`!
>>>>
You can specify a required stamp cost for inbound messages to be accepted. Specifying a stamp cost will require untrusted senders that message you to include a cryptographic stamp in their messages. Performing this operation takes the sender an amount of time proportional to the stamp cost. As a rough estimate, a stamp cost of 8 will take less than a second to compute, and a stamp cost of 20 could take several minutes, even on a fast computer.
<
>>>
`!accept_invalid_stamps = False`!
>>>>
You can signal stamp requirements to senders, but still accept messages with invalid stamps by setting this option to True.
<
>>>
`!max_accepted_size = 500`!
>>>>
The maximum accepted unpacked size for messages received directly from other peers, specified in kilobytes. Messages larger than this will be rejected before the transfer begins.
<
>>>
`!compact_announce_stream = yes`!
>>>>
With this option enabled, Nomad Network will only display one entry in the announce stream per destination. Older announces are culled when a new one arrives.
<
>> Text UI Section >> Text UI Section
This section hold configuration directives related to the look and feel of the text-based user interface of the program. It is delimited by the `![textui]`! header in the configuration file. Available directives, along with their default values, are as follows: This section hold configuration directives related to the look and feel of the text-based user interface of the program. It is delimited by the `![textui]`! header in the configuration file. Available directives, along with their default values, are as follows:
@ -647,60 +597,24 @@ Determines how often, in minutes, your node is announced on the network. Default
Determines where the node server will look for hosted pages. Must be a readable filesystem path. Determines where the node server will look for hosted pages. Must be a readable filesystem path.
< <
>>>
`!page_refresh_interval = 0`!
>>>>
Determines the interval in minutes for rescanning the hosted pages path. By default, this option is disabled, and the pages path will only be scanned on startup.
<
>>> >>>
`!files_path = ~/.nomadnetwork/storage/files`! `!files_path = ~/.nomadnetwork/storage/files`!
>>>> >>>>
Determines where the node server will look for downloadable files. Must be a readable filesystem path. Determines where the node server will look for downloadable files. Must be a readable filesystem path.
< <
>>>
`!file_refresh_interval = 0`!
>>>>
Determines the interval in minutes for rescanning the hosted files path. By default, this option is disabled, and the files path will only be scanned on startup.
<
>>>
`!disable_propagation = yes`!
>>>>
When Nomad Network is hosting a node, it can also run an LXMF propagation node. If there is already a large amount of propagation nodes on the network, or you simply want to run a pageserving-only node, you can disable running a propagation node.
<
>>> >>>
`!message_storage_limit = 2000`! `!message_storage_limit = 2000`!
>>>> >>>>
Configures the maximum amount of storage, in megabytes, that the LXMF Propagation Node will use to store messages. Configures the maximum amount of storage, in megabytes, that the LXMF Propagation Node will use to store messages.
< <
>>>
`!max_transfer_size = 256`!
>>>>
The maximum accepted transfer size per incoming propagation transfer, in kilobytes. This also sets the upper limit for the size of single messages accepted onto this propagation node. If a node wants to propagate a larger number of messages to this node, than what can fit within this limit, it will prioritise sending the smallest, newest messages first, and try with any remaining messages at a later point.
<
>>> >>>
`!prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf`! `!prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf`!
>>>> >>>>
Configures the LXMF Propagation Node to prioritise storing messages for certain destinations. If the message store reaches the specified limit, LXMF will prioritise keeping messages for destinations specified with this option. This setting is optional, and generally you do not need to use it. Configures the LXMF Propagation Node to prioritise storing messages for certain destinations. If the message store reaches the specified limit, LXMF will prioritise keeping messages for destinations specified with this option. This setting is optional, and generally you do not need to use it.
< <
>>>
`!max_peers = 25`!
>>>>
Configures the maximum number of other nodes the LXMF Propagation Node will automatically peer with. The default is 50, but can be lowered or increased according to available resources.
<
>>>
`!static_peers = e17f833c4ddf8890dd3a79a6fea8161d, 5a2d0029b6e5ec87020abaea0d746da4`!
>>>>
Configures the LXMF Propagation Node to always maintain propagation node peering with the specified list of destination hashes.
<
>> Printing Section >> Printing Section
This section holds configuration directives related to printing. It is delimited by the `![printing]`! header in the configuration file. Available directives, along with example values, are as follows: This section holds configuration directives related to printing. It is delimited by the `![printing]`! header in the configuration file. Available directives, along with example values, are as follows:
@ -763,11 +677,12 @@ If you have Internet access, and just want to get started experimenting, you are
The Testnet also runs the latest version of Reticulum, often even a short while before it is publicly released, which means strange behaviour might occur. If none of that scares you, add the following interface to your Reticulum configuration file to join: The Testnet also runs the latest version of Reticulum, often even a short while before it is publicly released, which means strange behaviour might occur. If none of that scares you, add the following interface to your Reticulum configuration file to join:
>> >>
[[RNS Testnet Dublin]] [[RNS Testnet Zurich]]
type = TCPClientInterface type = TCPClientInterface
enabled = yes interface_enabled = yes
target_host = dublin.connect.reticulum.network outgoing = True
target_port = 4965 target_host = zurich.connect.reticulum.network
target_port = 4242
< <
If you connect to the testnet, you can leave nomadnet running for a while and wait for it to receive announces from other nodes on the network that host pages or services, or you can try connecting directly to some nodes listed here: 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:
@ -812,7 +727,7 @@ The following line should contain a grayscale gradient bar:
Unicode Glyphs : \u2713 \u2715 \u26a0 \u24c3 \u2193 Unicode Glyphs : \u2713 \u2715 \u26a0 \u24c3 \u2193
Nerd Font Glyphs : \uf484 \U000f04c5 \U000f0219 \U000f0002 \uf415 \uf023 \uf06e Nerd Font Glyphs : \uf484 \uf9c4 \uf719 \uf502 \uf415 \uf023 \uf06e
''' '''
@ -1079,135 +994,6 @@ Here is `F00f`_`[a more visible link`72914442a3689add83a09a767963f57c:/page/inde
When links like these are displayed in the built-in browser, clicking on them or activating them using the keyboard will cause the browser to load the specified URL. When links like these are displayed in the built-in browser, clicking on them or activating them using the keyboard will cause the browser to load the specified URL.
>Fields & Requests
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.
>>Request Links
Links can contain request variables and a list of fields to submit to the node-side application. You can include all fields on the page, only specific ones, and any number of request variables. To simply submit all fields on a page to a specified node-side page, create a link like this:
`Faaa
`=
`[Submit Fields`:/page/fields.mu`*]
`=
``
Note the `!*`! following the extra `!\\``! at the end of the path. This `!*`! denotes `*all fields`*. You can also specify a list of fields to include:
`Faaa
`=
`[Submit Fields`:/page/fields.mu`username|auth_token]
`=
``
If you want to include pre-set variables, you can do it like this:
`Faaa
`=
`[Query the System`:/page/fields.mu`username|auth_token|action=view|amount=64]
`=
``
>> Fields
Here's an example of creating a field. We'll create a field named `!user_input`! and fill it with the text `!Pre-defined data`!. Note that we are using background color tags to make the field more visible to the user:
`Faaa
`=
A simple input field: `B444`<user_input`Pre-defined data>`b
`=
``
You must always set a field `*name`*, but you can of course omit the pre-defined value of the field:
`Faaa
`=
An empty input field: `B444`<demo_empty`>`b
`=
``
You can set the size of the field like this:
`Faaa
`=
A sized input field: `B444`<16|with_size`>`b
`=
``
It is possible to mask fields, for example for use with passwords and similar:
`Faaa
`=
A masked input field: `B444`<!|masked_demo`hidden text>`b
`=
``
And you can of course control all parameters at the same time:
`Faaa
`=
Full control: `B444`<!32|all_options`hidden text>`b
`=
``
Collecting the above markup produces the following output:
`Faaa`B333
A simple input field: `B444`<user_input`Pre-defined data>`B333
An empty input field: `B444`<demo_empty`>`B333
A sized input field: `B444`<16|with_size`>`B333
A masked input field: `B444`<!|masked_demo`hidden text>`B333
Full control: `B444`<!32|all_options`hidden text>`B333
`b
>>> Checkboxes
In addition to text fields, Checkboxes are another way of submitting data. They allow the user to make a single selection or select multiple options.
`Faaa
`=
`<?|field_name|value`>`b Label Text`
`=
When the checkbox is checked, it's field will be set to the provided value. If there are multiple checkboxes that share the same field name, the checked values will be concatenated when they are sent to the node by a comma.
``
`B444`<?|sign_up|1`>`b Sign me up`
You can also pre-check both checkboxes and radio groups by appending a |* after the field value.
`B444`<?|checkbox|1|*`>`b Pre-checked checkbox`
>>> Radio groups
Radio groups are another input that lets the user chose from a set of options. Unlike checkboxes, radio buttons with the same field name are mutually exclusive.
Example:
`=
`B900`<^|color|Red`>`b Red
`B090`<^|color|Green`>`b Green
`B009`<^|color|Blue`>`b Blue
`=
will render:
`B900`<^|color|Red`>`b Red
`B090`<^|color|Green`>`b Green
`B009`<^|color|Blue`>`b Blue
In this example, when the data is submitted, `B444` field_color`b will be set to whichever value from the list was selected.
``
>Comments >Comments
You can insert comments that will not be displayed in the output by starting a line with the # character. You can insert comments that will not be displayed in the output by starting a line with the # character.
@ -1240,7 +1026,7 @@ To display literal content, for example source-code, or blocks of text that shou
`= `=
''' '''
TOPIC_MARKUP += TOPIC_MARKUP.replace("`=", "\\`=") + "[ micron source for document goes here, we don't want infinite recursion now, do we? ]\n\\`=" TOPIC_MARKUP += TOPIC_MARKUP.replace("`=", "\\`=") + "[ micron source for document goes here, we don't want infinite recursion now, do we? ]\n\\`="
TOPIC_MARKUP += "\n`=\n\n>Closing Remarks\n\nIf you made it all the way here, you should be well equipped to write documents, pages and applications using micron and Nomad Network. Thank you for staying with me.\n" TOPIC_MARKUP += "\n`=\n\n>Closing Remarks\n\nIf you made it all the way here, you should be well equipped to write documents and pages using micron. Thank you for staying with me.\n\n`c\U0001F332\n"
TOPICS = { TOPICS = {

View File

@ -1,11 +1,6 @@
import os
import sys
import itertools
import mmap
import urwid import urwid
import nomadnet import nomadnet
class LogDisplayShortcuts(): class LogDisplayShortcuts():
def __init__(self, app): def __init__(self, app):
import urwid import urwid
@ -13,115 +8,31 @@ class LogDisplayShortcuts():
self.widget = urwid.AttrMap(urwid.Text(""), "shortcutbar") self.widget = urwid.AttrMap(urwid.Text(""), "shortcutbar")
class LogDisplay(): class LogDisplay():
def __init__(self, app): def __init__(self, app):
import urwid
self.app = app self.app = app
self.log_term = LogTerminal(self.app)
self.shortcuts_display = LogDisplayShortcuts(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): def shortcuts(self):
return self.shortcuts_display return self.shortcuts_display
class LogTerminal(urwid.WidgetWrap): class LogTerminal(urwid.WidgetWrap):
def __init__(self, app): def __init__(self, app):
self.app = app self.app = app
self.log_term = urwid.Terminal( self.log_term = urwid.Terminal(
("tail", "-fn50", self.app.logfilepath), ("tail", "-fn50", self.app.logfilepath),
encoding='utf-8', 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): def keypress(self, size, key):
if key == "up": 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) 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)

View File

@ -1,4 +1,5 @@
import RNS import RNS
import time
from .Network import * from .Network import *
from .Conversations import * from .Conversations import *
@ -115,7 +116,6 @@ class MainDisplay():
def show_log(self, user_data): def show_log(self, user_data):
self.sub_displays.active_display = self.sub_displays.log_display self.sub_displays.active_display = self.sub_displays.log_display
self.sub_displays.log_display.show()
self.update_active_sub_display() self.update_active_sub_display()
def show_guide(self, user_data): def show_guide(self, user_data):
@ -125,8 +125,6 @@ class MainDisplay():
def update_active_sub_display(self): def update_active_sub_display(self):
self.frame.contents["body"] = (self.sub_displays.active().widget, None) self.frame.contents["body"] = (self.sub_displays.active().widget, None)
self.update_active_shortcuts() 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): def update_active_shortcuts(self):
self.frame.contents["footer"] = (self.sub_displays.active().shortcuts().widget, None) self.frame.contents["footer"] = (self.sub_displays.active().shortcuts().widget, None)
@ -142,22 +140,13 @@ class MainDisplay():
self.menu_display.start() self.menu_display.start()
def quit(self, sender=None): 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 raise urwid.ExitMainLoop
class MenuColumns(urwid.Columns): class MenuColumns(urwid.Columns):
def keypress(self, size, key): def keypress(self, size, key):
if key == "tab" or key == "down": 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) return super(MenuColumns, self).keypress(size, key)
@ -171,7 +160,7 @@ class MenuDisplay():
self.menu_indicator = urwid.Text("") self.menu_indicator = urwid.Text("")
menu_text = (urwid.PACK, self.menu_indicator) menu_text = ("pack", self.menu_indicator)
button_network = (11, MenuButton("Network", on_press=handler.show_network)) button_network = (11, MenuButton("Network", on_press=handler.show_network))
button_conversations = (17, MenuButton("Conversations", on_press=handler.show_conversations)) button_conversations = (17, MenuButton("Conversations", on_press=handler.show_conversations))
button_directory = (13, MenuButton("Directory", on_press=handler.show_directory)) button_directory = (13, MenuButton("Directory", on_press=handler.show_directory))

View File

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

View File

@ -1,9 +1,9 @@
import nomadnet import nomadnet
import urwid import urwid
import random
import time import time
from urwid.util import is_mouse_press from urwid.util import is_mouse_press
from urwid.text_layout import calc_coords from urwid.text_layout import calc_coords
import re
DEFAULT_FG_DARK = "ddd" DEFAULT_FG_DARK = "ddd"
DEFAULT_FG_LIGHT = "222" DEFAULT_FG_LIGHT = "222"
@ -62,12 +62,11 @@ def markup_to_attrmaps(markup, url_delegate = None):
for line in lines: for line in lines:
if len(line) > 0: if len(line) > 0:
display_widgets = parse_line(line, state, url_delegate) display_widget = parse_line(line, state, url_delegate)
else: 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)) attrmap = urwid.AttrMap(display_widget, make_style(state))
attrmaps.append(attrmap) attrmaps.append(attrmap)
@ -125,7 +124,7 @@ def parse_line(line, state, url_delegate):
heading_style = first_style heading_style = first_style
output.insert(0, " "*left_indent(state)) 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: else:
return None return None
else: else:
@ -138,85 +137,22 @@ def parse_line(line, state, url_delegate):
else: else:
divider_char = "\u2500" divider_char = "\u2500"
if state["depth"] == 0: if state["depth"] == 0:
return [urwid.Divider(divider_char)] return urwid.Divider(divider_char)
else: 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) output = make_output(state, line, url_delegate)
if output != None: 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: if url_delegate != None:
text_widget = LinkableText(output, align=state["align"], delegate=url_delegate) text_widget = LinkableText(output, align=state["align"], delegate=url_delegate)
else: else:
text_widget = urwid.Text(output, align=state["align"]) text_widget = urwid.Text(output, align=state["align"])
if state["depth"] == 0: if state["depth"] == 0:
return [text_widget] return text_widget
else: 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: else:
return None return None
else: else:
@ -487,100 +423,6 @@ def make_output(state, line, url_delegate):
elif c == "a": elif c == "a":
state["align"] = state["default_align"] 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 == "[": elif c == "[":
endpos = line[i:].find("]") endpos = line[i:].find("]")
if endpos == -1: if endpos == -1:
@ -592,20 +434,13 @@ def make_output(state, line, url_delegate):
link_components = link_data.split("`") link_components = link_data.split("`")
if len(link_components) == 1: if len(link_components) == 1:
link_label = "" link_label = ""
link_fields = ""
link_url = link_data link_url = link_data
elif len(link_components) == 2: elif len(link_components) == 2:
link_label = link_components[0] link_label = link_components[0]
link_url = link_components[1] 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: else:
link_url = "" link_url = ""
link_label = "" link_label = ""
link_fields = ""
if len(link_url) != 0: if len(link_url) != 0:
if link_label == "": if link_label == "":
@ -633,11 +468,6 @@ def make_output(state, line, url_delegate):
if url_delegate != None: if url_delegate != None:
linkspec = LinkSpec(link_url, orig_spec) 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)) output.append((linkspec, link_label))
else: else:
output.append(make_part(state, link_label)) output.append(make_part(state, link_label))
@ -680,9 +510,8 @@ def make_output(state, line, url_delegate):
class LinkSpec(urwid.AttrSpec): class LinkSpec(urwid.AttrSpec):
def __init__(self, link_target, orig_spec): def __init__(self, link_target, orig_spec):
self.link_target = link_target 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): class LinkableText(urwid.Text):
@ -692,17 +521,16 @@ class LinkableText(urwid.Text):
signals = ["click", "change"] signals = ["click", "change"]
def __init__(self, text, align=None, cursor_position=0, delegate=None): 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.delegate = delegate
self._cursor_position = 0 self._cursor_position = 0
self.key_timeout = 3 self.key_timeout = 3
self.in_columns = False
if self.delegate != None: if self.delegate != None:
self.delegate.last_keypress = 0 self.delegate.last_keypress = 0
def handle_link(self, link_target, link_fields): def handle_link(self, link_target):
if self.delegate != None: 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): def find_next_part_pos(self, pos, part_positions):
for position in part_positions: for position in part_positions:
@ -760,7 +588,7 @@ class LinkableText(urwid.Text):
item = self.find_item_at_pos(self._cursor_position) item = self.find_item_at_pos(self._cursor_position)
if item != None: if item != None:
if isinstance(item, LinkSpec): if isinstance(item, LinkSpec):
self.handle_link(item.link_target, item.link_fields) self.handle_link(item.link_target)
elif key == "up": elif key == "up":
self._cursor_position = 0 self._cursor_position = 0
@ -773,11 +601,7 @@ class LinkableText(urwid.Text):
elif key == "right": elif key == "right":
old = self._cursor_position old = self._cursor_position
self._cursor_position = self.find_next_part_pos(self._cursor_position, part_positions) self._cursor_position = self.find_next_part_pos(self._cursor_position, part_positions)
if self._cursor_position == old: if self._cursor_position == old:
if self.in_columns:
return "right"
else:
self._cursor_position = 0 self._cursor_position = 0
return "down" return "down"
@ -785,9 +609,6 @@ class LinkableText(urwid.Text):
elif key == "left": elif key == "left":
if self._cursor_position > 0: 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._cursor_position = self.find_prev_part_pos(self._cursor_position, part_positions)
self._invalidate() self._invalidate()
@ -803,7 +624,7 @@ class LinkableText(urwid.Text):
def render(self, size, focus=False): def render(self, size, focus=False):
now = time.time() 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): if focus and (self.delegate == None or now < self.delegate.last_keypress+self.key_timeout):
c = urwid.CompositeCanvas(c) c = urwid.CompositeCanvas(c)
@ -825,7 +646,6 @@ class LinkableText(urwid.Text):
return x, y return x, y
def mouse_event(self, size, event, button, x, y, focus): def mouse_event(self, size, event, button, x, y, focus):
try:
if button != 1 or not is_mouse_press(event): if button != 1 or not is_mouse_press(event):
return False return False
else: else:
@ -858,12 +678,9 @@ class LinkableText(urwid.Text):
if item != None: if item != None:
if isinstance(item, LinkSpec): if isinstance(item, LinkSpec):
self.handle_link(item.link_target, item.link_fields) self.handle_link(item.link_target)
self._invalidate() self._invalidate()
self._emit("change") self._emit("change")
return True return True
except Exception as e:
return False

File diff suppressed because it is too large Load Diff

View File

@ -107,51 +107,6 @@ class Scrollable(urwid.WidgetDecoration):
if canv_full.cursor is not None: if canv_full.cursor is not None:
# Full canvas contains the cursor, but scrolled out of view # Full canvas contains the cursor, but scrolled out of view
self._forward_keypress = False 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: else:
# Original widget does not have a cursor, but may be selectable # 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): def _get_original_widget_size(self, size):
ow = self._original_widget ow = self._original_widget
sizing = ow.sizing() sizing = ow.sizing()
if FLOW in sizing: if FIXED in sizing:
return (size[0],)
elif FIXED in sizing:
return () return ()
elif FLOW in sizing:
return (size[0],)
def get_scrollpos(self, size=None, focus=False): def get_scrollpos(self, size=None, focus=False):
"""Current scrolling position """Current scrolling position

View File

@ -269,13 +269,11 @@ class IndicativeListBox(urwid.WidgetWrap):
# mousewheel up # mousewheel up
elif button == 4.0: 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 # mousewheel down
elif button == 5.0: 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() focus_position_after_input = self.get_selected_position()

2483
nomadnet/vendor/configobj.py vendored Normal file

File diff suppressed because it is too large Load Diff

View File

@ -3,5 +3,4 @@ quotes = [
("That's enough entropy for you my friend", "Unknown"), ("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") ("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")
] ]

View File

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