Updated dependencies

Update Guide.py

.dockerignore

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

.github/workflows/publish-container.yml

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

Dockerfile

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

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

Makefile

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

README.md

@@ -1,41 +1,181 @@
-Nomad Network
-==========
+# Nomad Network - Communicate Freely
 
-Communicate Freely.
+Off-grid, resilient mesh communication with strong encryption, forward secrecy and extreme privacy.
 
-![Screenshot](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/3.png)
+![Screenshot](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png)
 
-Nomad Network is built using Reticulum, see [github.com/markqvist/Reticulum](https://github.com/markqvist/Reticulum).
+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 does not need any connections to the public internet to work. In fact, it doesn't even need an IP or Ethernet network. You can use it entirely over packet radio, LoRa or even serial lines. But if you wish, you can bridge islanded networks over the Internet or private ethernet networks, or you can build networks running completely over the Internet. The choice is yours.
+
+If you'd rather want to use an LXMF client with a graphical user interface, you may want to take a look at [Sideband](https://github.com/markqvist/sideband), which is available for Linux, Android and macOS.
 
 ## Notable Features
  - Encrypted messaging over packet-radio, LoRa, WiFi or anything else [Reticulum](https://github.com/markqvist/Reticulum) supports.
  - Zero-configuration, minimal-infrastructure mesh communication
+ - Distributed and encrypted message store holds messages for offline users
+ - Connectable nodes that can host pages and files
+ - Node-side generated pages with PHP, Python, bash or others
+ - Built-in text-based browser for interacting with contents on nodes
+ - An easy to use and bandwidth efficient markup language for writing pages
+ - Page caching in browser
 
 ## Current Status
-
-Pre-alpha. At this point Nomad Network is usable as a basic messaging client over Reticulum networks, but only the very core features have been implemented. Development is ongoing and current features being implemented are:
-
- - Propagated messaging and discussion threads
- - Connectable nodes that can host pages, files and other resources
- - Collaborative information sharing and spatial map-style "wikis"
-
-## Dependencies:
- - Python 3
- - RNS
- - LXMF
+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?
 The easiest way to install Nomad Network is via pip:
 
 ```bash
 # Install Nomad Network and dependencies
-pip3 install nomadnet
+pip install nomadnet
 
 # Run the client
 nomadnet
+
+# Or alternatively run as a daemon, with no user interface
+nomadnet --daemon
+
+# List options
+nomadnet --help
 ```
 
-To use Nomad Network on packet radio or LoRa, you will need to configure your Reticulum installation to use any relevant packet radio TNCs or LoRa devices on your system. See the Reticulum documentation for info.
+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
+nomadnet
+
+# Or alternatively run as a daemon, with no user interface
+nomadnet --daemon
+
+# List options
+nomadnet --help
+```
+
+**Please Note**: If this is the very first time you use pip to install a program on your system, you might need to reboot your system for the program to become available. If you get a "command not found" error or similar when running the program, reboot your system and try again.
+
+The first time the program is running, you will be presented with the **Guide section**, which contains all the information you need to start using Nomad Network.
+
+To use Nomad Network on packet radio or LoRa, you will need to configure your Reticulum installation to use any relevant packet radio TNCs or LoRa devices on your system. See the [Reticulum documentation](https://markqvist.github.io/Reticulum/manual/interfaces.html) for info. For a general introduction on how to set up such a system, take a look at [this post](https://unsigned.io/private-messaging-over-lora/).
+
+If you want to try Nomad Network without building your own physical network, you can connect to the [Unsigned.io RNS Testnet](https://github.com/markqvist/Reticulum#public-testnet) over the Internet, where there is already some Nomad Network and LXMF activity. If you connect to the testnet, you can leave nomadnet running for a while and wait for it to receive announces from other nodes on the network that host pages or services, or you can try connecting directly to some nodes listed here:
+
+ - `abb3ebcd03cb2388a838e70c001291f9` Dublin Hub Testnet Node
+ - `ea6a715f814bdc37e56f80c34da6ad51` Frankfurt Hub Testnet Node
+
+To browse pages on a node that is not currently known, open the URL dialog in the `Network` section of the program by pressing `Ctrl+U`, paste or enter the address and select `Go` or press enter. Nomadnet will attempt to discover and connect to the requested node.
+
+### Install on Android
+You can install Nomad Network on Android using Termux, but there's a few more commands involved than the above one-liner. The process is documented in the [Android Installation](https://markqvist.github.io/Reticulum/manual/gettingstartedfast.html#reticulum-on-android) section of the Reticulum Manual. Once the Reticulum has been installed according to the linked documentation, Nomad Network can be installed as usual with pip.
+
+For a native Android application with a graphical user interface, have a look at [Sideband](https://github.com/markqvist/Sideband).
+
+### Docker Images
+
+Nomad Network is automatically published as a docker image on Github Packages. Image tags are one of either `master` (for the very latest commit) or the version number (eg `0.2.0`) for a specific release.
+
+```sh
+$ docker pull ghcr.io/markqvist/nomadnet:master
+
+# Run nomadnet interactively in a container
+$ docker run -it ghcr.io/markqvist/nomadnet:master --textui
+
+# Run nomadnet as a daemon, using config stored on the host machine in specified
+# directories, and connect the containers network to the host network (which will
+# allow the default AutoInterface to automatically peer with other discovered
+# Reticulum instances).
+$ docker run -d \
+  -v /local/path/nomadnetconfigdir/:/root/.nomadnetwork/ \
+  -v /local/path/reticulumconfigdir/:/root/.reticulum/ \
+  --network host
+  ghcr.io/markqvist/nomadnet:master
+
+# You can also keep the network of the container isolated from the host, but you
+# will need to manually configure one or more Reticulum interfaces to reach other
+# nodes in a network, by editing the Reticulum configuration file.
+$ docker run -d \
+  -v /local/path/nomadnetconfigdir/:/root/.nomadnetwork/ \
+  -v /local/path/reticulumconfigdir/:/root/.reticulum/ \
+  ghcr.io/markqvist/nomadnet:master
+
+# Send daemon log output to console instead of file
+$ docker run -i ghcr.io/markqvist/nomadnet:master --daemon --console
+```
+
+## Help & Discussion
+
+For help requests, discussion, sharing ideas or anything else related to Nomad Network, please have a look at the [Nomad Network discussions pages](https://github.com/markqvist/Reticulum/discussions/categories/nomad-network).
+
+## Support Nomad Network
+You can help support the continued development of open, free and private communications systems by donating via one of the following channels:
+
+- Monero:
+  ```
+  84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
+  ```
+- Ethereum
+  ```
+  0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
+  ```
+- Bitcoin
+  ```
+  3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
+  ```
+- Ko-Fi: https://ko-fi.com/markqvist
+
+## Development Roadmap
+
+- New major features
+    - Network-wide propagated bulletins and discussion threads
+    - Collaborative maps and geospatial information sharing
+    - Facilitation of trade and barter
+- Minor improvements and fixes
+    - Link status (RSSI and SNR) in conversation or conv list
+    - Ctrl-M shorcut for jumping to menu
+    - Share node with other users / send node info to user
+    - Fix internal editor failing on some OSes with no "editor" alias
+    - Possibly add a required-width header
+    - Improve browser handling of remote link close
+    - Better navigation handling when requests fail (also because of closed links)
+    - Retry failed messages mechanism
+    - Re-arrange buttons to be more consistent
+    - Input field for pages
+    - Post mechanism
+    - Term compatibility notice in readme
+    - Selected icon in conversation list
+    - Possibly a Search Local Nodes function
+    - Possibly add via entry in node info box, next to distance
 
 ## Caveat Emptor
-Nomad Network is experimental software, and should be considered as such. While it has been built with cryptography best-practices very foremost in mind, it _has not_ been externally security audited, and there could very well be privacy-breaking bugs. If you want to help out, or help sponsor an audit, please do get in touch.
+Nomad Network is beta software, and should be considered as such. While it has been built with cryptography best-practices very foremost in mind, it _has not_ been externally security audited, and there could very well be privacy-breaking bugs. If you want to help out, or help sponsor an audit, please do get in touch.
+
+## Screenshots
+
+![Screenshot 1](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png)
+
+![Screenshot 2](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/2.png)
+
+![Screenshot 3](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/3.png)
+
+![Screenshot 4](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/4.png)
+
+![Screenshot 5](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/5.png)

nomadnet/Conversation.py

@@ -7,12 +7,15 @@ from nomadnet.Directory import DirectoryEntry
 
 class Conversation:
     cached_conversations = {}
+    unread_conversations = {}
     created_callback = None
 
     aspect_filter = "lxmf.delivery"
     @staticmethod
     def received_announce(destination_hash, announced_identity, app_data):
         app = nomadnet.NomadNetworkApp.get_shared_instance()
+
+        if not destination_hash in app.ignored_list:
             destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
             # Check if the announced destination is in
             # our list of conversations
@@ -26,7 +29,10 @@ class Conversation:
 
             # Add the announce to the directory announce
             # stream logger
-        app.directory.announce_received(destination_hash, app_data)
+            app.directory.lxmf_announce_received(destination_hash, app_data)
+            
+        else:
+            RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
 
     @staticmethod
     def query_for_peer(source_hash):
@@ -57,6 +63,17 @@ class Conversation:
             conversation = Conversation.cached_conversations[RNS.hexrep(source_hash, delimit=False)]
             conversation.scan_storage()
 
+        if not source_hash in Conversation.unread_conversations:
+            Conversation.unread_conversations[source_hash] = True
+            try:
+                dirname = RNS.hexrep(source_hash, delimit=False)
+                open(app.conversationpath + "/" + dirname + "/unread", 'a').close()
+            except Exception as e:
+                pass
+
+            if Conversation.created_callback != None:
+                Conversation.created_callback()
+
         return ingested_path
 
     @staticmethod
@@ -70,6 +87,13 @@ class Conversation:
                     app_data         = RNS.Identity.recall_app_data(source_hash)
                     display_name     = app.directory.display_name(source_hash)
 
+                    unread = False
+                    if source_hash in Conversation.unread_conversations:
+                        unread = True
+                    elif os.path.isfile(app.conversationpath + "/" + dirname + "/unread"):
+                        Conversation.unread_conversations[source_hash] = True
+                        unread = True
+
                     if display_name == None and app_data:
                         display_name = app_data.decode("utf-8")
 
@@ -80,7 +104,7 @@ class Conversation:
                     
                     trust_level      = app.directory.trust_level(source_hash, display_name)
                     
-                    entry = (source_hash_text, display_name, trust_level, sort_name)
+                    entry = (source_hash_text, display_name, trust_level, sort_name, unread)
                     conversations.append(entry)
 
                 except Exception as e:
@@ -114,9 +138,13 @@ class Conversation:
         self.source_known       = False
         self.source_trusted     = False
         self.source_blocked     = False
+        self.unread             = False
 
         self.__changed_callback = None
 
+        if not RNS.Transport.has_path(bytes.fromhex(source_hash)):
+            RNS.Transport.request_path(bytes.fromhex(source_hash))
+
         self.source_identity = RNS.Identity.recall(bytes.fromhex(self.source_hash))
 
         if self.source_identity:
@@ -143,6 +171,11 @@ class Conversation:
                 message_path = self.messages_path + "/" + filename
                 self.messages.append(ConversationMessage(message_path))
 
+        new_len = len(self.messages)
+
+        if new_len > old_len:
+            self.unread = True
+
         if self.__changed_callback != None:
             self.__changed_callback(self)
 
@@ -156,6 +189,15 @@ class Conversation:
         for purged_message in purged_messages:
             self.messages.remove(purged_message)
 
+    def clear_history(self):
+        purged_messages = []
+        for conversation_message in self.messages:
+            purged_messages.append(conversation_message)
+            conversation_message.purge()
+
+        for purged_message in purged_messages:
+            self.messages.remove(purged_message)
+
     def register_changed_callback(self, callback):
         self.__changed_callback = callback
 
@@ -163,9 +205,18 @@ class Conversation:
         if self.send_destination:
             dest = self.send_destination
             source = self.app.lxmf_destination
-            lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=LXMF.LXMessage.DIRECT)
+            desired_method = LXMF.LXMessage.DIRECT
+            if self.app.directory.preferred_delivery(dest.hash) == DirectoryEntry.PROPAGATED:
+                if self.app.message_router.get_outbound_propagation_node() != None:
+                    desired_method = LXMF.LXMessage.PROPAGATED
+
+            lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
             lxm.register_delivery_callback(self.message_notification)
             lxm.register_failed_callback(self.message_notification)
+
+            if self.app.message_router.get_outbound_propagation_node() != None:
+                lxm.try_propagation_on_fail = self.app.try_propagation_on_fail
+
             self.app.message_router.handle_outbound(lxm)
 
             message_path = Conversation.ingest(lxm, self.app, originator=True)
@@ -176,16 +227,78 @@ class Conversation:
             RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
             return False
 
+    def paper_output(self, content="", title="", mode="print_qr"):
+        if self.send_destination:
+            try:
+                dest = self.send_destination
+                source = self.app.lxmf_destination
+                desired_method = LXMF.LXMessage.PAPER
+
+                lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
+
+                if mode == "print_qr":
+                    qr_code = lxm.as_qr()
+                    qr_tmp_path = self.app.tmpfilespath+"/"+str(RNS.hexrep(lxm.hash, delimit=False))
+                    qr_code.save(qr_tmp_path)
+
+                    print_result = self.app.print_file(qr_tmp_path)
+                    os.unlink(qr_tmp_path)
+                    
+                    if print_result:
+                        message_path = Conversation.ingest(lxm, self.app, originator=True)
+                        self.messages.append(ConversationMessage(message_path))
+
+                    return print_result
+
+                elif mode == "save_qr":
+                    qr_code = lxm.as_qr()
+                    qr_save_path = self.app.downloads_path+"/LXM_"+str(RNS.hexrep(lxm.hash, delimit=False)+".png")
+                    qr_code.save(qr_save_path)
+                    message_path = Conversation.ingest(lxm, self.app, originator=True)
+                    self.messages.append(ConversationMessage(message_path))
+                    return qr_save_path
+
+                elif mode == "save_uri":
+                    lxm_uri = lxm.as_uri()+"\n"
+                    uri_save_path = self.app.downloads_path+"/LXM_"+str(RNS.hexrep(lxm.hash, delimit=False)+".txt")
+                    with open(uri_save_path, "wb") as f:
+                        f.write(lxm_uri.encode("utf-8"))
+
+                    message_path = Conversation.ingest(lxm, self.app, originator=True)
+                    self.messages.append(ConversationMessage(message_path))
+                    return uri_save_path
+
+                elif mode == "return_uri":
+                    return lxm.as_uri()
+
+            except Exception as e:
+                RNS.log("An error occurred while generating paper message, the contained exception was: "+str(e), RNS.LOG_ERROR)
+                return False
+
+        else:
+            RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
+            return False
+
     def message_notification(self, message):
+        if message.state == LXMF.LXMessage.FAILED and hasattr(message, "try_propagation_on_fail") and message.try_propagation_on_fail:
+            RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE)
+            message.try_propagation_on_fail = None
+            message.delivery_attempts = 0
+            del message.next_delivery_attempt
+            message.packed = None
+            message.desired_method = LXMF.LXMessage.PROPAGATED
+            self.app.message_router.handle_outbound(message)
+        else:
             message_path = Conversation.ingest(message, self.app, originator=True)
 
     def __str__(self):
         string = self.source_hash
 
-        if self.source_identity:
-            if self.source_identity.app_data:
-                # TODO: Sanitise for viewing
-                string += " | "+self.source.source_identity.app_data.decode("utf-8")
+        # TODO: Remove this
+        # if self.source_identity:
+        #     if self.source_identity.app_data:
+        #         # TODO: Sanitise for viewing, or just clean this
+        #         string += " | "+self.source_identity.app_data.decode("utf-8")
 
         return string
 
@@ -203,6 +316,7 @@ class ConversationMessage:
             self.lxm = LXMF.LXMessage.unpack_from_file(open(self.file_path, "rb"))
             self.loaded = True
             self.timestamp = self.lxm.timestamp
+            self.sort_timestamp = os.path.getmtime(self.file_path)
 
             if self.lxm.state > LXMF.LXMessage.DRAFT and self.lxm.state < LXMF.LXMessage.SENT:
                 found = False

nomadnet/Directory.py

@@ -2,10 +2,54 @@ import os
 import RNS
 import LXMF
 import time
+import nomadnet
 import RNS.vendor.umsgpack as msgpack
 
+class PNAnnounceHandler:
+    def __init__(self, owner):
+        self.aspect_filter = "lxmf.propagation"
+        self.owner = owner
+
+    def received_announce(self, destination_hash, announced_identity, app_data):
+        try:
+            if type(app_data) == bytes:
+                data = msgpack.unpackb(app_data)
+
+                if data[0] == True:
+                    RNS.log("Received active propagation node announce from "+RNS.prettyhexrep(destination_hash))
+
+                    associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
+                    associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", announced_identity)
+
+                    self.owner.app.directory.pn_announce_received(destination_hash, app_data, associated_peer, associated_node)
+                    self.owner.app.autoselect_propagation_node()
+
+        except Exception as e:
+            RNS.log("Error while evaluating propagation node announce, ignoring announce.", RNS.LOG_DEBUG)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
+
 class Directory:
-    ANNOUNCE_STREAM_MAXLENGTH = 256
+    ANNOUNCE_STREAM_MAXLENGTH = 64
+
+    aspect_filter = "nomadnetwork.node"
+    @staticmethod
+    def received_announce(destination_hash, announced_identity, app_data):
+        try:
+            app = nomadnet.NomadNetworkApp.get_shared_instance()
+
+            if not destination_hash in app.ignored_list:
+                associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
+
+                app.directory.node_announce_received(destination_hash, app_data, associated_peer)
+                app.autoselect_propagation_node()
+                
+            else:
+                RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
+
+        except Exception as e:
+            RNS.log("Error while evaluating LXMF destination announce, ignoring announce.", RNS.LOG_DEBUG)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
+
 
     def __init__(self, app):
         self.directory_entries = {}
@@ -13,12 +57,16 @@ class Directory:
         self.app = app
         self.load_from_disk()
 
+        self.pn_announce_handler = PNAnnounceHandler(self)
+        RNS.Transport.register_announce_handler(self.pn_announce_handler)
+
+
     def save_to_disk(self):
         try:
             packed_list = []
             for source_hash in self.directory_entries:
                 e = self.directory_entries[source_hash]
-                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node))
+                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node, e.preferred_delivery, e.identify, e.sort_rank))
 
             directory = {
                 "entry_list": packed_list,
@@ -28,6 +76,7 @@ class Directory:
             file = open(self.app.directorypath, "wb")
             file.write(msgpack.packb(directory))
             file.close()
+
         except Exception as e:
             RNS.log("Could not write directory to disk. Then contained exception was: "+str(e), RNS.LOG_ERROR)
 
@@ -41,25 +90,131 @@ class Directory:
 
                 entries = {}
                 for e in unpacked_list:
+                        
                     if len(e) > 3:
                         hosts_node = e[3]
                     else:
                         hosts_node = False
 
-                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node)
+                    if len(e) > 4:
+                        preferred_delivery = e[4]
+                    else:
+                        preferred_delivery = None
+
+                    if len(e) > 5:
+                        identify = e[5]
+                    else:
+                        identify = False
+
+                    if len(e) > 6:
+                        sort_rank = e[6]
+                    else:
+                        sort_rank = None
+
+                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery, identify_on_connect=identify, sort_rank=sort_rank)
 
                 self.directory_entries = entries
+
                 self.announce_stream = unpacked_directory["announce_stream"]
 
             except Exception as e:
                 RNS.log("Could not load directory from disk. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
-    def announce_received(self, source_hash, app_data):
+    def lxmf_announce_received(self, source_hash, app_data):
+        if app_data != None:
+            if self.app.compact_stream:
+                try:
+                    remove_announces = []
+                    for announce in self.announce_stream:
+                        if announce[1] == source_hash:
+                            remove_announces.append(announce)
+
+                    for a in remove_announces:
+                        self.announce_stream.remove(a)
+                
+                except Exception as e:
+                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+
             timestamp = time.time()
-        self.announce_stream.insert(0, (timestamp, source_hash, app_data))
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer"))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
                 self.announce_stream.pop()
 
+            if hasattr(self.app.ui, "main_display"):
+                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+
+    def node_announce_received(self, source_hash, app_data, associated_peer):
+        if app_data != None:
+            if self.app.compact_stream:
+                try:
+                    remove_announces = []
+                    for announce in self.announce_stream:
+                        if announce[1] == source_hash:
+                            remove_announces.append(announce)
+
+                    for a in remove_announces:
+                        self.announce_stream.remove(a)
+                
+                except Exception as e:
+                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+
+            timestamp = time.time()
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node"))
+            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                self.announce_stream.pop()
+
+            if self.trust_level(associated_peer) == DirectoryEntry.TRUSTED:
+                existing_entry = self.find(source_hash)
+                if not existing_entry:
+                    node_entry = DirectoryEntry(source_hash, display_name=app_data.decode("utf-8"), trust_level=DirectoryEntry.TRUSTED, hosts_node=True)
+                    self.remember(node_entry)
+            
+            if hasattr(self.app.ui, "main_display"):
+                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+
+    def pn_announce_received(self, source_hash, app_data, associated_peer, associated_node):
+        found_node = None
+        for sh in self.directory_entries:
+            if sh == associated_node:
+                found_node = True
+                break
+
+        for e in self.announce_stream:
+            if e[1] == associated_node:
+                found_node = True
+                break
+
+        if not found_node:
+            if self.app.compact_stream:
+                try:
+                    remove_announces = []
+                    for announce in self.announce_stream:
+                        if announce[1] == source_hash:
+                            remove_announces.append(announce)
+
+                    for a in remove_announces:
+                        self.announce_stream.remove(a)
+                
+                except Exception as e:
+                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+
+            timestamp = time.time()
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "pn"))
+            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                self.announce_stream.pop()
+            
+            if hasattr(self.app.ui, "main_display"):
+                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+
+    def remove_announce_with_timestamp(self, timestamp):
+        selected_announce = None
+        for announce in self.announce_stream:
+            if announce[0] == timestamp:
+                selected_announce = announce
+
+        if selected_announce != None:
+            self.announce_stream.remove(selected_announce)
+
     def display_name(self, source_hash):
         if source_hash in self.directory_entries:
             return self.directory_entries[source_hash].display_name
@@ -69,13 +224,31 @@ class Directory:
     def simplest_display_str(self, source_hash):
         trust_level = self.trust_level(source_hash)
         if trust_level == DirectoryEntry.WARNING or trust_level == DirectoryEntry.UNTRUSTED:
+            if source_hash in self.directory_entries:
+                dn = self.directory_entries[source_hash].display_name
+                if dn == None:
+                    return RNS.prettyhexrep(source_hash)
+                else:
+                    return dn+" <"+RNS.hexrep(source_hash, delimit=False)+">"
+            else:
                 return "<"+RNS.hexrep(source_hash, delimit=False)+">"
         else:
             if source_hash in self.directory_entries:
-                return self.directory_entries[source_hash].display_name
+                dn = self.directory_entries[source_hash].display_name
+                if dn == None:
+                    return RNS.prettyhexrep(source_hash)
+                else:
+                    return dn
             else:
                 return "<"+RNS.hexrep(source_hash, delimit=False)+">"
 
+    def alleged_display_str(self, source_hash):
+        if source_hash in self.directory_entries:
+            return self.directory_entries[source_hash].display_name
+        else:
+            return None
+
+
     def trust_level(self, source_hash, announced_display_name=None):
         if source_hash in self.directory_entries:
             if announced_display_name == None:
@@ -91,9 +264,36 @@ class Directory:
         else:
             return DirectoryEntry.UNKNOWN
 
+    def pn_trust_level(self, source_hash):
+        recalled_identity = RNS.Identity.recall(source_hash)
+        if recalled_identity != None:
+            associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", recalled_identity)
+            return self.trust_level(associated_node)
+
+    def sort_rank(self, source_hash):
+        if source_hash in self.directory_entries:
+            return self.directory_entries[source_hash].sort_rank
+        else:
+            return None
+
+    def preferred_delivery(self, source_hash):
+        if source_hash in self.directory_entries:
+            return self.directory_entries[source_hash].preferred_delivery
+        else:
+            return DirectoryEntry.DIRECT
+
     def remember(self, entry):
         self.directory_entries[entry.source_hash] = entry
 
+        identity = RNS.Identity.recall(entry.source_hash)
+        if identity != None:
+            associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", identity)
+            if associated_node in self.directory_entries:
+                node_entry = self.directory_entries[associated_node]
+                node_entry.trust_level = entry.trust_level
+
+        self.save_to_disk()
+
     def forget(self, source_hash):
         if source_hash in self.directory_entries:
             self.directory_entries.pop(source_hash)
@@ -116,6 +316,18 @@ class Directory:
         except Exception as e:
             return False
 
+    def should_identify_on_connect(self, source_hash):
+        if source_hash in self.directory_entries:
+            entry = self.directory_entries[source_hash]
+            return entry.identify
+        else:
+            return False
+
+    def set_identify_on_connect(self, source_hash, state):
+        if source_hash in self.directory_entries:
+            entry = self.directory_entries[source_hash]
+            entry.identify = state
+    
     def known_nodes(self):
         node_list = []
         for eh in self.directory_entries:
@@ -123,6 +335,7 @@ class Directory:
             if e.hosts_node:
                 node_list.append(e)
 
+        node_list.sort(key = lambda e: (e.sort_rank if e.sort_rank != None else 2^32, DirectoryEntry.TRUSTED-e.trust_level, e.display_name))
         return node_list
 
     def number_of_known_nodes(self):
@@ -144,14 +357,22 @@ class DirectoryEntry:
     UNKNOWN   = 0x02
     TRUSTED   = 0xFF
 
-    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False):
+    DIRECT     = 0x01
+    PROPAGATED = 0x02
+
+    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None, identify_on_connect=False, sort_rank=None):
         if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
             self.source_hash  = source_hash
             self.display_name = display_name
-            if display_name  == None:
-                display_name  = source_hash
+            self.sort_rank = sort_rank
+
+            if preferred_delivery == None:
+                self.preferred_delivery = DirectoryEntry.DIRECT
+            else:
+                self.preferred_delivery = preferred_delivery
 
             self.trust_level  = trust_level
             self.hosts_node   = hosts_node
+            self.identify     = identify_on_connect
         else:
             raise TypeError("Attempt to add invalid source hash to directory")

nomadnet/Node.py

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

nomadnet/NomadNetworkApp.py

@@ -1,11 +1,21 @@
 import os
+import io
+import sys
 import time
+import shlex
 import atexit
+import threading
+import traceback
+import subprocess
+import contextlib
 
 import RNS
 import LXMF
 import nomadnet
 
+from nomadnet.Directory import DirectoryEntry
+from datetime import datetime
+
 import RNS.vendor.umsgpack as msgpack
 
 from ._version import __version__
@@ -15,15 +25,53 @@ class NomadNetworkApp:
     time_format      = "%Y-%m-%d %H:%M:%S"
     _shared_instance = None
 
-    configdir = os.path.expanduser("~")+"/.nomadnetwork"
+    userdir = os.path.expanduser("~")
+    if os.path.isdir("/etc/nomadnetwork") and os.path.isfile("/etc/nomadnetwork/config"):
+        configdir = "/etc/nomadnetwork"
+    elif os.path.isdir(userdir+"/.config/nomadnetwork") and os.path.isfile(userdir+"/.config/nomadnetwork/config"):
+        configdir = userdir+"/.config/nomadnetwork"
+    else:
+        configdir = userdir+"/.nomadnetwork"
+
+    START_ANNOUNCE_DELAY = 3
 
     def exit_handler(self):
-        RNS.log("Nomad Network Client exit handler executing...", RNS.LOG_VERBOSE)
+        self.should_run_jobs = False
+
         RNS.log("Saving directory...", RNS.LOG_VERBOSE)
         self.directory.save_to_disk()
+
+        if hasattr(self.ui, "restore_ixon"):
+            if self.ui.restore_ixon:
+                try:
+                    os.system("stty ixon")
+
+                except Exception as e:
+                    RNS.log("Could not restore flow control sequences. The contained exception was: "+str(e), RNS.LOG_WARNING)
+
+        if hasattr(self.ui, "restore_palette"):
+            if self.ui.restore_palette:
+                try:
+                    self.ui.screen.write("\x1b]104\x07")
+
+                except Exception as e:
+                    RNS.log("Could not restore terminal color palette. The contained exception was: "+str(e), RNS.LOG_WARNING)
+
         RNS.log("Nomad Network Client exiting now", RNS.LOG_VERBOSE)
 
-    def __init__(self, configdir = None, rnsconfigdir = None):
+    def exception_handler(self, e_type, e_value, e_traceback):
+        RNS.log("An unhandled exception occurred, the details of which will be dumped below", RNS.LOG_ERROR)
+        RNS.log("Type  : "+str(e_type), RNS.LOG_ERROR)
+        RNS.log("Value : "+str(e_value), RNS.LOG_ERROR)
+        t_string = ""
+        for line in traceback.format_tb(e_traceback):
+            t_string += line
+        RNS.log("Trace : \n"+t_string, RNS.LOG_ERROR)
+
+        if issubclass(e_type, KeyboardInterrupt):
+            sys.__excepthook__(e_type, e_value, e_traceback)
+
+    def __init__(self, configdir = None, rnsconfigdir = None, daemon = False, force_console = False):
         self.version       = __version__
         self.enable_client = False
         self.enable_node   = False
@@ -36,13 +84,21 @@ class NomadNetworkApp:
         else:
             self.configdir = configdir
 
+        if force_console:
+            self.force_console_log = True
+        else:
+            self.force_console_log = False
+
         if NomadNetworkApp._shared_instance == None:
             NomadNetworkApp._shared_instance = self
 
         self.rns = RNS.Reticulum(configdir = rnsconfigdir)
 
         self.configpath        = self.configdir+"/config"
+        self.ignoredpath       = self.configdir+"/ignored"
         self.logfilepath       = self.configdir+"/logfile"
+        self.errorfilepath     = self.configdir+"/errors"
+        self.pnannouncedpath   = self.configdir+"/pnannounced"
         self.storagepath       = self.configdir+"/storage"
         self.identitypath      = self.configdir+"/storage/identity"
         self.cachepath         = self.configdir+"/storage/cache"
@@ -50,6 +106,28 @@ class NomadNetworkApp:
         self.conversationpath  = self.configdir+"/storage/conversations"
         self.directorypath     = self.configdir+"/storage/directory"
         self.peersettingspath  = self.configdir+"/storage/peersettings"
+        self.tmpfilespath      = self.configdir+"/storage/tmp"
+
+        self.pagespath         = self.configdir+"/storage/pages"
+        self.filespath         = self.configdir+"/storage/files"
+        self.cachepath         = self.configdir+"/storage/cache"
+        self.examplespath      = self.configdir+"/examples"
+
+        self.downloads_path    = os.path.expanduser("~/Downloads")
+
+        self.firstrun          = False
+        self.should_run_jobs   = True
+        self.job_interval      = 5
+        self.defer_jobs        = 90
+
+        self.peer_announce_at_start  = True
+        self.try_propagation_on_fail = True
+        self.disable_propagation     = False
+
+        self.periodic_lxmf_sync = True
+        self.lxmf_sync_interval = 360*60
+        self.lxmf_sync_limit    = 8
+        self.compact_stream     = False
 
         if not os.path.isdir(self.storagepath):
             os.makedirs(self.storagepath)
@@ -63,6 +141,20 @@ class NomadNetworkApp:
         if not os.path.isdir(self.conversationpath):
             os.makedirs(self.conversationpath)
 
+        if not os.path.isdir(self.pagespath):
+            os.makedirs(self.pagespath)
+
+        if not os.path.isdir(self.filespath):
+            os.makedirs(self.filespath)
+
+        if not os.path.isdir(self.cachepath):
+            os.makedirs(self.cachepath)
+
+        if not os.path.isdir(self.tmpfilespath):
+            os.makedirs(self.tmpfilespath)
+        else:
+            self.clear_tmp_dir()
+
         if os.path.isfile(self.configpath):
             try:
                 self.config = ConfigObj(self.configpath)
@@ -78,9 +170,19 @@ class NomadNetworkApp:
                 RNS.log("Check your configuration file for errors!", RNS.LOG_ERROR)
                 nomadnet.panic()
         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...")
             self.createDefaultConfig()
-
+            self.firstrun = True
 
         if os.path.isfile(self.identitypath):
             try:
@@ -110,6 +212,25 @@ class NomadNetworkApp:
                 file = open(self.peersettingspath, "rb")
                 self.peer_settings = msgpack.unpackb(file.read())
                 file.close()
+
+                if not "node_last_announce" in self.peer_settings:
+                    self.peer_settings["node_last_announce"] = None
+
+                if not "propagation_node" in self.peer_settings:
+                    self.peer_settings["propagation_node"] = None
+
+                if not "last_lxmf_sync" in self.peer_settings:
+                    self.peer_settings["last_lxmf_sync"] = 0
+
+                if not "node_connects" in self.peer_settings:
+                    self.peer_settings["node_connects"] = 0
+
+                if not "served_page_requests" in self.peer_settings:
+                    self.peer_settings["served_page_requests"] = 0
+
+                if not "served_file_requests" in self.peer_settings:
+                    self.peer_settings["served_file_requests"] = 0
+
             except Exception as e:
                 RNS.log("Could not load local peer settings from "+self.peersettingspath, RNS.LOG_ERROR)
                 RNS.log("The contained exception was: %s" % (str(e)), RNS.LOG_ERROR)
@@ -118,9 +239,15 @@ class NomadNetworkApp:
             try:
                 RNS.log("No peer settings file found, creating new...")
                 self.peer_settings = {
-                    "display_name": "",
+                    "display_name": "Anonymous Peer",
                     "announce_interval": None,
                     "last_announce": None,
+                    "node_last_announce": None,
+                    "propagation_node": None,
+                    "last_lxmf_sync": 0,
+                    "node_connects": 0,
+                    "served_page_requests": 0,
+                    "served_file_requests": 0
                 }
                 self.save_peer_settings()
                 RNS.log("Created new peer settings file")
@@ -129,12 +256,36 @@ class NomadNetworkApp:
                 RNS.log("The contained exception was: %s" % (str(e)), RNS.LOG_ERROR)
                 nomadnet.panic()
 
+        self.ignored_list = []
+        if os.path.isfile(self.ignoredpath):
+            try:
+                fh = open(self.ignoredpath, "rb")
+                ignored_input = fh.read()
+                fh.close()
 
-        atexit.register(self.exit_handler)
+                ignored_hash_strs = ignored_input.splitlines()
 
-        self.message_router = LXMF.LXMRouter()
+                for hash_str in ignored_hash_strs:
+                    if len(hash_str) == RNS.Identity.TRUNCATED_HASHLENGTH//8*2:
+                        try:
+                            ignored_hash = bytes.fromhex(hash_str.decode("utf-8"))
+                            self.ignored_list.append(ignored_hash)
+
+                        except Exception as e:
+                            RNS.log("Could not decode RNS Identity hash from: "+str(hash_str), RNS.LOG_DEBUG)
+                            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
+
+            except Exception as e:
+                RNS.log("Error while loading list of ignored destinations: "+str(e), RNS.LOG_ERROR)
+
+        self.directory = nomadnet.Directory(self)
+
+        self.message_router = LXMF.LXMRouter(identity = self.identity, storagepath = self.storagepath, autopeer = True)
         self.message_router.register_delivery_callback(self.lxmf_delivery)
 
+        for destination_hash in self.ignored_list:
+            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"])
         self.lxmf_destination.set_default_app_data(self.get_display_name_bytes)
 
@@ -145,14 +296,111 @@ class NomadNetworkApp:
             app_data=None
         )
 
-        RNS.Transport.register_announce_handler(nomadnet.Conversation)
-
         RNS.log("LXMF Router ready to receive on: "+RNS.prettyhexrep(self.lxmf_destination.hash))
 
-        self.directory = nomadnet.Directory.Directory(self)
+        if self.enable_node:
+            self.message_router.set_message_storage_limit(megabytes=self.message_storage_limit)
+            for dest_str in self.prioritised_lxmf_destinations:
+                try:
+                    dest_hash = bytes.fromhex(dest_str)
+                    if len(dest_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8:
+                        self.message_router.prioritise(dest_hash)
 
+                except Exception as e:
+                    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()
+                try:
+                    with open(self.pnannouncedpath, "wb") as pnf:
+                        pnf.write(msgpack.packb(time.time()))
+                        pnf.close()
+
+                except Exception as e:
+                    RNS.log("An error ocurred while writing Propagation Node announce timestamp. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+            if not self.disable_propagation:
+                RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash))
+                
+            self.node = nomadnet.Node(self)
+        else:
+            self.node = None
+            if os.path.isfile(self.pnannouncedpath):
+                try:
+                    RNS.log("Sending indication to peered LXMF Propagation Node that this node is no longer participating", RNS.LOG_DEBUG)
+                    self.message_router.disable_propagation()
+                    os.unlink(self.pnannouncedpath)
+                except Exception as e:
+                    RNS.log("An error ocurred while indicating that this LXMF Propagation Node is no longer participating. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+        RNS.Transport.register_announce_handler(nomadnet.Conversation)
+        RNS.Transport.register_announce_handler(nomadnet.Directory)
+
+        self.autoselect_propagation_node()
+
+        if self.peer_announce_at_start:
+            def delayed_announce():
+                time.sleep(NomadNetworkApp.START_ANNOUNCE_DELAY)
+                self.announce_now()
+
+            da_thread = threading.Thread(target=delayed_announce)
+            da_thread.setDaemon(True)
+            da_thread.start()
+
+        atexit.register(self.exit_handler)
+        sys.excepthook = self.exception_handler
+
+        job_thread = threading.Thread(target=self.__jobs)
+        job_thread.setDaemon(True)
+        job_thread.start()
+
+        # Override UI choice from config on --daemon switch
+        if daemon:
+            self.uimode = nomadnet.ui.UI_NONE
+
+        # This stderr redirect is needed to stop urwid
+        # from spewing KeyErrors to the console and thus,
+        # messing up the UI. A pull request to fix the
+        # bug in urwid was submitted, but until it is
+        # merged, this hack will mitigate it.
+        strio = io.StringIO()
+        with contextlib.redirect_stderr(strio):
             nomadnet.ui.spawn(self.uimode)
 
+        if strio.tell() > 0:
+            try:
+                strio.seek(0)
+                err_file = open(self.errorfilepath, "w")
+                err_file.write(strio.read())
+                err_file.close()
+
+            except Exception as e:
+                RNS.log("Could not write stderr output to error log file at "+str(self.errorfilepath)+".", RNS.LOG_ERROR)
+                RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+
+    def __jobs(self):
+        RNS.log("Deferring scheduled jobs for "+str(self.defer_jobs)+" seconds...", RNS.LOG_DEBUG)
+        time.sleep(self.defer_jobs)
+
+        RNS.log("Starting job scheduler now", RNS.LOG_DEBUG)
+        while self.should_run_jobs:
+            now = time.time()
+            
+            if now > self.peer_settings["last_lxmf_sync"] + self.lxmf_sync_interval:
+                RNS.log("Initiating automatic LXMF sync", RNS.LOG_VERBOSE)
+                self.request_lxmf_sync(limit=self.lxmf_sync_limit)
+
+            time.sleep(self.job_interval)
+
     def set_display_name(self, display_name):
         self.peer_settings["display_name"] = display_name
         self.lxmf_destination.display_name = display_name
@@ -164,11 +412,120 @@ class NomadNetworkApp:
     def get_display_name_bytes(self):
         return self.peer_settings["display_name"].encode("utf-8")
 
+    def get_sync_status(self):
+        if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE:
+            return "Idle"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_PATH_REQUESTED:
+            return "Path requested"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHING:
+            return "Establishing link"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHED:
+            return "Link established"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_REQUEST_SENT:
+            return "Sync request sent"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RECEIVING:
+            return "Receiving messages"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_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:
+            new_msgs = self.message_router.propagation_transfer_last_result
+            if new_msgs == 0:
+                return "Done, no new messages"
+            else:
+                return "Downloaded "+str(new_msgs)+" new messages"
+        else:
+            return "Unknown"
+
+    def sync_status_show_percent(self):
+        if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE:
+            return False
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_PATH_REQUESTED:
+            return False
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHING:
+            return False
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHED:
+            return False
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_REQUEST_SENT:
+            return False
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RECEIVING:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_RECEIVED:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+            return False
+        else:
+            return False
+
+    def get_sync_progress(self):
+        return self.message_router.propagation_transfer_progress
+
+    def request_lxmf_sync(self, limit = None):
+        if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE or self.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
+            self.peer_settings["last_lxmf_sync"] = time.time()
+            self.save_peer_settings()
+            self.message_router.request_messages_from_propagation_node(self.identity, max_messages = limit)
+
+    def cancel_lxmf_sync(self):
+        if self.message_router.propagation_transfer_state != LXMF.LXMRouter.PR_IDLE:
+            self.message_router.cancel_propagation_node_requests()
+
     def announce_now(self):
         self.lxmf_destination.announce()
         self.peer_settings["last_announce"] = time.time()
         self.save_peer_settings()
 
+    def autoselect_propagation_node(self):
+        selected_node = None
+
+        if "propagation_node" in self.peer_settings and self.peer_settings["propagation_node"] != None:
+            selected_node = self.peer_settings["propagation_node"]
+        else:
+            nodes = self.directory.known_nodes()
+            trusted_nodes = []
+
+            best_hops = RNS.Transport.PATHFINDER_M+1
+
+            for node in nodes:
+                if node.trust_level == DirectoryEntry.TRUSTED:
+                    hops = RNS.Transport.hops_to(node.source_hash)
+
+                    if hops < best_hops:
+                        best_hops = hops
+                        selected_node = node.source_hash
+
+        if selected_node == None:
+            RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network, or a propagation node is manually selected.", RNS.LOG_WARNING)
+        else:
+            pn_name_str = ""
+            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)
+
+    def get_user_selected_propagation_node(self):
+        if "propagation_node" in self.peer_settings:
+            return self.peer_settings["propagation_node"]
+        else:
+            return None
+
+    def set_user_selected_propagation_node(self, node_hash):
+        self.peer_settings["propagation_node"] = node_hash
+        self.save_peer_settings()
+        self.autoselect_propagation_node()
+    
+    def get_default_propagation_node(self):
+        return self.message_router.get_outbound_propagation_node()
+
     def save_peer_settings(self):
         file = open(self.peersettingspath, "wb")
         file.write(msgpack.packb(self.peer_settings))
@@ -187,9 +544,115 @@ class NomadNetworkApp:
 
         nomadnet.Conversation.ingest(message, self)
 
+        if self.should_print(message):
+            self.print_message(message)
+
+    def should_print(self, message):
+        if self.print_messages:
+            if self.print_all_messages:
+                return True
+            
+            else:
+                source_hash_text = RNS.hexrep(message.source_hash, delimit=False)
+
+                if self.print_trusted_messages:
+                    trust_level = self.directory.trust_level(message.source_hash)
+                    if trust_level == DirectoryEntry.TRUSTED:
+                        return True
+
+                if type(self.allowed_message_print_destinations) is list:
+                    if source_hash_text in self.allowed_message_print_destinations:
+                        return True
+
+        return False
+
+    def print_file(self, filename):
+        print_command = self.print_command+" "+filename
+
+        try:
+            return_code = subprocess.call(shlex.split(print_command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+        except Exception as e:
+            RNS.log("An error occurred while executing print command: "+str(print_command), RNS.LOG_ERROR)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+            return False
+
+        if return_code == 0:
+            RNS.log("Successfully printed "+str(filename)+" using print command: "+print_command, RNS.LOG_DEBUG)
+            return True
+
+        else:
+            RNS.log("Printing "+str(filename)+" failed using print command: "+print_command, RNS.LOG_DEBUG)
+            return False
+
+
+    def print_message(self, message, received = None):
+        try:
+            template = self.printing_template_msg
+
+            if received == None:
+                received = time.time()
+
+            g = self.ui.glyphs
+            
+            m_rtime = datetime.fromtimestamp(message.timestamp)
+            stime = m_rtime.strftime(self.time_format)
+
+            message_time = datetime.fromtimestamp(received)
+            rtime = message_time.strftime(self.time_format)
+
+            display_name = self.directory.simplest_display_str(message.source_hash)
+            title = message.title_as_string()
+            if title == "":
+                title = "None"
+
+            output = template.format(
+                origin=display_name,
+                stime=stime,
+                rtime=rtime,
+                mtitle=title,
+                mbody=message.content_as_string(),
+            )
+
+            filename = "/tmp/"+RNS.hexrep(RNS.Identity.full_hash(output.encode("utf-8")), delimit=False)
+            with open(filename, "wb") as f:
+                f.write(output.encode("utf-8"))
+                f.close()
+
+            self.print_file(filename)
+
+            os.unlink(filename)
+
+        except Exception as e:
+            RNS.log("Error while printing incoming LXMF message. The contained exception was: "+str(e))
+
     def conversations(self):
         return nomadnet.Conversation.conversation_list(self)
 
+    def has_unread_conversations(self):
+        if len(nomadnet.Conversation.unread_conversations) > 0:
+            return True
+        else:
+            return False
+
+    def conversation_is_unread(self, source_hash):
+        if bytes.fromhex(source_hash) in nomadnet.Conversation.unread_conversations:
+            return True
+        else:
+            return False
+
+    def mark_conversation_read(self, source_hash):
+        if bytes.fromhex(source_hash) in nomadnet.Conversation.unread_conversations:
+            nomadnet.Conversation.unread_conversations.pop(bytes.fromhex(source_hash))
+            if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"):
+                os.unlink(self.conversationpath + "/" + source_hash + "/unread")
+
+    def clear_tmp_dir(self):
+        if os.path.isdir(self.tmpfilespath):
+            for file in os.listdir(self.tmpfilespath):
+                fpath = self.tmpfilespath+"/"+file
+                os.unlink(fpath)
+
     def createDefaultConfig(self):
         self.config = ConfigObj(__default_nomadnet_config__)
         self.config.filename = self.configpath
@@ -211,7 +674,7 @@ class NomadNetworkApp:
                     if RNS.loglevel > 7:
                         RNS.loglevel = 7
                 if option == "destination":
-                    if value.lower() == "file":
+                    if value.lower() == "file" and not self.force_console_log:
                         RNS.logdest = RNS.LOG_FILE
                         if "logfile" in self.config["logging"]:
                             self.logfilepath = self.config["logging"]["logfile"]
@@ -227,6 +690,40 @@ class NomadNetworkApp:
                     value = self.config["client"].as_bool(option)
                     self.enable_client = value
 
+                if option == "downloads_path":
+                    value = self.config["client"]["downloads_path"]
+                    self.downloads_path = os.path.expanduser(value)
+
+                if option == "announce_at_start":
+                    value = self.config["client"].as_bool(option)
+                    self.peer_announce_at_start = value
+
+                if option == "try_propagation_on_send_fail":
+                    value = self.config["client"].as_bool(option)
+                    self.try_propagation_on_fail = value
+
+                if option == "periodic_lxmf_sync":
+                    value = self.config["client"].as_bool(option)
+                    self.periodic_lxmf_sync = value
+
+                if option == "lxmf_sync_interval":
+                    value = self.config["client"].as_int(option)*60
+
+                    if value >= 60:
+                        self.lxmf_sync_interval = value
+
+                if option == "lxmf_sync_limit":
+                    value = self.config["client"].as_int(option)    
+
+                    if value > 0:
+                        self.lxmf_sync_limit = value
+                    else:
+                        self.lxmf_sync_limit = None
+
+                if option == "compact_announce_stream":
+                    value = self.config["client"].as_bool(option)
+                    self.compact_stream = value
+
                 if option == "user_interface":
                     value = value.lower()
                     if value == "none":
@@ -241,6 +738,25 @@ class NomadNetworkApp:
                             else:
                                 self.config["textui"]["intro_time"] = self.config["textui"].as_int("intro_time")
 
+                            if not "intro_text" in self.config["textui"]:
+                                self.config["textui"]["intro_text"] = "Nomad Network"
+
+                            if not "editor" in self.config["textui"]:
+                                self.config["textui"]["editor"] = "nano"
+
+                            if not "glyphs" in self.config["textui"]:
+                                self.config["textui"]["glyphs"] = "unicode"
+
+                            if not "mouse_enabled" in self.config["textui"]:
+                                self.config["textui"]["mouse_enabled"] = True
+                            else:
+                                self.config["textui"]["mouse_enabled"] = self.config["textui"].as_bool("mouse_enabled")
+
+                            if not "hide_guide" in self.config["textui"]:
+                                self.config["textui"]["hide_guide"] = False
+                            else:
+                                self.config["textui"]["hide_guide"] = self.config["textui"].as_bool("hide_guide")
+
                             if not "animation_interval" in self.config["textui"]:
                                 self.config["textui"]["animation_interval"] = 1
                             else:
@@ -279,12 +795,107 @@ class NomadNetworkApp:
                         self.uimode = nomadnet.ui.UI_WEB
 
         if "node" in self.config:
-            for option in self.config["node"]:
-                value = self.config["node"][option]
+            if not "enable_node" in self.config["node"]:
+                self.enable_node = False
+            else:
+                self.enable_node = self.config["node"].as_bool("enable_node")
+
+            if not "node_name" in self.config["node"]:
+                self.node_name = None
+            else:
+                value = self.config["node"]["node_name"]
+                if value.lower() == "none":
+                    self.node_name = None
+                else:
+                    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 "announce_at_start" in self.config["node"]:
+                self.node_announce_at_start = False
+            else:
+                value = self.config["node"].as_bool("announce_at_start")
+                self.node_announce_at_start = value
+
+            if not "announce_interval" in self.config["node"]:
+                self.node_announce_interval = 720
+            else:
+                value = self.config["node"].as_int("announce_interval")
+                if value < 1:
+                    value = 1
+                self.node_announce_interval = value
+
+            if "pages_path" in self.config["node"]:
+                self.pagespath = self.config["node"]["pages_path"]
+
+            if "files_path" in self.config["node"]:
+                self.filespath = self.config["node"]["files_path"]
+
+            if "prioritise_destinations" in self.config["node"]:
+                self.prioritised_lxmf_destinations = self.config["node"].as_list("prioritise_destinations")
+            else:
+                self.prioritised_lxmf_destinations = []
+
+            if not "message_storage_limit" in self.config["node"]:
+                self.message_storage_limit = 2000
+            else:
+                value = self.config["node"].as_float("message_storage_limit")
+                if value < 0.005:
+                    value = 0.005
+                self.message_storage_limit = value
+
+        self.print_command = "lp"
+        self.print_messages = False
+        self.print_all_messages = False
+        self.print_trusted_messages = False
+        if "printing" in self.config:
+            if not "print_messages" in self.config["printing"]:
+                self.print_messages = False
+            else:
+                self.print_messages = self.config["printing"].as_bool("print_messages")
+
+                if "print_command" in self.config["printing"]:
+                    self.print_command = self.config["printing"]["print_command"]
+
+                if self.print_messages:
+                    if not "print_from" in self.config["printing"]:
+                        self.allowed_message_print_destinations = None
+                    else:
+                        if type(self.config["printing"]["print_from"]) == str:
+                            self.allowed_message_print_destinations = []
+                            if self.config["printing"]["print_from"].lower() == "everywhere":
+                                self.print_all_messages = True
+
+                            if self.config["printing"]["print_from"].lower() == "trusted":
+                                
+                                self.print_all_messages = False
+                                self.print_trusted_messages = True
+
+                            if len(self.config["printing"]["print_from"]) == (RNS.Identity.TRUNCATED_HASHLENGTH//8)*2:
+                                self.allowed_message_print_destinations.append(self.config["printing"]["print_from"])
+                        
+                        if type(self.config["printing"]["print_from"]) == list:
+                                self.allowed_message_print_destinations =  self.config["printing"].as_list("print_from")
+                                for allowed_entry in self.allowed_message_print_destinations:
+                                    if allowed_entry.lower() == "trusted":
+                                        self.print_trusted_messages = True
+
+
+                    if not "message_template" in self.config["printing"]:
+                        self.printing_template_msg = __printing_template_msg__
+                    else:
+                        mt_path = os.path.expanduser(self.config["printing"]["message_template"])
+                        if os.path.isfile(mt_path):
+                            template_file = open(mt_path, "rb")
+                            self.printing_template_msg = template_file.read().decode("utf-8")
+                        else:
+                            template_file = open(mt_path, "wb")
+                            template_file.write(__printing_template_msg__.encode("utf-8"))
+                            self.printing_template_msg = __printing_template_msg__
 
-                if option == "enable_node":
-                    value = self.config["node"].as_bool(option)
-                    self.enable_node = value
               
     @staticmethod
     def get_shared_instance():
@@ -319,29 +930,187 @@ destination = file
 
 [client]
 
-enable_client = Yes
+enable_client = yes
 user_interface = text
+downloads_path = ~/Downloads
+
+# By default, the peer is announced at startup
+# to let other peers reach it immediately.
+announce_at_start = yes
+
+# By default, the client will try to deliver a
+# message via the LXMF propagation network, if
+# a direct delivery to the recipient is not
+# possible.
+try_propagation_on_send_fail = yes
+
+# Nomadnet will periodically sync messages from
+# LXMF propagation nodes by default, if any are
+# present. You can disable this if you want to
+# only sync when manually initiated.
+periodic_lxmf_sync = yes
+
+# The sync interval in minutes. This value is
+# equal to 6 hours (360 minutes) by default.
+lxmf_sync_interval = 360
+
+# By default, automatic LXMF syncs will only
+# download 8 messages at a time. You can change
+# this number, or set the option to 0 to disable
+# the limit, and download everything every time.
+lxmf_sync_limit = 8
+
+# 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]
 
+# Amount of time to show intro screen
 intro_time = 1
 
+# You can specify the display theme.
+# theme = light
+theme = dark
+
 # Specify the number of colors to use
 # valid colormodes are:
 # monochrome, 16, 88, 256 and 24bit
 #
-# The default is a conservative 88 colors,
-# but 256 colors can probably be used on
-# most terminals. Some terminals
+# The default is a conservative 256 colors.
+# If your terminal does not support this,
+# you can lower it. Some terminals support
+# 24 bit color.
 
 # colormode = monochrome
 # colormode = 16
-colormode = 88
-# colormode = 256
+# colormode = 88
+colormode = 256
 # colormode = 24bit
 
+# By default, unicode glyphs are used. If
+# you have a Nerd Font installed, you can
+# enable this for a better user interface.
+# You can also enable plain text glyphs if
+# your terminal doesn't support unicode.
+
+# glyphs = plain
+glyphs = unicode
+# glyphs = nerdfont
+
+# You can specify whether mouse events
+# should be considered as input to the
+# application. On by default.
+mouse_enabled = True
+
+# What editor to use for editing text.
+editor = nano
+
+# If you don't want the Guide section to
+# show up in the menu, you can disable it.
+hide_guide = no
+
 [node]
 
-enable_node = No
+# Whether to enable node hosting
+enable_node = no
+
+# The node name will be visible to other
+# peers on the network, and included in
+# announces.
+node_name = None
+
+# Automatic announce interval in minutes.
+# 6 hours by default.
+announce_interval = 360
+
+# Whether to announce when the node starts.
+announce_at_start = Yes
+
+# By default, when Nomad Network is hosting a
+# node, it will also act as an LXMF propagation
+# node. If there is already a large amount of
+# propagation nodes on the network, or you
+# simply want to run a pageserving-only node,
+# you can disable running a propagation node.
+# disable_propagation = False
+
+# The maximum amount of storage to use for
+# the LXMF Propagation Node message store,
+# specified in megabytes. When this limit
+# is reached, LXMF will periodically remove
+# messages in its message store. By default,
+# LXMF prioritises keeping messages that are
+# new and small. Large and old messages will
+# be removed first. This setting is optional
+# and defaults to 2 gigabytes.
+# message_storage_limit = 2000
+
+# You can tell the LXMF message router to
+# prioritise storage for one or more
+# 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.
+# prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf
+
+[printing]
+
+# You can configure Nomad Network to print
+# various kinds of information and messages.
+
+# Printing messages is disabled by default
+print_messages = No
+
+# You can configure a custom template for
+# message printing. If you uncomment this
+# option, set a path to the template and
+# restart Nomad Network, a default template
+# will be created that you can edit.
+# message_template = ~/.nomadnetwork/print_template_msg.txt
+
+# You can configure Nomad Network to only
+# print messages from trusted destinations.
+# print_from = trusted
+
+# Or specify the source LXMF addresses that
+# will automatically have messages printed
+# on arrival.
+# print_from = 76fe5751a56067d1e84eef3e88eab85b, 0e70b5848eb57c13154154feaeeb89b7
+
+# Or allow printing from anywhere, if you
+# are feeling brave and adventurous.
+# print_from = everywhere
+
+# You can configure the printing command.
+# This will use the default CUPS printer on
+# your system.
+print_command = lp
+
+# You can specify what printer to use
+# print_command = lp -d PRINTER_NAME
+
+# Or specify more advanced options. This
+# example works well for small thermal-
+# roll printers.
+# print_command = lp -d PRINTER_NAME -o cpi=16 -o lpi=8
+
+# This one is more suitable for full-sheet
+# printers.
+# print_command = lp -d PRINTER_NAME -o page-left=36 -o page-top=36 -o page-right=36 -o page-bottom=36
 
 '''.splitlines()
+
+__printing_template_msg__ = """
+---------------------------
+From: {origin}
+Sent: {stime}
+Rcvd: {rtime}
+Title: {mtitle}
+
+{mbody}
+---------------------------
+"""

nomadnet/__init__.py

@@ -3,6 +3,8 @@ import glob
 
 from .NomadNetworkApp import NomadNetworkApp
 from .Conversation import Conversation
+from .Directory import Directory
+from .Node import Node
 from .ui import *
 
 

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.0.5"
+__version__ = "0.4.1"

nomadnet/examples/messageboard/README.md

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

nomadnet/examples/messageboard/messageboard.mu

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

nomadnet/examples/messageboard/messageboard.py

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

nomadnet/examples/various/input_fields.py

@@ -0,0 +1,43 @@
+#!/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.
+
+-=
+
+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]`!.
+
+You can `!`[submit`:/page/input_fields.mu`one|password|small]`! other fields, or just `!`[a single one`:/page/input_fields.mu`username]`!
+
+Or simply `!`[submit them all`:/page/input_fields.mu`*]`!.
+
+Submission links can also `!`[include pre-configured variables`:/page/input_fields.mu`username|two|entitiy_id=4611|action=view]`!.
+
+Or take all fields and `!`[pre-configured variables`:/page/input_fields.mu`*|entitiy_id=4611|action=view]`!.
+
+Or only `!`[pre-configured variables`:/page/input_fields.mu`entitiy_id=4688|task=something]`!
+
+-=
+
+"""
+print(template.replace("{@ENV}", env_string))

nomadnet/nomadnet.py

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

nomadnet/ui/MenuUI.py

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

nomadnet/ui/NoneUI.py

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

nomadnet/ui/TextUI.py

@@ -1,6 +1,8 @@
 import RNS
-import importlib
+import urwid
 import time
+import os
+import platform
 
 import nomadnet
 from nomadnet.ui.textui import *
@@ -15,57 +17,165 @@ THEME_DARK     = 0x01
 THEME_LIGHT    = 0x02
 
 THEMES = {
-    THEME_DARK: [
+    THEME_DARK: {
+        "urwid_theme": [
             # Style name                    # 16-color style                        # Monochrome style          # 88, 256 and true-color style
-        ('heading',                     'light gray,underline', 'default',      'underline',                'g93,underline', 'default'),
-        ('menubar',                     'black', 'light gray',                  'standout',                 '#111', '#bbb'),
-        ('shortcutbar',                 'black', 'light gray',                  'standout',                 '#111', '#bbb'),
-        ('body_text',                   'white', 'default',                     'default',                  '#0a0', 'default'),
-        ('error_text',                  'dark red', 'default',                  'default',                  'dark red', 'default'),
-        ('warning_text',                'yellow', 'default',                    'default',                  '#ba4', 'default'),
-        ('inactive_text',               'dark gray', 'default',                 'default',                  'dark gray', 'default'),
-        ('buttons',                     'light green,bold', 'default',          'default',                  '#00a533', 'default'),
-        ('msg_editor',                  'black', 'light cyan',                  'standout',                 '#111', '#0bb'),
-        ("msg_header_ok",               'black', 'light green',                 'standout',                 '#111', '#6b2'),
-        ("msg_header_caution",          'black', 'yellow',                      'standout',                 '#111', '#fd3'),
-        ("msg_header_sent",             'black', 'light gray',                  'standout',                 '#111', '#ddd'),
-        ("msg_header_delivered",        'black', 'light blue',                  'standout',                 '#111', '#28b'),
-        ("msg_header_failed",           'black', 'dark gray',                   'standout',                 'black', 'dark gray'),
-        ("msg_warning_untrusted",       'black', 'dark red',                    'standout',                 '#111', 'dark red'),
-        ("list_focus",                  "black", "light gray",                  "standout",                 "#111", "#bbb"),
-        ("list_off_focus",              "black", "dark gray",                   "standout",                 "#111", "dark gray"),
-        ("list_trusted",                "light green", "default",               "default",                  "#6b2", "default"),
-        ("list_focus_trusted",          "black", "light gray",                  "standout",                 "#180", "#bbb"),
-        ("list_unknown",                "dark gray", "default",                 "default",                  "light gray", "default"),
-        ("list_untrusted",              "dark red", "default",                  "default",                  "dark red", "default"),
-        ("list_focus_untrusted",        "black", "light gray",                  "standout",                 "#810", "#bbb"),
-    ]
+            ("heading",                     "light gray,underline", "default",      "underline",                "g93,underline", "default"),
+            ("menubar",                     "black", "light gray",                  "standout",                 "#111", "#bbb"),
+            ("scrollbar",                   "light gray", "default",                "default",                  "#444", "default"),
+            ("shortcutbar",                 "black", "light gray",                  "standout",                 "#111", "#bbb"),
+            ("body_text",                   "light gray", "default",                "default",                  "#ddd", "default"),
+            ("error_text",                  "dark red", "default",                  "default",                  "dark red", "default"),
+            ("warning_text",                "yellow", "default",                    "default",                  "#ba4", "default"),
+            ("inactive_text",               "dark gray", "default",                 "default",                  "dark gray", "default"),
+            ("buttons",                     "light green,bold", "default",          "default",                  "#00a533", "default"),
+            ("msg_editor",                  "black", "light cyan",                  "standout",                 "#111", "#0bb"),
+            ("msg_header_ok",               "black", "light green",                 "standout",                 "#111", "#6b2"),
+            ("msg_header_caution",          "black", "yellow",                      "standout",                 "#111", "#fd3"),
+            ("msg_header_sent",             "black", "light gray",                  "standout",                 "#111", "#ddd"),
+            ("msg_header_propagated",       "black", "light blue",                  "standout",                 "#111", "#28b"),
+            ("msg_header_delivered",        "black", "light blue",                  "standout",                 "#111", "#28b"),
+            ("msg_header_failed",           "black", "dark gray",                   "standout",                 "#000", "#777"),
+            ("msg_warning_untrusted",       "black", "dark red",                    "standout",                 "#111", "dark red"),
+            ("list_focus",                  "black", "light gray",                  "standout",                 "#111", "#aaa"),
+            ("list_off_focus",              "black", "dark gray",                   "standout",                 "#111", "#777"),
+            ("list_trusted",                "dark green", "default",                "default",                  "#6b2", "default"),
+            ("list_focus_trusted",          "black", "light gray",                  "standout",                 "#150", "#aaa"),
+            ("list_unknown",                "dark gray", "default",                 "default",                  "#bbb", "default"),
+            ("list_normal",                 "dark gray", "default",                 "default",                  "#bbb", "default"),
+            ("list_untrusted",              "dark red", "default",                  "default",                  "#a22", "default"),
+            ("list_focus_untrusted",        "black", "light gray",                  "standout",                 "#810", "#aaa"),
+            ("list_unresponsive",           "yellow", "default",                    "default",                  "#b92", "default"),
+            ("list_focus_unresponsive",     "black", "light gray",                  "standout",                 "#530", "#aaa"),
+            ("topic_list_normal",           "light gray", "default",                "default",                  "#ddd", "default"),
+            ("browser_controls",            "light gray", "default",                "default",                  "#bbb", "default"),
+            ("progress_full",               "black", "light gray",                  "standout",                 "#111", "#bbb"),
+            ("progress_empty",              "light gray", "default",                "default",                  "#ddd", "default"),
+        ],        
+    },
+    THEME_LIGHT: {
+        "urwid_theme": [
+            # Style name                    # 16-color style                        # Monochrome style          # 88, 256 and true-color style
+            ("heading",                     "dark gray,underline", "default",      "underline",                "g93,underline", "default"),
+            ("menubar",                     "black", "dark gray",                  "standout",                 "#111", "#bbb"),
+            ("scrollbar",                   "dark gray", "default",                "default",                  "#444", "default"),
+            ("shortcutbar",                 "black", "dark gray",                  "standout",                 "#111", "#bbb"),
+            ("body_text",                   "dark gray", "default",                "default",                  "#222", "default"),
+            ("error_text",                  "dark red", "default",                 "default",                  "dark red", "default"),
+            ("warning_text",                "yellow", "default",                   "default",                  "#ba4", "default"),
+            ("inactive_text",               "light gray", "default",               "default",                  "dark gray", "default"),
+            ("buttons",                     "light green,bold", "default",         "default",                  "#00a533", "default"),
+            ("msg_editor",                  "black", "dark cyan",                  "standout",                 "#111", "#0bb"),
+            ("msg_header_ok",               "black", "dark green",                 "standout",                 "#111", "#6b2"),
+            ("msg_header_caution",          "black", "yellow",                     "standout",                 "#111", "#fd3"),
+            ("msg_header_sent",             "black", "dark gray",                  "standout",                 "#111", "#ddd"),
+            ("msg_header_delivered",        "black", "light blue",                 "standout",                 "#111", "#28b"),
+            ("msg_header_failed",           "black", "dark gray",                  "standout",                 "#000", "#777"),
+            ("msg_warning_untrusted",       "black", "dark red",                   "standout",                 "#111", "dark red"),
+            ("list_focus",                  "black", "dark gray",                  "standout",                 "#111", "#aaa"),
+            ("list_off_focus",              "black", "dark gray",                  "standout",                 "#111", "#777"),
+            ("list_trusted",                "dark green", "default",               "default",                  "#4a0", "default"),
+            ("list_focus_trusted",          "black", "dark gray",                  "standout",                 "#150", "#aaa"),
+            ("list_unknown",                "dark gray", "default",                "default",                  "#444", "default"),
+            ("list_normal",                 "dark gray", "default",                "default",                  "#444", "default"),
+            ("list_untrusted",              "dark red", "default",                 "default",                  "#a22", "default"),
+            ("list_focus_untrusted",        "black", "dark gray",                  "standout",                 "#810", "#aaa"),
+            ("list_unresponsive",           "yellow", "default",                   "default",                  "#b92", "default"),
+            ("list_focus_unresponsive",     "black", "light gray",                 "standout",                 "#530", "#aaa"),
+            ("topic_list_normal",           "dark gray", "default",                "default",                  "#222", "default"),
+            ("browser_controls",            "dark gray", "default",                "default",                  "#444", "default"),
+            ("progress_full",               "black", "dark gray",                  "standout",                 "#111", "#bbb"),
+            ("progress_empty",              "dark gray", "default",                "default",                  "#ddd", "default"),
+        ],        
+    }
+}
+
+GLYPHSETS = {
+    "plain": 1,
+    "unicode": 2,
+    "nerdfont": 3
+}
+
+if platform.system() == "Darwin":
+    urm_char = " \uf0e0 "
+    ur_char = "\uf0e0 "
+else:
+    urm_char = " \uf003 "
+    ur_char = "\uf003 "
+
+GLYPHS = {
+    # Glyph name        # Plain      # Unicode      # Nerd Font
+    ("check",           "=",         "\u2713",      "\u2713"),
+    ("cross",           "X",         "\u2715",      "\u2715"),
+    ("unknown",         "?",         "?",           "?"),
+    ("encrypted",       "",          "\u26BF",      "\uf023"),
+    ("plaintext",       "!",         "!",           "\uf06e "),
+    ("arrow_r",         "->",        "\u2192",      "\u2192"),
+    ("arrow_l",         "<-",        "\u2190",      "\u2190"),
+    ("arrow_u",         "/\\",       "\u2191",      "\u2191"),
+    ("arrow_d",         "\\/",       "\u2193",      "\u2193"),
+    ("warning",         "!",         "\u26a0",      "\uf12a"),
+    ("info",            "i",         "\u2139",      "\ufb4d"),
+    ("unread",          "[!]",       "\u2709",      ur_char),
+    ("divider1",        "-",         "\u2504",      "\u2504"),
+    ("peer",            "[P]",       "\u24c5 ",     "\uf415"),
+    ("node",            "[N]",       "\u24c3 ",     "\uf502"),
+    ("page",            "",          "\u25a4 ",     "\uf719 "),
+    ("speed",           "",          "\u25F7 ",     "\uf9c4"),
+    ("decoration_menu", " +",        " +",          " \uf93a"),
+    ("unread_menu",     " !",        " \u2709",     urm_char),
+    ("globe",           "",          "",            "\uf484"),
+    ("sent",            "/\\",       "\u2191",      "\ufbf4"),
+    ("papermsg",        "P",         "\u25a4",      "\uf719"),
+    ("qrcode",          "QR",        "\u25a4",      "\uf029"),
 }
 
 class TextUI:
 
     def __init__(self):
+        self.restore_ixon = False
+
+        try:
+            rval = os.system("stty -a | grep \"\\-ixon\"")
+            if rval == 0:
+                pass
+
+            else:
+                os.system("stty -ixon")
+                self.restore_ixon = True
+
+        except Exception as e:
+            RNS.log("Could not configure terminal flow control sequences, some keybindings may not work.", RNS.LOG_WARNING)
+            RNS.log("The contained exception was: "+str(e))
+
         self.app = NomadNetworkApp.get_shared_instance()
         self.app.ui = self
         self.loop = None
 
-        if importlib.util.find_spec("urwid") != None:
-            import urwid
-        else:
-            RNS.log("The text-mode user interface requires Urwid to be installed on your system.", RNS.LOG_ERROR)
-            RNS.log("You can install it with the command: pip3 install urwid", RNS.LOG_ERROR)
-            nomadnet.panic()
-
         urwid.set_encoding("UTF-8")
 
         intro_timeout  = self.app.config["textui"]["intro_time"]
         colormode      = self.app.config["textui"]["colormode"]
         theme          = self.app.config["textui"]["theme"]
+        mouse_enabled  = self.app.config["textui"]["mouse_enabled"]
 
-        palette       = THEMES[theme]
+        self.palette   = THEMES[theme]["urwid_theme"]
+
+        if self.app.config["textui"]["glyphs"] == "plain":
+            glyphset = "plain"
+        elif self.app.config["textui"]["glyphs"] == "unicoode":
+            glyphset = "unicode"
+        elif self.app.config["textui"]["glyphs"] == "nerdfont":
+            glyphset = "nerdfont"
+        else:
+            glyphset = "unicode"
+
+        self.glyphs = {}
+        for glyph in GLYPHS:
+            self.glyphs[glyph[0]] = glyph[GLYPHSETS[glyphset]]
 
         self.screen = urwid.raw_display.Screen()
-        self.screen.register_palette(palette)
+        self.screen.register_palette(self.palette)
         
         self.main_display = Main.MainDisplay(self, self.app)
         
@@ -75,18 +185,44 @@ class TextUI:
         else:
             initial_widget = self.main_display.widget
 
-        self.loop = urwid.MainLoop(initial_widget, screen=self.screen)
+        self.loop = urwid.MainLoop(initial_widget, unhandled_input=self.unhandled_input, screen=self.screen, handle_mouse=mouse_enabled)
 
         if intro_timeout > 0:
             self.loop.set_alarm_in(intro_timeout, self.display_main)
 
+        if "KONSOLE_VERSION" in os.environ:
+            if colormode > 16:
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("You are using the terminal emulator Konsole.", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("If you are not seeing the user interface, it is due to a bug in Konsole/urwid.", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
+
+                RNS.log("To circumvent this, use another terminal emulator, or launch nomadnet within a", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("screen session, using a command like the following:", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("screen nomadnet", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("", RNS.LOG_WARNING, _override_destination = True)
+                RNS.log("Press ctrl-c to exit now and try again.", RNS.LOG_WARNING, _override_destination = True)
+
         self.set_colormode(colormode)
 
+        self.main_display.start()
         self.loop.run()
 
     def set_colormode(self, colormode):
+        self.colormode = colormode
         self.screen.set_terminal_properties(colormode)
+        
+        if self.colormode < 256:
             self.screen.reset_default_terminal_palette()
+            self.restore_palette = True
+
+    def unhandled_input(self, key):
+        if key == "ctrl q":
+            raise urwid.ExitMainLoop
+        elif key == "ctrl e":
+            pass
 
     def display_main(self, loop, user_data):
         self.loop.widget = self.main_display.widget

nomadnet/ui/__init__.py

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

nomadnet/ui/textui/Config.py

@@ -0,0 +1,81 @@
+import nomadnet
+import urwid
+import platform
+
+class ConfigDisplayShortcuts():
+    def __init__(self, app):
+        import urwid
+        self.app = app
+
+        self.widget = urwid.AttrMap(urwid.Text(""), "shortcutbar")
+
+class ConfigFiller(urwid.WidgetWrap):
+    def __init__(self, widget, app):
+        self.app = app
+        self.filler = urwid.Filler(widget, "top")
+        urwid.WidgetWrap.__init__(self, self.filler)
+
+
+    def keypress(self, size, key):
+        if key == "up":
+            self.app.ui.main_display.frame.set_focus("header")
+            
+        return super(ConfigFiller, self).keypress(size, key)
+
+class ConfigDisplay():
+    def __init__(self, app):
+        import urwid
+        self.app = app
+
+        def open_editor(sender):
+            self.editor_term = EditorTerminal(self.app, self)
+            self.widget = urwid.LineBox(self.editor_term)
+            self.app.ui.main_display.update_active_sub_display()
+            self.app.ui.main_display.frame.set_focus("body")
+            self.editor_term.term.change_focus(True)
+
+        pile = urwid.Pile([
+            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"),
+        ])
+
+        self.config_explainer = ConfigFiller(pile, self.app)
+        self.shortcuts_display = ConfigDisplayShortcuts(self.app)
+        self.widget = self.config_explainer
+
+    def shortcuts(self):
+        return self.shortcuts_display
+
+class EditorTerminal(urwid.WidgetWrap):
+    def __init__(self, app, parent):
+        self.app = app
+        self.parent = parent
+        editor_cmd = self.app.config["textui"]["editor"]
+
+        # The "editor" alias is unavailable on Darwin,
+        # so we replace it with nano.
+        if platform.system() == "Darwin" and editor_cmd == "editor":
+            editor_cmd = "nano"
+
+        self.term = urwid.Terminal(
+            (editor_cmd, self.app.configpath),
+            encoding='utf-8',
+            main_loop=self.app.ui.loop,
+        )
+
+        def quit_term(*args, **kwargs):
+            self.parent.widget = self.parent.config_explainer
+            self.app.ui.main_display.update_active_sub_display()
+            self.app.ui.main_display.show_config(None)
+            self.app.ui.main_display.request_redraw()
+
+        urwid.connect_signal(self.term, 'closed', quit_term)
+
+        urwid.WidgetWrap.__init__(self, self.term)
+
+
+    def keypress(self, size, key):
+        # TODO: Decide whether there should be a way to get out while editing
+        #if key == "up":
+        #    nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")   
+        return super(EditorTerminal, self).keypress(size, key)

nomadnet/ui/textui/Conversations.py

@@ -1,4 +1,5 @@
 import RNS
+import os
 import time
 import nomadnet
 import LXMF
@@ -13,13 +14,13 @@ class ConversationListDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[Enter] Open  [C-e] Peer Info  [C-x] Delete  [C-n] New"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New  [C-u] Ingest URI  [C-g] Fullscreen"), "shortcutbar")
 
 class ConversationDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-k] Clear  [C-w] Close  [C-t] Editor Type  [C-p] Purge"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-p] Paper Msg  [C-t] Title  [C-k] Clear  [C-w] Close  [C-u] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
 
 class ConversationsArea(urwid.LineBox):
     def keypress(self, size, key):
@@ -29,6 +30,12 @@ class ConversationsArea(urwid.LineBox):
             self.delegate.delete_selected_conversation()
         elif key == "ctrl n":
             self.delegate.new_conversation()
+        elif key == "ctrl u":
+            self.delegate.ingest_lxm_uri()
+        elif key == "ctrl r":
+            self.delegate.sync_conversations()
+        elif key == "ctrl g":
+            self.delegate.toggle_fullscreen()
         elif key == "tab":
             self.delegate.app.ui.main_display.frame.set_focus("header")
         elif key == "up" and (self.delegate.ilb.first_item_is_selected() or self.delegate.ilb.body_is_empty()):
@@ -45,11 +52,13 @@ class DialogLineBox(urwid.LineBox):
 
 class ConversationsDisplay():
     list_width = 0.33
+    given_list_width = 52
     cached_conversation_widgets = {}
 
     def __init__(self, app):
         self.app = app
         self.dialog_open = False
+        self.sync_dialog = None
         self.currently_displayed_conversation = None
 
         def disp_list_shortcuts(sender, arg1, arg2):
@@ -60,8 +69,10 @@ class ConversationsDisplay():
 
         self.columns_widget = urwid.Columns(
             [
-                ("weight", ConversationsDisplay.list_width, self.listbox),
-                ("weight", 1-ConversationsDisplay.list_width, self.make_conversation_widget(None))
+                # ("weight", ConversationsDisplay.list_width, self.listbox),
+                # ("weight", 1-ConversationsDisplay.list_width, self.make_conversation_widget(None))
+                (ConversationsDisplay.given_list_width, self.listbox),
+                ("weight", 1, self.make_conversation_widget(None))
             ],
             dividechars=0, focus_column=0, box_columns=[0]
         )
@@ -86,7 +97,6 @@ class ConversationsDisplay():
         for conversation in self.app.conversations():
             conversation_list_widgets.append(self.conversation_list_widget(conversation))
 
-        walker = urwid.SimpleFocusListWalker(conversation_list_widgets)
         self.list_widgets = conversation_list_widgets
         self.ilb = IndicativeListBox(
             self.list_widgets,
@@ -95,12 +105,15 @@ class ConversationsDisplay():
             highlight_offFocus="list_off_focus"
         )
 
-        self.listbox = ConversationsArea(urwid.Filler(self.ilb, height=("relative", 100)))
+        self.listbox = ConversationsArea(urwid.Filler(self.ilb, height=("relative", 100)), title="Conversations")
         self.listbox.delegate = self
 
     def delete_selected_conversation(self):
         self.dialog_open = True
-        source_hash = self.ilb.get_selected_item().source_hash
+        item = self.ilb.get_selected_item()
+        if item == None:
+            return
+        source_hash = item.source_hash
 
         def dismiss_dialog(sender):
             self.update_conversation_list()
@@ -123,12 +136,17 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def edit_selected_in_directory(self):
+        g = self.app.ui.glyphs
         self.dialog_open = True
-        source_hash_text = self.ilb.get_selected_item().source_hash
+        item = self.ilb.get_selected_item()
+        if item == None:
+            return
+        source_hash_text = item.source_hash
         display_name = self.ilb.get_selected_item().display_name
         if display_name == None:
             display_name = ""
@@ -143,6 +161,9 @@ class ConversationsDisplay():
         unknown_selected    = True
         trusted_selected    = False
 
+        direct_selected     = True
+        propagated_selected = False
+
         try:
             if self.app.directory.find(bytes.fromhex(source_hash_text)):
                 trust_level = self.app.directory.trust_level(bytes.fromhex(source_hash_text))
@@ -158,6 +179,11 @@ class ConversationsDisplay():
                     untrusted_selected = False
                     unknown_selected   = False
                     trusted_selected   = True
+
+                if self.app.directory.preferred_delivery(bytes.fromhex(source_hash_text)) == DirectoryEntry.PROPAGATED:
+                    direct_selected = False
+                    propagated_selected = True
+                    
         except Exception as e:
             pass
 
@@ -166,6 +192,10 @@ class ConversationsDisplay():
         r_unknown   = urwid.RadioButton(trust_button_group, "Unknown", state=unknown_selected)
         r_trusted   = urwid.RadioButton(trust_button_group, "Trusted", state=trusted_selected)
 
+        method_button_group = []
+        r_direct     = urwid.RadioButton(method_button_group, "Deliver directly", state=direct_selected)
+        r_propagated = urwid.RadioButton(method_button_group, "Use propagation nodes", state=propagated_selected)
+
         def dismiss_dialog(sender):
             self.update_conversation_list()
             self.dialog_open = False
@@ -180,7 +210,11 @@ class ConversationsDisplay():
                 elif r_trusted.state == True:
                     trust_level = DirectoryEntry.TRUSTED
 
-                entry = DirectoryEntry(source_hash, display_name, trust_level)
+                delivery = DirectoryEntry.DIRECT
+                if r_propagated.state == True:
+                    delivery = DirectoryEntry.PROPAGATED
+
+                entry = DirectoryEntry(source_hash, display_name, trust_level, preferred_delivery=delivery)
                 self.app.directory.remember(entry)
                 self.update_conversation_list()
                 self.dialog_open = False
@@ -195,7 +229,7 @@ class ConversationsDisplay():
 
         source_is_known = self.app.directory.is_known(bytes.fromhex(source_hash_text))
         if source_is_known:
-            known_section = urwid.Divider("\u2504")
+            known_section = urwid.Divider(g["divider1"])
         else:
             def query_action(sender, user_data):
                 self.close_conversation_by_hash(user_data)
@@ -206,15 +240,18 @@ class ConversationsDisplay():
                     (urwid.Button("OK", on_press=dismiss_dialog), options)
                 ]
             query_button = urwid.Button("Query network for keys", on_press=query_action, user_data=source_hash_text)
-            known_section = urwid.Pile([urwid.Divider("\u2504"), urwid.Text("\u2139\n", align="center"), urwid.Text("The identity of this peer is not known, and you cannot currently communicate.\n", align="center"), query_button, urwid.Divider("\u2504")])
+            known_section = urwid.Pile([urwid.Divider(g["divider1"]), urwid.Text(g["info"]+"\n", align="center"), urwid.Text("The identity of this peer is not known, and you cannot currently send messages to it. You can query the network to obtain the identity.\n", align="center"), query_button, urwid.Divider(g["divider1"])])
 
         dialog_pile = urwid.Pile([
             selected_id_widget,
             e_name,
-            urwid.Divider("\u2504"),
+            urwid.Divider(g["divider1"]),
             r_untrusted,
             r_unknown,
             r_trusted,
+            urwid.Divider(g["divider1"]),
+            r_direct,
+            r_propagated,
             known_section,
             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))])
         ])
@@ -226,7 +263,8 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def new_conversation(self):
@@ -264,6 +302,7 @@ class ConversationsDisplay():
                     self.app.directory.remember(entry)
 
                     new_conversation = nomadnet.Conversation(source_hash_text, nomadnet.NomadNetworkApp.get_shared_instance(), initiator=True)
+
                     self.update_conversation_list()
 
                 self.display_conversation(source_hash_text)
@@ -295,7 +334,112 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+        self.columns_widget.contents[0] = (overlay, options)
+
+    def ingest_lxm_uri(self):
+        self.dialog_open = True
+        lxm_uri = ""
+        e_uri = urwid.Edit(caption="URI : ",edit_text=lxm_uri)
+
+        def dismiss_dialog(sender):
+            self.update_conversation_list()
+            self.dialog_open = False
+
+        def confirmed(sender):
+            try:
+                local_delivery_signal = "local_delivery_occurred"
+                duplicate_signal = "duplicate_lxm"
+                lxm_uri = e_uri.get_edit_text()
+
+                ingest_result = self.app.message_router.ingest_lxm_uri(
+                    lxm_uri,
+                    signal_local_delivery=local_delivery_signal,
+                    signal_duplicate=duplicate_signal
+                )
+
+                if ingest_result == False:
+                    raise ValueError("The URI contained no decodable messages")
+                
+                elif ingest_result == local_delivery_signal:
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text("Message was decoded, decrypted successfully, and added to your conversation list."),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+                
+                elif ingest_result == duplicate_signal:
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text("The decoded message has already been processed by the LXMF Router, and will not be ingested again."),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+                
+                else:
+                    if self.app.enable_node:
+                        propagation_text = "The decoded message was not addressed to this LXMF address, but has been added to the propagation node queues, and will be distributed on the propagation network."
+                    else:
+                        propagation_text = "The decoded message was not addressed to this LXMF address, and has been discarded."
+
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text(propagation_text),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+
+            except Exception as e:
+                RNS.log("Could not ingest LXM URI. The contained exception was: "+str(e), RNS.LOG_VERBOSE)
+                if not dialog_pile.error_display:
+                    dialog_pile.error_display = True
+                    options = dialog_pile.options(height_type="pack")
+                    dialog_pile.contents.append((urwid.Text(""), options))
+                    dialog_pile.contents.append((urwid.Text(("error_text", "Could ingest LXM from URI data. Check your input."), align="center"), options))
+
+        dialog_pile = urwid.Pile([
+            e_uri,
+            urwid.Text(""),
+            urwid.Columns([("weight", 0.45, urwid.Button("Ingest", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Back", on_press=dismiss_dialog))])
+        ])
+        dialog_pile.error_display = False
+
+        dialog = DialogLineBox(dialog_pile, title="Ingest message URI")
+        dialog.delegate = self
+        bottom = self.listbox
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def delete_conversation(self, source_hash):
@@ -303,25 +447,185 @@ class ConversationsDisplay():
             conversation = ConversationsDisplay.cached_conversation_widgets[source_hash]
             self.close_conversation(conversation)
 
+    def toggle_fullscreen(self):
+        if ConversationsDisplay.given_list_width != 0:
+            self.saved_list_width = ConversationsDisplay.given_list_width
+            ConversationsDisplay.given_list_width = 0
+        else:
+            ConversationsDisplay.given_list_width = self.saved_list_width
+
+        self.update_conversation_list()
+
+    def sync_conversations(self):
+        g = self.app.ui.glyphs
+        self.dialog_open = True
+        
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.sync_dialog = None
+            self.update_conversation_list()
+            if self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
+                self.app.cancel_lxmf_sync()
+
+        max_messages_group = []
+        r_mall = urwid.RadioButton(max_messages_group, "Download all", state=True)
+        r_mlim = urwid.RadioButton(max_messages_group, "Limit to", state=False)
+        ie_lim = urwid.IntEdit("", 5)
+        rbs = urwid.GridFlow([r_mlim, ie_lim], 12, 1, 0, align="left")
+
+        def sync_now(sender):
+            limit = None
+            if r_mlim.get_state():
+                limit = ie_lim.value()
+            self.app.request_lxmf_sync(limit)
+            self.update_sync_dialog()
+
+        def cancel_sync(sender):
+            self.app.cancel_lxmf_sync()
+            self.update_sync_dialog()
+
+        cancel_button = urwid.Button("Close", on_press=dismiss_dialog)
+        sync_progress = SyncProgressBar("progress_empty" , "progress_full", current=self.app.get_sync_progress(), done=1.0, satt=None)
+
+        real_sync_button = urwid.Button("Sync Now", on_press=sync_now)
+        hidden_sync_button = urwid.Button("Cancel Sync", on_press=cancel_sync)
+
+        if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
+            sync_button = real_sync_button
+        else:
+            sync_button = hidden_sync_button
+
+        button_columns = urwid.Columns([("weight", 0.45, sync_button), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, cancel_button)])
+        real_sync_button.bc = button_columns
+
+        pn_ident = None
+        if self.app.get_default_propagation_node() != None:
+            pn_hash = self.app.get_default_propagation_node()
+            pn_ident = RNS.Identity.recall(pn_hash)
+
+            if pn_ident == None:
+                RNS.log("Propagation node identity is unknown, requesting from network...", RNS.LOG_DEBUG)
+                RNS.Transport.request_path(pn_hash)
+
+        if pn_ident != None:
+            node_hash = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", pn_ident)
+            pn_entry = self.app.directory.find(node_hash)
+            pn_display_str = " "
+            if pn_entry != None:
+                pn_display_str += " "+str(pn_entry.display_name)
+            else:
+                pn_display_str += " "+RNS.prettyhexrep(pn_hash)
+
+            dialog = DialogLineBox(
+                urwid.Pile([
+                    urwid.Text(""+g["node"]+pn_display_str, align="center"),
+                    urwid.Divider(g["divider1"]),
+                    sync_progress,
+                    urwid.Divider(g["divider1"]),
+                    r_mall,
+                    rbs,
+                    urwid.Text(""),
+                    button_columns
+                ]), title="Message Sync"
+            )
+        else:
+            button_columns = urwid.Columns([("weight", 0.45, urwid.Text("" )), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, cancel_button)])
+            dialog = DialogLineBox(
+                urwid.Pile([
+                    urwid.Text(""),
+                    urwid.Text("No trusted nodes found, cannot sync!\n", align="center"),
+                    urwid.Text("To syncronise messages from the network, one or more nodes must be marked as trusted in the Known Nodes list, or a node must manually be selected as the default propagation node. Nomad Network will then automatically sync from the nearest trusted node, or the manually selected one.", align="left"),
+                    urwid.Text(""),
+                    button_columns
+                ]), title="Message Sync"
+            )
+
+        dialog.delegate = self
+        dialog.sync_progress = sync_progress
+        dialog.cancel_button = cancel_button
+        dialog.real_sync_button = real_sync_button
+        dialog.hidden_sync_button = hidden_sync_button
+        dialog.bc = button_columns
+
+        self.sync_dialog = dialog
+        bottom = self.listbox
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+        self.columns_widget.contents[0] = (overlay, options)
+
+    def update_sync_dialog(self, loop = None, sender = None):
+        if self.dialog_open and self.sync_dialog != None:
+            self.sync_dialog.sync_progress.set_completion(self.app.get_sync_progress())
+
+            if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
+                self.sync_dialog.bc.contents[0] = (self.sync_dialog.real_sync_button, self.sync_dialog.bc.options("weight", 0.45))
+            else:
+                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)
+
+
     def conversation_list_selection(self, arg1, arg2):
         pass
 
     def update_conversation_list(self):
         ilb_position = self.ilb.get_selected_position()
         self.update_listbox()
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+        if not (self.dialog_open and self.sync_dialog != None):
             self.columns_widget.contents[0] = (self.listbox, options)
+        else:
+            bottom = self.listbox
+            overlay = urwid.Overlay(self.sync_dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+            self.columns_widget.contents[0] = (overlay, options)
+
         if ilb_position != None:
             self.ilb.select_item(ilb_position)
         nomadnet.NomadNetworkApp.get_shared_instance().ui.loop.draw_screen()
 
+        if self.app.ui.main_display.sub_displays.active_display == self.app.ui.main_display.sub_displays.conversations_display:
+            if self.currently_displayed_conversation != None:
+                if self.app.conversation_is_unread(self.currently_displayed_conversation):
+                    self.app.mark_conversation_read(self.currently_displayed_conversation)
+                    try:
+                        if os.path.isfile(self.app.conversationpath + "/" + self.currently_displayed_conversation + "/unread"):
+                            os.unlink(self.app.conversationpath + "/" + self.currently_displayed_conversation + "/unread")
+                    except Exception as e:
+                        raise e
+
 
 
 
     def display_conversation(self, sender=None, source_hash=None):
+        if self.currently_displayed_conversation != None:
+            if self.app.conversation_is_unread(self.currently_displayed_conversation):
+                self.app.mark_conversation_read(self.currently_displayed_conversation)
+
         self.currently_displayed_conversation = source_hash
-        options = self.widget.options("weight", 1-ConversationsDisplay.list_width)
+        # options = self.widget.options("weight", 1-ConversationsDisplay.list_width)
+        options = self.widget.options("weight", 1)
         self.widget.contents[1] = (self.make_conversation_widget(source_hash), options)
+        if source_hash == None:
+            self.widget.set_focus_column(0)
+        else:
+            if self.app.conversation_is_unread(source_hash):
+                self.app.mark_conversation_read(source_hash)
+                self.update_conversation_list()
+
+            self.widget.set_focus_column(1)
+            conversation_position = None
+            index = 0
+            for widget in self.list_widgets:
+                if widget.source_hash == source_hash:
+                    conversation_position = index
+                index += 1
+
+            if conversation_position != None:
+                self.ilb.select_item(conversation_position)
         
 
     def make_conversation_widget(self, source_hash):
@@ -359,9 +663,12 @@ class ConversationsDisplay():
         trust_level  = conversation[2]
         display_name = conversation[1]
         source_hash  = conversation[0]
+        unread       = conversation[4]
+
+        g = self.app.ui.glyphs
 
         if trust_level == DirectoryEntry.UNTRUSTED:
-            symbol        = "\u2715"
+            symbol        = g["cross"]
             style         = "list_untrusted"
             focus_style   = "list_focus_untrusted"
         elif trust_level == DirectoryEntry.UNKNOWN:
@@ -369,25 +676,32 @@ class ConversationsDisplay():
             style         = "list_unknown"
             focus_style   = "list_focus"
         elif trust_level == DirectoryEntry.TRUSTED:
-            symbol        = "\u2713"
+            symbol        = g["check"]
             style         = "list_trusted"
             focus_style   = "list_focus_trusted"
         elif trust_level == DirectoryEntry.WARNING:
-            symbol        = "\u26A0"
+            symbol        = g["warning"]
             style         = "list_warning"
             focus_style   = "list_focus"
         else:
-            symbol        = "\u26A0"
+            symbol        = g["warning"]
             style         = "list_untrusted"
             focus_style   = "list_focus_untrusted"
 
         display_text = symbol
+
         if display_name != None and display_name != "":
             display_text += " "+display_name
 
         if trust_level != DirectoryEntry.TRUSTED:
             display_text += " <"+source_hash+">"
         
+        if trust_level != DirectoryEntry.UNTRUSTED:
+            if unread:
+                if source_hash != self.currently_displayed_conversation:
+                    display_text += " "+g["unread"]
+
+
         widget = ListEntry(display_text)
         urwid.connect_signal(widget, "click", self.display_conversation, conversation[0])
         display_widget = urwid.AttrMap(widget, style, focus_style)
@@ -434,6 +748,8 @@ class MessageEdit(urwid.Edit):
     def keypress(self, size, key):
         if key == "ctrl d":
             self.delegate.send_message()
+        elif key == "ctrl p":
+            self.delegate.paper_message()
         elif key == "ctrl k":
             self.delegate.clear_editor()
         elif key == "up":
@@ -467,6 +783,8 @@ class ConversationFrame(urwid.Frame):
 
 class ConversationWidget(urwid.WidgetWrap):
     def __init__(self, source_hash):
+        self.app = nomadnet.NomadNetworkApp.get_shared_instance()
+        g = self.app.ui.glyphs
         if source_hash == None:
             self.frame = None
             display_widget = urwid.LineBox(urwid.Filler(urwid.Text("\n  No conversation selected"), "top"))
@@ -478,6 +796,7 @@ class ConversationWidget(urwid.WidgetWrap):
                 self.source_hash = source_hash
                 self.conversation = nomadnet.Conversation(source_hash, nomadnet.NomadNetworkApp.get_shared_instance())
                 self.message_widgets = []
+                self.sort_by_timestamp = False
                 self.updating_message_widgets = False
 
                 self.update_message_widgets()
@@ -496,7 +815,7 @@ class ConversationWidget(urwid.WidgetWrap):
 
                 header = None
                 if self.conversation.trust_level == DirectoryEntry.UNTRUSTED:
-                    header = urwid.AttrMap(urwid.Padding(urwid.Text("\u26A0 Warning: Conversation with untrusted peer \u26A0", align="center")), "msg_warning_untrusted")
+                    header = urwid.AttrMap(urwid.Padding(urwid.Text(g["warning"]+" Warning: Conversation with untrusted peer "+g["warning"], align="center")), "msg_warning_untrusted")
 
                 self.minimal_editor = urwid.AttrMap(msg_editor, "msg_editor")
                 self.minimal_editor.name = "minimal_editor"
@@ -535,6 +854,31 @@ class ConversationWidget(urwid.WidgetWrap):
                 
                 urwid.WidgetWrap.__init__(self, self.display_widget)
 
+    def clear_history_dialog(self):
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.conversation_changed(None)
+
+        def confirmed(sender):
+            self.dialog_open = False
+            self.conversation.clear_history()
+            self.conversation_changed(None)
+
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("Clear conversation history\n", align="center"),
+                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))])
+            ]), title="?"
+        )
+        dialog.delegate = self
+        bottom = self.messagelist
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=34, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+    
     def toggle_editor(self):
         if self.full_editor_active:
             self.frame.contents["footer"] = (self.minimal_editor, None)
@@ -544,12 +888,13 @@ class ConversationWidget(urwid.WidgetWrap):
             self.full_editor_active = True
 
     def check_editor_allowed(self):
+        g = self.app.ui.glyphs
         if self.frame:
             allowed = nomadnet.NomadNetworkApp.get_shared_instance().directory.is_known(bytes.fromhex(self.source_hash))
             if allowed:
                 self.frame.contents["footer"] = (self.minimal_editor, None)
             else:
-                warning = urwid.AttrMap(urwid.Padding(urwid.Text("\u2139 You cannot currently communicate with this peer, since it's identity keys are unknown", align="center")), "msg_header_caution")
+                warning = urwid.AttrMap(urwid.Padding(urwid.Text("\n"+g["info"]+"\n\nYou cannot currently message this peer, since it's identity keys are not known.\n\nWait for an announce to arrive from the peer, or query the network for it.\n\nTo query the network, select this conversation in the conversation list, press Ctrl-E, and use the query button.\n", align="center")), "msg_header_caution")
                 self.frame.contents["footer"] = (warning, None)
 
     def toggle_focus_area(self):
@@ -569,11 +914,18 @@ class ConversationWidget(urwid.WidgetWrap):
             self.toggle_focus_area()
         elif key == "ctrl w":
             self.close()
-        elif key == "ctrl p":
+        elif key == "ctrl u":
             self.conversation.purge_failed()
             self.conversation_changed(None)
         elif key == "ctrl t":
             self.toggle_editor()
+        elif key == "ctrl x":
+            self.clear_history_dialog()
+        elif key == "ctrl g":
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.conversations_display.toggle_fullscreen()
+        elif key == "ctrl o":
+            self.sort_by_timestamp ^= True
+            self.conversation_changed(None)
         else:
             return super(ConversationWidget, self).keypress(size, key)
 
@@ -594,7 +946,10 @@ class ConversationWidget(urwid.WidgetWrap):
                 message_widget = LXMessageWidget(message)
                 self.message_widgets.append(message_widget)
         
+        if self.sort_by_timestamp:
             self.message_widgets.sort(key=lambda m: m.timestamp, reverse=False)
+        else:
+            self.message_widgets.sort(key=lambda m: m.sort_timestamp, reverse=False)
 
         from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox
         self.messagelist = IndicativeListBox(self.message_widgets, position = len(self.message_widgets)-1)
@@ -619,6 +974,115 @@ class ConversationWidget(urwid.WidgetWrap):
             else:
                 pass
 
+    def paper_message_saved(self, path):
+        g = self.app.ui.glyphs
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.conversation_changed(None)
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("The paper message was saved to:\n\n"+str(path)+"\n", align="center"),
+                urwid.Columns([("weight", 0.6, urwid.Text("")), ("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="center", width=60, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+
+    def print_paper_message_qr(self):
+        content = self.content_editor.get_edit_text()
+        title = self.title_editor.get_edit_text()
+        if not content == "":
+            if self.conversation.paper_output(content, title):
+                self.clear_editor()
+            else:
+                self.paper_message_failed()
+
+    def save_paper_message_qr(self):
+        content = self.content_editor.get_edit_text()
+        title = self.title_editor.get_edit_text()
+        if not content == "":
+            output_result = self.conversation.paper_output(content, title, mode="save_qr")
+            if output_result != False:
+                self.clear_editor()
+                self.paper_message_saved(output_result)
+            else:
+                self.paper_message_failed()
+
+    def save_paper_message_uri(self):
+        content = self.content_editor.get_edit_text()
+        title = self.title_editor.get_edit_text()
+        if not content == "":
+            output_result = self.conversation.paper_output(content, title, mode="save_uri")
+            if output_result != False:
+                self.clear_editor()
+                self.paper_message_saved(output_result)
+            else:
+                self.paper_message_failed()
+
+    def paper_message(self):
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.conversation_changed(None)
+
+        def print_qr(sender):
+            dismiss_dialog(self)
+            self.print_paper_message_qr()
+
+        def save_qr(sender):
+            dismiss_dialog(self)
+            self.save_paper_message_qr()
+
+        def save_uri(sender):
+            dismiss_dialog(self)
+            self.save_paper_message_uri()
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("Select the desired paper message output method.\nSaved files will be written to:\n\n"+str(self.app.downloads_path)+"\n", align="center"),
+                urwid.Columns([
+                    ("weight", 0.5, urwid.Button("Print QR", on_press=print_qr)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.5, urwid.Button("Save QR", on_press=save_qr)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.5, urwid.Button("Save URI", on_press=save_uri)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("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="center", width=60, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+
+    def paper_message_failed(self):
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.conversation_changed(None)
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("Could not output paper message,\ncheck your settings. See the log\nfile for any error messages.\n", align="center"),
+                urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+            ]), title="!"
+        )
+        dialog.delegate = self
+        bottom = self.messagelist
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=34, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+
     def close(self):
         self.delegate.close_conversation(self)
 
@@ -626,34 +1090,45 @@ class ConversationWidget(urwid.WidgetWrap):
 class LXMessageWidget(urwid.WidgetWrap):
     def __init__(self, message):
         app = nomadnet.NomadNetworkApp.get_shared_instance()
+        g = app.ui.glyphs
         self.timestamp = message.get_timestamp()
+        self.sort_timestamp = message.sort_timestamp
         time_format = app.time_format
         message_time = datetime.fromtimestamp(self.timestamp)
         encryption_string = ""
         if message.get_transport_encrypted():
-            encryption_string = " [\U0001F512"+str(message.get_transport_encryption())+"]"
+            encryption_string = " ["+g["encrypted"]+" "+str(message.get_transport_encryption())+"]"
         else:
-            encryption_string = " [\U0001F513"+str(message.get_transport_encryption())+"]"
+            encryption_string = " ["+g["plaintext"]+" "+str(message.get_transport_encryption())+"]"
         
         title_string = message_time.strftime(time_format)+encryption_string
 
         if app.lxmf_destination.hash == message.lxm.source_hash:
             if message.lxm.state == LXMF.LXMessage.DELIVERED:
                 header_style = "msg_header_delivered"
-                title_string = "\u2713 " + title_string
+                title_string = g["check"]+" "+title_string
             elif message.lxm.state == LXMF.LXMessage.FAILED:
                 header_style = "msg_header_failed"
-                title_string = "\u2715 " + title_string
+                title_string = g["cross"]+" "+title_string
+            elif message.lxm.method == LXMF.LXMessage.PROPAGATED and message.lxm.state == LXMF.LXMessage.SENT:
+                header_style = "msg_header_propagated"
+                title_string = g["sent"]+" "+title_string
+            elif message.lxm.method == LXMF.LXMessage.PAPER and message.lxm.state == LXMF.LXMessage.PAPER:
+                header_style = "msg_header_propagated"
+                title_string = g["papermsg"]+" "+title_string
+            elif message.lxm.state == LXMF.LXMessage.SENT:
+                header_style = "msg_header_sent"
+                title_string = g["sent"]+" "+title_string
             else:
                 header_style = "msg_header_sent"
-                title_string = "\u2192 " + title_string
+                title_string = g["arrow_r"]+" "+title_string
         else:
             if message.signature_validated():
                 header_style = "msg_header_ok"
-                title_string = "\u2713 " + title_string
+                title_string = g["check"]+" "+title_string
             else:
                 header_style = "msg_header_caution"
-                title_string = "\u26A0 "+message.get_signature_description() + "\n  " + title_string
+                title_string = g["warning"]+" "+message.get_signature_description() + "\n  " + title_string
 
         if message.get_title() != "":
             title_string += " | " + message.get_title()
@@ -667,3 +1142,12 @@ class LXMessageWidget(urwid.WidgetWrap):
         ])
 
         urwid.WidgetWrap.__init__(self, display_widget)
+
+class SyncProgressBar(urwid.ProgressBar):
+    def get_text(self):
+        status = nomadnet.NomadNetworkApp.get_shared_instance().get_sync_status()
+        show_percent = nomadnet.NomadNetworkApp.get_shared_instance().sync_status_show_percent()
+        if show_percent:
+            return status+" "+super().get_text()
+        else:
+            return status

nomadnet/ui/textui/Extras.py

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

nomadnet/ui/textui/Log.py

@@ -0,0 +1,38 @@
+import urwid
+import nomadnet
+
+class LogDisplayShortcuts():
+    def __init__(self, app):
+        import urwid
+        self.app = app
+
+        self.widget = urwid.AttrMap(urwid.Text(""), "shortcutbar")
+
+class LogDisplay():
+    def __init__(self, app):
+        import urwid
+        self.app = app
+        self.log_term = LogTerminal(self.app)
+
+        self.shortcuts_display = LogDisplayShortcuts(self.app)
+        self.widget = urwid.LineBox(self.log_term)
+        
+    def shortcuts(self):
+        return self.shortcuts_display
+
+class LogTerminal(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.app = app
+        self.log_term = urwid.Terminal(
+            ("tail", "-fn50", self.app.logfilepath),
+            encoding='utf-8',
+            escape_sequence="up"
+        )
+        urwid.WidgetWrap.__init__(self, self.log_term)
+
+
+    def keypress(self, size, key):
+        if key == "up":
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+            
+        return super(LogTerminal, self).keypress(size, key)

nomadnet/ui/textui/Main.py

@@ -4,7 +4,10 @@ import time
 from .Network import *
 from .Conversations import *
 from .Directory import *
+from .Config import *
 from .Map import *
+from .Log import *
+from .Guide import *
 import urwid
 
 class SubDisplays():
@@ -13,8 +16,14 @@ class SubDisplays():
         self.network_display = NetworkDisplay(self.app)
         self.conversations_display = ConversationsDisplay(self.app)
         self.directory_display = DirectoryDisplay(self.app)
+        self.config_display = ConfigDisplay(self.app)
         self.map_display = MapDisplay(self.app)
+        self.log_display = LogDisplay(self.app)
+        self.guide_display = GuideDisplay(self.app)
 
+        if app.firstrun:
+            self.active_display = self.guide_display
+        else:
             self.active_display = self.conversations_display
 
     def active(self):
@@ -68,8 +77,8 @@ class MainFrame(urwid.Frame):
     def keypress(self, size, key):
         self.keypress_focus_check()
         
-        if key == "ctrl q":
-            raise urwid.ExitMainLoop
+        #if key == "ctrl q":
+        #    raise urwid.ExitMainLoop
 
         return super(MainFrame, self).keypress(size, key)
 
@@ -101,6 +110,18 @@ class MainDisplay():
         self.sub_displays.active_display = self.sub_displays.map_display
         self.update_active_sub_display()
 
+    def show_config(self, user_data):
+        self.sub_displays.active_display = self.sub_displays.config_display
+        self.update_active_sub_display()
+
+    def show_log(self, user_data):
+        self.sub_displays.active_display = self.sub_displays.log_display
+        self.update_active_sub_display()
+
+    def show_guide(self, user_data):
+        self.sub_displays.active_display = self.sub_displays.guide_display
+        self.update_active_sub_display()
+
     def update_active_sub_display(self):
         self.frame.contents["body"] = (self.sub_displays.active().widget, None)
         self.update_active_shortcuts()
@@ -108,7 +129,26 @@ class MainDisplay():
     def update_active_shortcuts(self):
         self.frame.contents["footer"] = (self.sub_displays.active().shortcuts().widget, None)
 
+    def request_redraw(self, extra_delay=0.0):
+        self.app.ui.loop.set_alarm_in(0.25+extra_delay, self.redraw_now)
+    
+    def redraw_now(self, sender=None, data=None):
+        self.app.ui.loop.screen.clear()
+        #self.app.ui.loop.draw_screen()
+
+    def start(self):
+        self.menu_display.start()
+
     def quit(self, sender=None):
+        logterm_pid = None
+        if True or RNS.vendor.platformutils.is_android():
+            if self.sub_displays.log_display != None and self.sub_displays.log_display.log_term != None:
+                if self.sub_displays.log_display.log_term.log_term != None:
+                    logterm_pid = self.sub_displays.log_display.log_term.log_term.pid
+                    if logterm_pid != None:
+                        import os, signal
+                        os.kill(logterm_pid, signal.SIGKILL)
+
         raise urwid.ExitMainLoop
 
 
@@ -120,19 +160,53 @@ class MenuColumns(urwid.Columns):
         return super(MenuColumns, self).keypress(size, key)
 
 class MenuDisplay():
+    UPDATE_INTERVAL = 2
+
     def __init__(self, app, handler):
         self.app = app
+        self.update_interval = MenuDisplay.UPDATE_INTERVAL
+        self.g = self.app.ui.glyphs
 
-        menu_text            = ("pack", urwid.Text(" \U00002638"))
+        self.menu_indicator  = urwid.Text("")
+
+        menu_text            = ("pack", self.menu_indicator)
         button_network       = (11, MenuButton("Network", on_press=handler.show_network))
         button_conversations = (17, MenuButton("Conversations", on_press=handler.show_conversations))
         button_directory     = (13, MenuButton("Directory", on_press=handler.show_directory))
         button_map           = (7,  MenuButton("Map", on_press=handler.show_map))
+        button_log           = (7,  MenuButton("Log", on_press=handler.show_log))
+        button_config        = (10, MenuButton("Config", on_press=handler.show_config))
+        button_guide         = (9,  MenuButton("Guide", on_press=handler.show_guide))
         button_quit          = (8,  MenuButton("Quit", on_press=handler.quit))
 
         # buttons = [menu_text, button_conversations, button_node, button_directory, button_map]
-        buttons = [menu_text, button_conversations, button_network, button_quit]
+        if self.app.config["textui"]["hide_guide"]:
+            buttons = [menu_text, button_conversations, button_network, button_log, button_config, button_quit]
+        else:
+            buttons = [menu_text, button_conversations, button_network, button_log, button_config, button_guide, button_quit]
+
         columns = MenuColumns(buttons, dividechars=1)
         columns.handler = handler
 
+        self.update_display()
+
         self.widget = urwid.AttrMap(columns, "menubar")
+
+    def start(self):
+        self.update_display_job()
+
+    def update_display_job(self, event = None, sender = None):
+        self.update_display()
+        self.app.ui.loop.set_alarm_in(self.update_interval, self.update_display_job)
+
+    def update_display(self):
+        if self.app.has_unread_conversations():
+            self.indicate_unread()
+        else:
+            self.indicate_normal()
+
+    def indicate_normal(self):
+        self.menu_indicator.set_text(self.g["decoration_menu"])
+
+    def indicate_unread(self):
+        self.menu_indicator.set_text(self.g["unread_menu"])

nomadnet/ui/textui/MicronParser.py

@@ -0,0 +1,795 @@
+import nomadnet
+import urwid
+import random
+import time
+from urwid.util import is_mouse_press
+from urwid.text_layout import calc_coords
+import re
+
+DEFAULT_FG_DARK  = "ddd"
+DEFAULT_FG_LIGHT = "222"
+DEFAULT_BG = "default"
+
+SELECTED_STYLES = None
+
+STYLES_DARK = {
+    "plain":    { "fg": DEFAULT_FG_DARK, "bg": DEFAULT_BG, "bold": False, "underline": False, "italic": False },
+    "heading1": { "fg": "222", "bg": "bbb", "bold": False, "underline": False, "italic": False },
+    "heading2": { "fg": "111", "bg": "999", "bold": False, "underline": False, "italic": False },
+    "heading3": { "fg": "000", "bg": "777", "bold": False, "underline": False, "italic": False },
+}
+
+STYLES_LIGHT = {
+    "plain":    { "fg": DEFAULT_FG_LIGHT, "bg": DEFAULT_BG, "bold": False, "underline": False, "italic": False },
+    "heading1": { "fg": "000", "bg": "777", "bold": False, "underline": False, "italic": False },
+    "heading2": { "fg": "111", "bg": "aaa", "bold": False, "underline": False, "italic": False },
+    "heading3": { "fg": "222", "bg": "ccc", "bold": False, "underline": False, "italic": False },
+}
+
+SYNTH_STYLES = []
+SYNTH_SPECS  = {}
+
+SECTION_INDENT = 2
+INDENT_RIGHT   = 1
+
+def markup_to_attrmaps(markup, url_delegate = None):
+    global SELECTED_STYLES
+    if nomadnet.NomadNetworkApp.get_shared_instance().config["textui"]["theme"] == nomadnet.ui.TextUI.THEME_DARK:
+        SELECTED_STYLES = STYLES_DARK
+    else:
+        SELECTED_STYLES = STYLES_LIGHT
+
+    attrmaps = []
+
+    state = {
+        "literal": False,
+        "depth": 0,
+        "fg_color": SELECTED_STYLES["plain"]["fg"],
+        "bg_color": DEFAULT_BG,
+        "formatting": {
+            "bold": False,
+            "underline": False,
+            "italic": False,
+            "strikethrough": False,
+            "blink": False,
+        },
+        "default_align": "left",
+        "align": "left",
+    }
+
+    # Split entire document into lines for
+    # processing.
+    lines = markup.split("\n");
+
+    for line in lines:
+        if len(line) > 0:
+            display_widgets = parse_line(line, state, url_delegate)
+        else:
+            display_widgets = [urwid.Text("")]
+        
+        if display_widgets != None and len(display_widgets) != 0:
+            for display_widget in display_widgets:
+                attrmap = urwid.AttrMap(display_widget, make_style(state))
+                attrmaps.append(attrmap)
+
+    return attrmaps
+
+
+def parse_line(line, state, url_delegate):
+    if len(line) > 0:
+        first_char = line[0]
+
+        # Check for literals
+        if len(line) == 2 and line == "`=":
+            state["literal"] ^= True
+            return None
+
+        # Only parse content if not in literal state
+        if not state["literal"]:
+            # Check if the command is an escape
+            if first_char == "\\":
+                line = line[1:]
+
+            # Check for comments
+            elif first_char == "#":
+                return None
+
+            # Check for section heading reset
+            elif first_char == "<":
+                state["depth"] = 0
+                return parse_line(line[1:], state, url_delegate)
+
+            # Check for section headings
+            elif first_char == ">":
+                i = 0
+                while i < len(line) and line[i] == ">":
+                    i += 1
+                    state["depth"] = i
+                
+                    for j in range(1, i+1):
+                        wanted_style = "heading"+str(i)
+                        if wanted_style in SELECTED_STYLES:
+                            style = SELECTED_STYLES[wanted_style]
+
+                line = line[state["depth"]:]
+                if len(line) > 0:
+                    latched_style = state_to_style(state)
+                    style_to_state(style, state)
+
+                    heading_style = make_style(state)
+                    output = make_output(state, line, url_delegate)
+                    
+                    style_to_state(latched_style, state)
+
+                    if len(output) > 0:
+                        first_style = output[0][0]
+
+                        heading_style = first_style
+                        output.insert(0, " "*left_indent(state))
+                        return [urwid.AttrMap(urwid.Text(output, align=state["align"]), heading_style)]
+                    else:
+                        return None
+                else:
+                    return None
+
+            # Check for horizontal dividers
+            elif first_char == "-":
+                if len(line) == 2:
+                    divider_char = line[1]
+                else:
+                    divider_char = "\u2500"
+                if state["depth"] == 0:
+                    return [urwid.Divider(divider_char)]
+                else:
+                    return [urwid.Padding(urwid.Divider(divider_char), left=left_indent(state), right=right_indent(state))]
+
+        output = make_output(state, line, url_delegate)
+
+        if output != None:
+            text_only = True
+            for o in output:
+                if not isinstance(o, tuple):
+                    text_only = False
+                    break
+
+            if not text_only:
+                widgets = []
+                for o in output:
+                    if isinstance(o, tuple):
+                        if url_delegate != None:
+                            tw = LinkableText(o, align=state["align"], delegate=url_delegate)
+                            tw.in_columns = True
+                        else:
+                            tw = urwid.Text(o, align=state["align"])
+                        
+                        widgets.append(("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))
+
+                columns_widget = urwid.Columns(widgets, dividechars=0)
+                text_widget = columns_widget
+                # text_widget = urwid.Text("<"+output+">", align=state["align"])
+
+            else:
+                if url_delegate != None:
+                    text_widget = LinkableText(output, align=state["align"], delegate=url_delegate)
+                else:
+                    text_widget = urwid.Text(output, align=state["align"])
+
+            if state["depth"] == 0:
+                return [text_widget]
+            else:
+                return [urwid.Padding(text_widget, left=left_indent(state), right=right_indent(state))]
+        else:
+            return None
+    else:
+        return None
+
+def left_indent(state):
+    return (state["depth"]-1)*SECTION_INDENT
+
+def right_indent(state):
+    return (state["depth"]-1)*SECTION_INDENT
+
+def make_part(state, part):
+    return (make_style(state), part)
+
+def state_to_style(state):
+    return { "fg": state["fg_color"], "bg": state["bg_color"], "bold": state["formatting"]["bold"], "underline": state["formatting"]["underline"], "italic": state["formatting"]["italic"] }
+
+def style_to_state(style, state):
+    if style["fg"] != None:
+        state["fg_color"] = style["fg"]
+    if style["bg"] != None:
+        state["bg_color"] = style["bg"]
+    if style["bold"] != None:
+        state["formatting"]["bold"] = style["bold"]
+    if style["underline"] != None:
+        state["formatting"]["underline"] = style["underline"]
+    if style["italic"] != None:
+        state["formatting"]["italic"] = style["italic"]
+
+def make_style(state):
+    def mono_color(fg, bg):
+        return "default"
+
+    def low_color(color):
+        try:
+            result = "default"
+            if color == "default":
+                result = "default"
+
+            elif len(color) == 6:
+                r = str(color[0])
+                g = str(color[2])
+                b = str(color[4])
+                color = r+g+b
+
+            if len(color) == 3:
+                t = 7
+
+                if color[0] == "g":
+                    val = int(color[1:2])
+                    if val < 25:
+                        result = "black"
+                    elif val < 50:
+                        result = "dark gray"
+                    elif val < 75:
+                        result = "light gray"
+                    else:
+                        result = "white"
+                else:
+                    r = int(color[0], 16)
+                    g = int(color[1], 16)
+                    b = int(color[2], 16)
+
+                    if r == g == b:
+                        val = int(color[0], 16)*6
+                        if val < 12:
+                            result = "black"
+                        elif val < 50:
+                            result = "dark gray"
+                        elif val < 80:
+                            result = "light gray"
+                        else:
+                            result = "white"
+
+                    else:
+                        if r == b:
+                            if r > g:
+                                if r > t:
+                                    result = "light magenta"
+                                else:
+                                    result = "dark magenta"
+                            else:
+                                if g > t:
+                                    result = "light green"
+                                else:
+                                    result = "dark green"
+                        if b == g:
+                            if b > r:
+                                if b > t:
+                                    result = "light cyan"
+                                else:
+                                    result = "dark cyan"
+                            else:
+                                if r > t:
+                                    result = "light red"
+                                else:
+                                    result = "dark red"
+                        if g == r:
+                            if g > b:
+                                if g > t:
+                                    result = "yellow"
+                                else:
+                                    result = "brown"
+                            else:
+                                if b > t:
+                                    result = "light blue"
+                                else:
+                                    result = "dark blue"
+
+                        if r > g and r > b:
+                            if r > t:
+                                result = "light red"
+                            else:
+                                result = "dark red"
+                        if g > r and g > b:
+                            if g > t:
+                                result = "light green"
+                            else:
+                                result = "dark green"
+                        if b > g and b > r:
+                            if b > t:
+                                result = "light blue"
+                            else:
+                                result = "dark blue"
+
+        except Exception as e:
+            result = "default"
+
+        return result
+
+    def high_color(color):
+        def parseval_hex(char):
+            return hex(max(0,min(int(char, 16),16)))[2:]
+
+        def parseval_dec(char):
+            return str(max(0,min(int(char), 9)))
+
+        if color == "default":
+            return "default"
+        else:
+            if len(color) == 6:
+                try:
+                    v1 = parseval_hex(color[0])
+                    v2 = parseval_hex(color[1])
+                    v3 = parseval_hex(color[2])
+                    v4 = parseval_hex(color[3])
+                    v5 = parseval_hex(color[4])
+                    v6 = parseval_hex(color[5])
+                    color = "#"+v1+v2+v3+v4+v5+v6
+
+                except Exception as e:
+                    return "default"
+
+                return color
+
+            elif len(color) == 3:
+                if color[0] == "g":
+                    try:
+                        v1 = parseval_dec(color[1])
+                        v2 = parseval_dec(color[2])
+
+                    except Exception as e:
+                        return "default"
+
+                    return "g"+v1+v2
+                
+                else:
+                    try:
+                        v1 = parseval_hex(color[0])
+                        v2 = parseval_hex(color[1])
+                        v3 = parseval_hex(color[2])
+                        color = v1+v2+v3
+                        
+                    except Exception as e:
+                        return "default"
+
+                    r = color[0]
+                    g = color[1]
+                    b = color[2]
+                    return "#"+r+r+g+g+b+b
+
+
+    bold      = state["formatting"]["bold"]
+    underline = state["formatting"]["underline"]
+    italic    = state["formatting"]["italic"]
+    fg        = state["fg_color"]
+    bg        = state["bg_color"]
+
+    format_string = ""
+    if bold:
+        format_string += ",bold"
+    if underline:
+        format_string += ",underline"
+    if italic:
+        format_string += ",italics"
+
+    name = "micron_"+fg+"_"+bg+"_"+format_string
+    if not name in SYNTH_STYLES:
+        screen = nomadnet.NomadNetworkApp.get_shared_instance().ui.screen
+        screen.register_palette_entry(name, low_color(fg)+format_string,low_color(bg),mono_color(fg, bg)+format_string,high_color(fg)+format_string,high_color(bg))
+        
+        synth_spec = screen._palette[name]
+        SYNTH_STYLES.append(name)
+        if not name in SYNTH_SPECS:
+            SYNTH_SPECS[name] = synth_spec
+
+    return name
+
+def make_output(state, line, url_delegate):
+    output = []
+    if state["literal"]:
+        if line == "\\`=":
+            line = "`="
+        output.append(make_part(state, line))
+    else:
+        part = ""
+        mode = "text"
+        escape = False
+        skip = 0
+        for i in range(0, len(line)):
+            c = line[i]
+            if skip > 0:
+                skip -= 1
+            else:
+                if mode == "formatting":
+                    if c == "_":
+                        state["formatting"]["underline"] ^= True
+                    elif c == "!":
+                        state["formatting"]["bold"] ^= True
+                    elif c == "*":
+                        state["formatting"]["italic"] ^= True
+                    elif c == "F":
+                        if len(line) >= i+4:
+                            color = line[i+1:i+4]
+                            state["fg_color"] = color
+                            skip = 3
+                    elif c == "f":
+                        state["fg_color"] = SELECTED_STYLES["plain"]["fg"]
+                    elif c == "B":
+                        if len(line) >= i+4:
+                            color = line[i+1:i+4]
+                            state["bg_color"] = color
+                            skip = 3
+                    elif c == "b":
+                        state["bg_color"] = DEFAULT_BG
+                    elif c == "`":
+                        state["formatting"]["bold"]      = False 
+                        state["formatting"]["underline"] = False
+                        state["formatting"]["italic"]    = False
+                        state["fg_color"] = SELECTED_STYLES["plain"]["fg"]
+                        state["bg_color"] = DEFAULT_BG
+                        state["align"] = state["default_align"]
+                    elif c == "c":
+                        if state["align"] != "center":
+                            state["align"] = "center"
+                        else:
+                            state["align"] = state["default_align"]
+                    elif c == "l":
+                        if state["align"] != "left":
+                            state["align"] = "left"
+                        else:
+                            state["align"] = state["default_align"]
+                    elif c == "r":
+                        if state["align"] != "right":
+                            state["align"] = "right"
+                        else:
+                            state["align"] = state["default_align"]
+                    elif c == "a":
+                        state["align"] = state["default_align"]
+
+                    elif c == "<":
+                        try:
+                            field_name = None
+                            field_name_end = line[i:].find("`")
+                            if field_name_end == -1:
+                                pass
+                            else:
+                                field_name = line[i+1:i+field_name_end]
+                                field_name_skip = len(field_name)
+                                field_masked = False
+                                field_width = 24
+
+                                if "|" in field_name:
+                                    f_components = field_name.split("|")
+                                    field_flags = f_components[0]
+                                    field_name = f_components[1]
+                                    if "!" in field_flags:
+                                        field_flags = field_flags.replace("!", "")
+                                        field_masked = True
+                                    if len(field_flags) > 0:
+                                        field_width = min(int(field_flags), 256)
+
+                                def sr():
+                                    return "@{"+str(random.randint(1000,9999))+"}"
+                                rsg = sr()
+                                while rsg in line[i+field_name_end:]:
+                                    rsg = sr()
+                                lr = line[i+field_name_end:].replace("\\>", rsg)
+                                endpos = lr.find(">")
+                                
+                                if endpos == -1:
+                                    pass
+                                
+                                else:
+                                    field_data = lr[1:endpos].replace(rsg, "\\>")
+                                    skip = len(field_data)+field_name_skip+2
+                                    field_data = field_data.replace("\\>", ">")
+                                    output.append({
+                                        "type":"field",
+                                        "name": field_name,
+                                        "width": field_width,
+                                        "masked": field_masked,
+                                        "data": field_data,
+                                        "style": make_style(state)
+                                    })
+                        except Exception as e:
+                            pass
+    
+                    elif c == "[":
+                        endpos = line[i:].find("]")
+                        if endpos == -1:
+                            pass
+                        else:
+                            link_data = line[i+1:i+endpos]
+                            skip = endpos
+
+                            link_components = link_data.split("`")
+                            if len(link_components) == 1:
+                                link_label = ""
+                                link_fields = ""
+                                link_url = link_data
+                            elif len(link_components) == 2:
+                                link_label = link_components[0]
+                                link_url = link_components[1]
+                                link_fields = ""
+                            elif len(link_components) == 3:
+                                link_label = link_components[0]
+                                link_url = link_components[1]
+                                link_fields = link_components[2]
+                            else:
+                                link_url = ""
+                                link_label = ""
+                                link_fields = ""
+
+                            if len(link_url) != 0:
+                                if link_label == "":
+                                    link_label = link_url
+
+                                # First generate output until now
+                                if len(part) > 0:
+                                    output.append(make_part(state, part))
+
+                                cm = nomadnet.NomadNetworkApp.get_shared_instance().ui.colormode
+
+                                specname = make_style(state)
+                                speclist = SYNTH_SPECS[specname]
+
+                                if cm == 1:
+                                    orig_spec = speclist[0]
+                                elif cm == 16:
+                                    orig_spec = speclist[1]
+                                elif cm == 88:
+                                    orig_spec = speclist[2]
+                                elif cm == 256:
+                                    orig_spec = speclist[3]
+                                elif cm == 2**24:
+                                    orig_spec = speclist[4]
+
+                                if url_delegate != None:
+                                    linkspec = LinkSpec(link_url, orig_spec)
+                                    if link_fields != "":
+                                        lf = link_fields.split("|")
+                                        if len(lf) > 0:
+                                            linkspec.link_fields = lf
+
+                                    output.append((linkspec, link_label))
+                                else:
+                                    output.append(make_part(state, link_label)) 
+
+                                
+
+                    mode = "text"
+                    if len(part) > 0:
+                        output.append(make_part(state, part))
+
+                elif mode == "text":
+                    if c == "\\":
+                        if escape:
+                            part += c
+                            escape = False
+                        else:
+                            escape = True
+                    elif c == "`":
+                        if escape:
+                            part += c
+                            escape = False
+                        else:
+                            mode = "formatting"
+                            if len(part) > 0:
+                                output.append(make_part(state, part))
+                                part = ""
+                    else:
+                        part += c
+
+            if i == len(line)-1:
+                if len(part) > 0:
+                    output.append(make_part(state, part))
+
+    if len(output) > 0:
+        return output
+    else:
+        return None
+
+
+class LinkSpec(urwid.AttrSpec):
+    def __init__(self, link_target, orig_spec):
+        self.link_target = link_target
+        self.link_fields = None
+
+        urwid.AttrSpec.__init__(self, orig_spec.foreground, orig_spec.background)
+
+
+class LinkableText(urwid.Text):
+    ignore_focus = False
+    _selectable = True
+
+    signals = ["click", "change"]
+
+    def __init__(self, text, align=None, cursor_position=0, delegate=None):
+        self.__super.__init__(text, align=align)
+        self.delegate = delegate
+        self._cursor_position = 0
+        self.key_timeout = 3
+        self.in_columns = False
+        if self.delegate != None:
+            self.delegate.last_keypress = 0
+
+    def handle_link(self, link_target, link_fields):
+        if self.delegate != None:
+            self.delegate.handle_link(link_target, link_fields)
+
+    def find_next_part_pos(self, pos, part_positions):
+        for position in part_positions:
+            if position > pos:
+                return position
+        return pos
+
+    def find_prev_part_pos(self, pos, part_positions):
+        nextpos = pos
+        for position in part_positions:
+            if position < pos:
+                nextpos = position
+        return nextpos
+
+    def find_item_at_pos(self, pos):
+        total = 0
+        text, parts = self.get_text()
+        for i, info in enumerate(parts):
+            style, length = info
+            if total <= pos < length+total:
+                return style
+
+            total += length
+
+        return None
+
+    def peek_link(self):
+        item = self.find_item_at_pos(self._cursor_position)
+        if item != None:
+            if isinstance(item, LinkSpec):
+                if self.delegate != None:
+                    self.delegate.marked_link(item.link_target)
+            else:
+                if self.delegate != None:
+                    self.delegate.marked_link(None)
+
+
+    def keypress(self, size, key):
+        part_positions = [0]
+        parts = []
+        total = 0
+        text, parts = self.get_text()
+        for i, info in enumerate(parts):
+            style_name, length = info
+            part_positions.append(length+total)
+            total += length
+
+
+        if self.delegate != None:
+            self.delegate.last_keypress = time.time()
+            self._invalidate()
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.loop.set_alarm_in(self.key_timeout, self.kt_event)
+
+        if self._command_map[key] == urwid.ACTIVATE:
+            item = self.find_item_at_pos(self._cursor_position)
+            if item != None:
+                if isinstance(item, LinkSpec):
+                    self.handle_link(item.link_target, item.link_fields)
+
+        elif key == "up":
+            self._cursor_position = 0
+            return key
+        
+        elif key == "down":
+            self._cursor_position = 0
+            return key
+        
+        elif key == "right":
+            old = self._cursor_position
+            self._cursor_position = self.find_next_part_pos(self._cursor_position, part_positions)
+
+            if self._cursor_position == old:
+                if self.in_columns:
+                    return "right"
+                else:
+                    self._cursor_position = 0
+                    return "down"
+
+            self._invalidate()
+        
+        elif key == "left":
+            if self._cursor_position > 0:
+                if self.in_columns:
+                    return "left"
+                else:
+                    self._cursor_position = self.find_prev_part_pos(self._cursor_position, part_positions)
+                    self._invalidate()
+
+            else:
+                if self.delegate != None:
+                    self.delegate.micron_released_focus()
+
+        else:
+            return key
+
+    def kt_event(self, loop, user_data):
+        self._invalidate()
+
+    def render(self, size, focus=False):
+        now = time.time()
+        c = self.__super.render(size, focus)
+
+        if focus and (self.delegate == None or now < self.delegate.last_keypress+self.key_timeout):
+            c = urwid.CompositeCanvas(c)
+            c.cursor = self.get_cursor_coords(size)
+            if self.delegate != None:
+                self.peek_link()
+
+        return c
+
+    def get_cursor_coords(self, size):
+            if self._cursor_position > len(self.text):
+                return None
+
+            (maxcol,) = size
+            trans = self.get_line_translation(maxcol)
+            x, y = calc_coords(self.text, trans, self._cursor_position)
+            if maxcol <= x:
+                return None
+            return x, y
+
+    def mouse_event(self, size, event, button, x, y, focus):
+        try:
+            if button != 1 or not is_mouse_press(event):
+                return False
+            else:
+                (maxcol,) = size
+                translation = self.get_line_translation(maxcol)
+                line_offset = 0
+
+                if self.align == "center":
+                    line_offset = translation[y][1][1]-translation[y][0][0]
+                    if x < translation[y][0][0]:
+                        x = translation[y][0][0]
+
+                    if x > translation[y][1][0]+translation[y][0][0]:
+                        x = translation[y][1][0]+translation[y][0][0]
+
+                elif self.align == "right":
+                    line_offset = translation[y][1][1]-translation[y][0][0]
+                    if x < translation[y][0][0]:
+                        x = translation[y][0][0]
+
+                else:
+                    line_offset = translation[y][0][1]
+                    if x > translation[y][0][0]:
+                        x = translation[y][0][0]
+
+                pos = line_offset+x
+
+                self._cursor_position = pos
+                item = self.find_item_at_pos(self._cursor_position)
+
+                if item != None:
+                    if isinstance(item, LinkSpec):
+                        self.handle_link(item.link_target, item.link_fields)
+
+                self._invalidate()
+                self._emit("change")
+                
+                return True
+            
+        except Exception as e:
+            return False

nomadnet/vendor/Scrollable.py

@@ -0,0 +1,470 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details
+# http://www.gnu.org/licenses/gpl-3.0.txt
+
+import urwid
+from urwid.widget import BOX, FIXED, FLOW
+
+# Scroll actions
+SCROLL_LINE_UP        = 'line up'
+SCROLL_LINE_DOWN      = 'line down'
+SCROLL_PAGE_UP        = 'page up'
+SCROLL_PAGE_DOWN      = 'page down'
+SCROLL_TO_TOP         = 'to top'
+SCROLL_TO_END         = 'to end'
+
+# Scrollbar positions
+SCROLLBAR_LEFT  = 'left'
+SCROLLBAR_RIGHT = 'right'
+
+class Scrollable(urwid.WidgetDecoration):
+    def sizing(self):
+        return frozenset([BOX,])
+
+    def selectable(self):
+        return True
+
+    def __init__(self, widget, force_forward_keypress = False):
+        """Box widget that makes a fixed or flow widget vertically scrollable
+
+        TODO: Focusable widgets are handled, including switching focus, but
+        possibly not intuitively, depending on the arrangement of widgets.  When
+        switching focus to a widget that is ouside of the visible part of the
+        original widget, the canvas scrolls up/down to the focused widget.  It
+        would be better to scroll until the next focusable widget is in sight
+        first.  But for that to work we must somehow obtain a list of focusable
+        rows in the original canvas.
+        """
+        if not any(s in widget.sizing() for s in (FIXED, FLOW)):
+            raise ValueError('Not a fixed or flow widget: %r' % widget)
+        self._trim_top = 0
+        self._scroll_action = None
+        self._forward_keypress = None
+        self._old_cursor_coords = None
+        self._rows_max_cached = 0
+        self.force_forward_keypress = force_forward_keypress
+        self.__super.__init__(widget)
+
+    def render(self, size, focus=False):
+        maxcol, maxrow = size
+
+        # Render complete original widget
+        ow = self._original_widget
+        ow_size = self._get_original_widget_size(size)
+        canv_full = ow.render(ow_size, focus)
+
+        # Make full canvas editable
+        canv = urwid.CompositeCanvas(canv_full)
+        canv_cols, canv_rows = canv.cols(), canv.rows()
+
+        if canv_cols <= maxcol:
+            pad_width = maxcol - canv_cols
+            if pad_width > 0:
+                # Canvas is narrower than available horizontal space
+                canv.pad_trim_left_right(0, pad_width)
+
+        if canv_rows <= maxrow:
+            fill_height = maxrow - canv_rows
+            if fill_height > 0:
+                # Canvas is lower than available vertical space
+                canv.pad_trim_top_bottom(0, fill_height)
+
+        if canv_cols <= maxcol and canv_rows <= maxrow:
+            # Canvas is small enough to fit without trimming
+            return canv
+
+        self._adjust_trim_top(canv, size)
+
+        # Trim canvas if necessary
+        trim_top = self._trim_top
+        trim_end = canv_rows - maxrow - trim_top
+        trim_right = canv_cols - maxcol
+        if trim_top > 0:
+            canv.trim(trim_top)
+        if trim_end > 0:
+            canv.trim_end(trim_end)
+        if trim_right > 0:
+            canv.pad_trim_left_right(0, -trim_right)
+
+        # Disable cursor display if cursor is outside of visible canvas parts
+        if canv.cursor is not None:
+            curscol, cursrow = canv.cursor
+            if cursrow >= maxrow or cursrow < 0:
+                canv.cursor = None
+
+        # Figure out whether we should forward keypresses to original widget
+        if canv.cursor is not None:
+            # Trimmed canvas contains the cursor, e.g. in an Edit widget
+            self._forward_keypress = True
+        else:
+            if canv_full.cursor is not None:
+                # Full canvas contains the cursor, but scrolled out of view
+                self._forward_keypress = False
+                
+                # Reset cursor position on page/up down scrolling
+                try:
+                    if hasattr(ow, "automove_cursor_on_scroll") and ow.automove_cursor_on_scroll:
+                        pwi = 0
+                        ch = 0
+                        last_hidden = False
+                        first_visible = False
+                        for w,o in ow.contents:
+                            wcanv = w.render((maxcol,))
+                            wh = wcanv.rows()
+                            if wh:
+                                ch += wh
+
+                            if not last_hidden and ch >= self._trim_top:
+                                last_hidden = True
+
+                            elif last_hidden:
+                                if not first_visible:
+                                    first_visible = True
+
+                                if w.selectable():
+                                    ow.focus_item = pwi
+
+                                    st = None
+                                    nf = ow.get_focus()
+                                    if hasattr(nf, "key_timeout"):
+                                        st = nf
+                                    elif hasattr(nf, "original_widget"):
+                                        no = nf.original_widget
+                                        if hasattr(no, "original_widget"):
+                                            st = no.original_widget
+                                        else:
+                                            if hasattr(no, "key_timeout"):
+                                                st = no
+                                    
+                                    if st and hasattr(st, "key_timeout") and hasattr(st, "keypress") and callable(st.keypress):
+                                        st.keypress(None, None)
+                                    
+                                    break
+
+                            pwi += 1
+                except Exception as e:
+                    pass
+
+            else:
+                # Original widget does not have a cursor, but may be selectable
+
+                # FIXME: Using ow.selectable() is bad because the original
+                # widget may be selectable because it's a container widget with
+                # a key-grabbing widget that is scrolled out of view.
+                # ow.selectable() returns True anyway because it doesn't know
+                # how we trimmed our canvas.
+                #
+                # To fix this, we need to resolve ow.focus and somehow
+                # ask canv whether it contains bits of the focused widget.  I
+                # can't see a way to do that.
+                if ow.selectable():
+                    self._forward_keypress = True
+                else:
+                    self._forward_keypress = False
+
+        return canv
+
+    def keypress(self, size, key):
+        # Maybe offer key to original widget
+        if self._forward_keypress or self.force_forward_keypress:
+            ow = self._original_widget
+            ow_size = self._get_original_widget_size(size)
+
+            # Remember previous cursor position if possible
+            if hasattr(ow, 'get_cursor_coords'):
+                self._old_cursor_coords = ow.get_cursor_coords(ow_size)
+
+            key = ow.keypress(ow_size, key)
+            if key is None:
+                return None
+
+        # Handle up/down, page up/down, etc
+        command_map = self._command_map
+        if command_map[key] == urwid.CURSOR_UP:
+            self._scroll_action = SCROLL_LINE_UP
+        elif command_map[key] == urwid.CURSOR_DOWN:
+            self._scroll_action = SCROLL_LINE_DOWN
+
+        elif command_map[key] == urwid.CURSOR_PAGE_UP:
+            self._scroll_action = SCROLL_PAGE_UP
+        elif command_map[key] == urwid.CURSOR_PAGE_DOWN:
+            self._scroll_action = SCROLL_PAGE_DOWN
+
+        elif command_map[key] == urwid.CURSOR_MAX_LEFT:   # 'home'
+            self._scroll_action = SCROLL_TO_TOP
+        elif command_map[key] == urwid.CURSOR_MAX_RIGHT:  # 'end'
+            self._scroll_action = SCROLL_TO_END
+
+        else:
+            return key
+
+        self._invalidate()
+
+    def mouse_event(self, size, event, button, col, row, focus):
+        ow = self._original_widget
+        if hasattr(ow, 'mouse_event'):
+            ow_size = self._get_original_widget_size(size)
+            row += self._trim_top
+            return ow.mouse_event(ow_size, event, button, col, row, focus)
+        else:
+            return False
+
+    def _adjust_trim_top(self, canv, size):
+        """Adjust self._trim_top according to self._scroll_action"""
+        action = self._scroll_action
+        self._scroll_action = None
+
+        maxcol, maxrow = size
+        trim_top = self._trim_top
+        canv_rows = canv.rows()
+
+        if trim_top < 0:
+            # Negative trim_top values use bottom of canvas as reference
+            trim_top = canv_rows - maxrow + trim_top + 1
+
+        if canv_rows <= maxrow:
+            self._trim_top = 0  # Reset scroll position
+            return
+
+        def ensure_bounds(new_trim_top):
+            return max(0, min(canv_rows - maxrow, new_trim_top))
+
+        if action == SCROLL_LINE_UP:
+            self._trim_top = ensure_bounds(trim_top - 1)
+        elif action == SCROLL_LINE_DOWN:
+            self._trim_top = ensure_bounds(trim_top + 1)
+
+        elif action == SCROLL_PAGE_UP:
+            self._trim_top = ensure_bounds(trim_top - maxrow + 1)
+        elif action == SCROLL_PAGE_DOWN:
+            self._trim_top = ensure_bounds(trim_top + maxrow - 1)
+
+        elif action == SCROLL_TO_TOP:
+            self._trim_top = 0
+        elif action == SCROLL_TO_END:
+            self._trim_top = canv_rows - maxrow
+
+        else:
+            self._trim_top = ensure_bounds(trim_top)
+
+        # If the cursor was moved by the most recent keypress, adjust trim_top
+        # so that the new cursor position is within the displayed canvas part.
+        # But don't do this if the cursor is at the top/bottom edge so we can still scroll out
+        if self._old_cursor_coords is not None and self._old_cursor_coords != canv.cursor and canv.cursor != None:
+            self._old_cursor_coords = None
+            curscol, cursrow = canv.cursor
+            if cursrow < self._trim_top:
+                self._trim_top = cursrow
+            elif cursrow >= self._trim_top + maxrow:
+                self._trim_top = max(0, cursrow - maxrow + 1)
+
+    def _get_original_widget_size(self, size):
+        ow = self._original_widget
+        sizing = ow.sizing()
+        if FIXED in sizing:
+            return ()
+        elif FLOW in sizing:
+            return (size[0],)
+
+    def get_scrollpos(self, size=None, focus=False):
+        """Current scrolling position
+
+        Lower limit is 0, upper limit is the maximum number of rows with the
+        given maxcol minus maxrow.
+
+        NOTE: The returned value may be too low or too high if the position has
+        changed but the widget wasn't rendered yet.
+        """
+        return self._trim_top
+
+    def set_scrollpos(self, position):
+        """Set scrolling position
+
+        If `position` is positive it is interpreted as lines from the top.
+        If `position` is negative it is interpreted as lines from the bottom.
+
+        Values that are too high or too low values are automatically adjusted
+        during rendering.
+        """
+        self._trim_top = int(position)
+        self._invalidate()
+
+    def rows_max(self, size=None, focus=False):
+        """Return the number of rows for `size`
+
+        If `size` is not given, the currently rendered number of rows is returned.
+        """
+        if size is not None:
+            ow = self._original_widget
+            ow_size = self._get_original_widget_size(size)
+            sizing = ow.sizing()
+            if FIXED in sizing:
+                self._rows_max_cached = ow.pack(ow_size, focus)[1]
+            elif FLOW in sizing:
+                self._rows_max_cached = ow.rows(ow_size, focus)
+            else:
+                raise RuntimeError('Not a flow/box widget: %r' % self._original_widget)
+        return self._rows_max_cached
+
+
+class ScrollBar(urwid.WidgetDecoration):
+    def sizing(self):
+        return frozenset((BOX,))
+
+    def selectable(self):
+        return True
+
+    def __init__(self, widget, thumb_char=u'\u2588', trough_char=' ',
+                 side=SCROLLBAR_RIGHT, width=1):
+        """Box widget that adds a scrollbar to `widget`
+
+        `widget` must be a box widget with the following methods:
+          - `get_scrollpos` takes the arguments `size` and `focus` and returns
+            the index of the first visible row.
+          - `set_scrollpos` (optional; needed for mouse click support) takes the
+            index of the first visible row.
+          - `rows_max` takes `size` and `focus` and returns the total number of
+            rows `widget` can render.
+
+        `thumb_char` is the character used for the scrollbar handle.
+        `trough_char` is used for the space above and below the handle.
+        `side` must be 'left' or 'right'.
+        `width` specifies the number of columns the scrollbar uses.
+        """
+        if BOX not in widget.sizing():
+            raise ValueError('Not a box widget: %r' % widget)
+        self.__super.__init__(widget)
+        self._thumb_char = thumb_char
+        self._trough_char = trough_char
+        self.scrollbar_side = side
+        self.scrollbar_width = max(1, width)
+        self._original_widget_size = (0, 0)
+
+    def render(self, size, focus=False):
+        maxcol, maxrow = size
+
+        sb_width = self._scrollbar_width
+        ow_size = (max(0, maxcol - sb_width), maxrow)
+        sb_width = maxcol - ow_size[0]
+
+        ow = self._original_widget
+        ow_base = self.scrolling_base_widget
+        ow_rows_max = ow_base.rows_max(size, focus)
+        if ow_rows_max <= maxrow:
+            # Canvas fits without scrolling - no scrollbar needed
+            self._original_widget_size = size
+            return ow.render(size, focus)
+        ow_rows_max = ow_base.rows_max(ow_size, focus)
+
+        ow_canv = ow.render(ow_size, focus)
+        self._original_widget_size = ow_size
+
+        pos = ow_base.get_scrollpos(ow_size, focus)
+        posmax = ow_rows_max - maxrow
+
+        # Thumb shrinks/grows according to the ratio of
+        # <number of visible lines> / <number of total lines>
+        thumb_weight = min(1, maxrow / max(1, ow_rows_max))
+        thumb_height = max(1, round(thumb_weight * maxrow))
+
+        # Thumb may only touch top/bottom if the first/last row is visible
+        top_weight = float(pos) / max(1, posmax)
+        top_height = int((maxrow - thumb_height) * top_weight)
+        if top_height == 0 and top_weight > 0:
+            top_height = 1
+
+        # Bottom part is remaining space
+        bottom_height = maxrow - thumb_height - top_height
+        assert thumb_height + top_height + bottom_height == maxrow
+
+        # Create scrollbar canvas
+        # Creating SolidCanvases of correct height may result in "cviews do not
+        # fill gaps in shard_tail!" or "cviews overflow gaps in shard_tail!"
+        # exceptions. Stacking the same SolidCanvas is a workaround.
+        # https://github.com/urwid/urwid/issues/226#issuecomment-437176837
+        top = urwid.SolidCanvas(self._trough_char, sb_width, 1)
+        thumb = urwid.SolidCanvas(self._thumb_char, sb_width, 1)
+        bottom = urwid.SolidCanvas(self._trough_char, sb_width, 1)
+        sb_canv = urwid.CanvasCombine(
+            [(top, None, False)] * top_height +
+            [(thumb, None, False)] * thumb_height +
+            [(bottom, None, False)] * bottom_height,
+        )
+
+        combinelist = [(ow_canv, None, True, ow_size[0]),
+                       (sb_canv, None, False, sb_width)]
+        if self._scrollbar_side != SCROLLBAR_LEFT:
+            return urwid.CanvasJoin(combinelist)
+        else:
+            return urwid.CanvasJoin(reversed(combinelist))
+
+    @property
+    def scrollbar_width(self):
+        """Columns the scrollbar uses"""
+        return max(1, self._scrollbar_width)
+
+    @scrollbar_width.setter
+    def scrollbar_width(self, width):
+        self._scrollbar_width = max(1, int(width))
+        self._invalidate()
+
+    @property
+    def scrollbar_side(self):
+        """Where to display the scrollbar; must be 'left' or 'right'"""
+        return self._scrollbar_side
+
+    @scrollbar_side.setter
+    def scrollbar_side(self, side):
+        if side not in (SCROLLBAR_LEFT, SCROLLBAR_RIGHT):
+            raise ValueError('scrollbar_side must be "left" or "right", not %r' % side)
+        self._scrollbar_side = side
+        self._invalidate()
+
+    @property
+    def scrolling_base_widget(self):
+        """Nearest `original_widget` that is compatible with the scrolling API"""
+        def orig_iter(w):
+            while hasattr(w, 'original_widget'):
+                w = w.original_widget
+                yield w
+            yield w
+
+        def is_scrolling_widget(w):
+            return hasattr(w, 'get_scrollpos') and hasattr(w, 'rows_max')
+
+        for w in orig_iter(self):
+            if is_scrolling_widget(w):
+                return w
+        raise ValueError('Not compatible to be wrapped by ScrollBar: %r' % w)
+
+    def keypress(self, size, key):
+        return self._original_widget.keypress(self._original_widget_size, key)
+
+    def mouse_event(self, size, event, button, col, row, focus):
+        ow = self._original_widget
+        ow_size = self._original_widget_size
+        handled = False
+        if hasattr(ow, 'mouse_event'):
+            handled = ow.mouse_event(ow_size, event, button, col, row, focus)
+
+        if not handled and hasattr(ow, 'set_scrollpos'):
+            if button == 4:    # scroll wheel up
+                pos = ow.get_scrollpos(ow_size)
+                newpos = pos - 1
+                if newpos < 0:
+                    newpos = 0
+                ow.set_scrollpos(newpos)
+                return True
+            elif button == 5:  # scroll wheel down
+                pos = ow.get_scrollpos(ow_size)
+                ow.set_scrollpos(pos + 1)
+                return True
+
+        return False

nomadnet/vendor/configobj.py

@@ -19,7 +19,7 @@ import sys
 
 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE
 
-import six
+import RNS.vendor.six as six
 __version__ = '5.0.6'
 
 # imported lazily to avoid startup performance hit if it isn't used

nomadnet/vendor/quotes.py

@@ -1,4 +1,7 @@
 quotes = [
     ("I want the wisdom that wise men revere. I want more.", "Faithless"),
-    ("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"),
+    ("The landscape of the future is set, but how one will march across it is not determined", "Terence McKenna")
+    ("Freedom originates in the division of power, despotism in its concentration.", "John Acton")
 ]

setup.py

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