Updated guide

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

README.md

@@ -1,23 +1,33 @@
-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.
 
 ## Notable Features
  - Encrypted messaging over packet-radio, LoRa, WiFi or anything else [Reticulum](https://github.com/markqvist/Reticulum) supports.
  - Zero-configuration, minimal-infrastructure mesh communication
+ - Distributed and encrypted message store holds messages for offline users
+ - Connectable nodes that can host pages and files
+ - Node-side generated pages with PHP, Python, bash or others
+ - Built-in text-based browser for interacting with contents on nodes
+ - An easy to use and bandwidth efficient markup language for writing pages
+ - Page caching in browser
 
 ## Current Status
+The current version of the program should be considered a beta release. The program works well, but there will most probably be bugs and possibly sub-optimal performance in some scenarios. On the other hand, this is the ideal time to have an influence on the direction of the development of Nomad Network. To do so, join the discussion, report bugs and request features here on the GitHub project.
 
-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"
+### Feature roadmap
+ - Access control and authentication for nodes, pages and files
+ - Network-wide propagated bulletins and discussion threads
+ - Geospatial information sharing and collaborative maps
 
 ## Dependencies:
  - Python 3
@@ -35,7 +45,21 @@ pip3 install nomadnet
 nomadnet
 ```
 
-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.
+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.
 
 ## 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,6 +7,7 @@ from nomadnet.Directory import DirectoryEntry
 
 class Conversation:
     cached_conversations = {}
+    unread_conversations = {}
     created_callback = None
 
     aspect_filter = "lxmf.delivery"
@@ -26,7 +27,7 @@ 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)
 
     @staticmethod
     def query_for_peer(source_hash):
@@ -57,6 +58,16 @@ 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
+
+            Conversation.created_callback()
+
         return ingested_path
 
     @staticmethod
@@ -70,6 +81,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 +98,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,6 +132,7 @@ class Conversation:
         self.source_known       = False
         self.source_trusted     = False
         self.source_blocked     = False
+        self.unread             = False
 
         self.__changed_callback = None
 
@@ -143,6 +162,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 +180,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 +196,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)
@@ -177,7 +219,16 @@ class Conversation:
             return False
 
     def message_notification(self, message):
-        message_path = Conversation.ingest(message, self.app, originator=True)
+        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
@@ -203,6 +254,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,23 @@ import os
 import RNS
 import LXMF
 import time
+import nomadnet
 import RNS.vendor.umsgpack as msgpack
 
 class Directory:
-    ANNOUNCE_STREAM_MAXLENGTH = 256
+    ANNOUNCE_STREAM_MAXLENGTH = 64
+
+    aspect_filter = "nomadnetwork.node"
+    @staticmethod
+    def received_announce(destination_hash, announced_identity, app_data):
+        app = nomadnet.NomadNetworkApp.get_shared_instance()
+        destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
+
+        associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
+
+        app.directory.node_announce_received(destination_hash, app_data, associated_peer)
+        app.autoselect_propagation_node()
+
 
     def __init__(self, app):
         self.directory_entries = {}
@@ -13,12 +26,13 @@ class Directory:
         self.app = app
         self.load_from_disk()
 
+
     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))
 
             directory = {
                 "entry_list": packed_list,
@@ -46,19 +60,52 @@ class Directory:
                     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
+
+                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery)
 
                 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):
-        timestamp = time.time()
-        self.announce_stream.insert(0, (timestamp, source_hash, app_data))
-        while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
-            self.announce_stream.pop()
+    def lxmf_announce_received(self, source_hash, app_data):
+        if app_data != None:
+            timestamp = time.time()
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, False))
+            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                self.announce_stream.pop()
+            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:
+            timestamp = time.time()
+            self.announce_stream.insert(0, (timestamp, source_hash, app_data, True))
+            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                self.announce_stream.pop()
+
+            if self.trust_level(associated_peer) == DirectoryEntry.TRUSTED:
+                existing_entry = self.find(source_hash)
+                if not existing_entry:
+                    node_entry = DirectoryEntry(source_hash, display_name=app_data.decode("utf-8"), trust_level=DirectoryEntry.TRUSTED, hosts_node=True)
+                    self.remember(node_entry)
+            
+            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:
@@ -91,9 +138,22 @@ class Directory:
         else:
             return DirectoryEntry.UNKNOWN
 
+    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
+
     def forget(self, source_hash):
         if source_hash in self.directory_entries:
             self.directory_entries.pop(source_hash)
@@ -144,13 +204,21 @@ 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):
         if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
             self.source_hash  = source_hash
             self.display_name = display_name
             if display_name  == None:
                 display_name  = source_hash
 
+            if preferred_delivery == None:
+                self.preferred_delivery = DirectoryEntry.DIRECT
+            else:
+                self.preferred_delivery = preferred_delivery
+
             self.trust_level  = trust_level
             self.hosts_node   = hosts_node
         else:

nomadnet/Node.py

@@ -0,0 +1,152 @@
+import os
+import RNS
+import time
+import threading
+import subprocess
+import RNS.vendor.umsgpack as msgpack
+
+class Node:
+    JOB_INTERVAL = 5
+
+    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 = None
+        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()
+
+        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:
+            self.announce()
+
+
+    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:
+            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, remote_identity, requested_at):
+        RNS.log("Page request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_VERBOSE)
+        file_path = path.replace("/page", self.app.pagespath, 1)
+        try:
+            RNS.log("Serving page: "+file_path, RNS.LOG_VERBOSE)
+            if os.access(file_path, os.X_OK):
+                generated = subprocess.run([file_path], stdout=subprocess.PIPE)
+                return generated.stdout
+            else:
+                fh = open(file_path, "rb")
+                response_data = fh.read()
+                fh.close()
+                return response_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
+
+    # 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)
+        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:
+                self.announce()
+
+            time.sleep(self.job_interval)
+
+    def peer_connected(link):
+        RNS.log("Peer connected to "+str(self.destination), RNS.LOG_INFO)
+        link.set_link_closed_callback(self.peer_disconnected)
+
+
+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.
+'''

nomadnet/NomadNetworkApp.py

@@ -6,6 +6,8 @@ import RNS
 import LXMF
 import nomadnet
 
+from nomadnet.Directory import DirectoryEntry
+
 import RNS.vendor.umsgpack as msgpack
 
 from ._version import __version__
@@ -51,6 +53,17 @@ class NomadNetworkApp:
         self.directorypath     = self.configdir+"/storage/directory"
         self.peersettingspath  = self.configdir+"/storage/peersettings"
 
+        self.pagespath         = self.configdir+"/storage/pages"
+        self.filespath         = self.configdir+"/storage/files"
+        self.cachepath         = self.configdir+"/storage/cache"
+
+        self.downloads_path    = os.path.expanduser("~/Downloads")
+
+        self.firstrun          = False
+
+        self.peer_announce_at_start  = True
+        self.try_propagation_on_fail = True
+
         if not os.path.isdir(self.storagepath):
             os.makedirs(self.storagepath)
 
@@ -63,6 +76,15 @@ 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 os.path.isfile(self.configpath):
             try:
                 self.config = ConfigObj(self.configpath)
@@ -80,7 +102,7 @@ class NomadNetworkApp:
         else:
             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 +132,13 @@ 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
+
             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 +147,11 @@ 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
                 }
                 self.save_peer_settings()
                 RNS.log("Created new peer settings file")
@@ -130,9 +161,9 @@ class NomadNetworkApp:
                 nomadnet.panic()
 
 
-        atexit.register(self.exit_handler)
+        self.directory = nomadnet.Directory(self)
 
-        self.message_router = LXMF.LXMRouter()
+        self.message_router = LXMF.LXMRouter(identity = self.identity, storagepath = self.storagepath, autopeer = True)
         self.message_router.register_delivery_callback(self.lxmf_delivery)
 
         self.lxmf_destination = self.message_router.register_delivery_identity(self.identity, display_name=self.peer_settings["display_name"])
@@ -145,11 +176,24 @@ 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.enable_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
+
+        RNS.Transport.register_announce_handler(nomadnet.Conversation)
+        RNS.Transport.register_announce_handler(nomadnet.Directory)
+
+        self.autoselect_propagation_node()
+
+        if self.peer_announce_at_start:
+            self.announce_now()
+
+        atexit.register(self.exit_handler)
 
         nomadnet.ui.spawn(self.uimode)
 
@@ -164,11 +208,107 @@ 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 "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_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 True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHING:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHED:
+            return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_REQUEST_SENT:
+            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.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.directory.find(self.peer_settings["propagation_node"]):
+            selected_node = self.directory.find(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
+
+        if selected_node == None:
+            RNS.log("Could not autoselect a prepagation node! LXMF propagation will not be available until a trusted node announces on the network.", RNS.LOG_WARNING)
+        else:
+            node_identity = RNS.Identity.recall(selected_node.source_hash)
+            if node_identity != None:
+                propagation_hash = RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_identity)
+                RNS.log("Selecting "+selected_node.display_name+" "+RNS.prettyhexrep(propagation_hash)+" as default LXMF propagation node", RNS.LOG_INFO)
+                self.message_router.set_outbound_propagation_node(propagation_hash)
+            else:
+                RNS.log("Could not recall identity for autoselected LXMF propagation node "+RNS.prettyhexrep(selected_node.source_hash), RNS.LOG_WARNING)
+                RNS.log("LXMF propagation will not be available until a trusted node announces on the network.", RNS.LOG_WARNING)
+
+    def get_user_selected_propagation_node(self):
+        if "propagation_node" in self.peer_settings:
+            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))
@@ -190,6 +330,24 @@ class NomadNetworkApp:
     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 createDefaultConfig(self):
         self.config = ConfigObj(__default_nomadnet_config__)
         self.config.filename = self.configpath
@@ -227,6 +385,18 @@ 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 == "user_interface":
                     value = value.lower()
                     if value == "none":
@@ -241,6 +411,22 @@ class NomadNetworkApp:
                             else:
                                 self.config["textui"]["intro_time"] = self.config["textui"].as_int("intro_time")
 
+                            if not "editor" in self.config["textui"]:
+                                self.config["textui"]["editor"] = "editor"
+
+                            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 +465,40 @@ 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 "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 option == "enable_node":
-                    value = self.config["node"].as_bool(option)
-                    self.enable_node = value
               
     @staticmethod
     def get_shared_instance():
@@ -319,29 +533,88 @@ 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
 
 [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. By
+# default the operating systems "editor"
+# alias will be used.
+editor = editor
+
+# 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
 
 '''.splitlines()

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.1.2"

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,31 +17,111 @@ THEME_DARK     = 0x01
 THEME_LIGHT    = 0x02
 
 THEMES = {
-    THEME_DARK: [
-        # 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"),
-    ]
+    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"),
+            ("scrollbar",                   "light gray", "default",                "standout",                 "#444", "default"),
+            ("shortcutbar",                 "black", "light gray",                  "standout",                 "#111", "#bbb"),
+            ("body_text",                   "white", "default",                     "default",                  "#ddd", "default"),
+            ("error_text",                  "dark red", "default",                  "default",                  "dark red", "default"),
+            ("warning_text",                "yellow", "default",                    "default",                  "#ba4", "default"),
+            ("inactive_text",               "dark gray", "default",                 "default",                  "dark gray", "default"),
+            ("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"),
+            ("topic_list_normal",           "white", "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",                "standout",                 "#444", "default"),
+            ("shortcutbar",                 "black", "dark gray",                  "standout",                 "#111", "#bbb"),
+            ("body_text",                   "black", "default",                    "default",                  "#222", "default"),
+            ("error_text",                  "dark red", "default",                 "default",                  "dark red", "default"),
+            ("warning_text",                "yellow", "default",                   "default",                  "#ba4", "default"),
+            ("inactive_text",               "light gray", "default",               "default",                  "dark gray", "default"),
+            ("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"),
+            ("topic_list_normal",           "black", "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")
 }
 
 class TextUI:
@@ -49,23 +131,30 @@ class TextUI:
         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"]
+        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,16 +164,33 @@ class TextUI:
         else:
             initial_widget = self.main_display.widget
 
-        self.loop = urwid.MainLoop(initial_widget, screen=self.screen)
+        self.loop = urwid.MainLoop(initial_widget, screen=self.screen, handle_mouse=mouse_enabled)
 
         if intro_timeout > 0:
             self.loop.set_alarm_in(intro_timeout, self.display_main)
 
+        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)
         self.screen.reset_default_terminal_palette()
 

nomadnet/ui/textui/Browser.py

@@ -0,0 +1,885 @@
+import RNS
+import os
+import time
+import urwid
+import nomadnet
+import subprocess
+import threading
+from .MicronParser import markup_to_attrmaps
+from nomadnet.vendor.Scrollable import *
+
+class BrowserFrame(urwid.Frame):
+    def keypress(self, size, key):
+        if key == "ctrl w":
+            self.delegate.disconnect()
+        elif key == "ctrl d":
+            self.delegate.back()
+        elif key == "ctrl f":
+            self.delegate.forward()
+        elif key == "ctrl r":
+            self.delegate.reload()
+        elif key == "ctrl u":
+            self.delegate.url_dialog()
+        elif self.get_focus() == "body":
+            return super(BrowserFrame, self).keypress(size, key)
+            # if key == "up" and self.delegate.messagelist.top_is_visible:
+            #     nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+            # elif key == "down" and self.delegate.messagelist.bottom_is_visible:
+            #     self.set_focus("footer")
+            # else:
+            #     return super(ConversationFrame, self).keypress(size, key)
+        else:
+            return super(BrowserFrame, self).keypress(size, key)
+
+class Browser:
+    DEFAULT_PATH       = "/page/index.mu"
+    DEFAULT_TIMEOUT    = 10
+    DEFAULT_CACHE_TIME = 12*60*60
+
+    NO_PATH            = 0x00
+    PATH_REQUESTED     = 0x01
+    ESTABLISHING_LINK  = 0x02
+    LINK_TIMEOUT       = 0x03
+    LINK_ESTABLISHED   = 0x04
+    REQUESTING         = 0x05
+    REQUEST_SENT       = 0x06
+    REQUEST_FAILED     = 0x07
+    REQUEST_TIMEOUT    = 0x08
+    RECEIVING_RESPONSE = 0x09
+    DISCONECTED        = 0xFE
+    DONE               = 0xFF
+
+    def __init__(self, app, app_name, aspects, destination_hash = None, path = None, auth_identity = None, delegate = None):
+        self.app = app
+        self.g = self.app.ui.glyphs
+        self.delegate = delegate
+        self.app_name = app_name
+        self.aspects = aspects
+        self.destination_hash = destination_hash
+        self.path = path
+        self.timeout = Browser.DEFAULT_TIMEOUT
+        self.last_keypress = None
+
+        self.link = None
+        self.loopback = None
+        self.status = Browser.DISCONECTED
+        self.response_progress = 0
+        self.response_size = None
+        self.response_transfer_size = None
+        self.saved_file_name = None
+        self.page_data = None
+        self.displayed_page_data = None
+        self.auth_identity = auth_identity
+        self.display_widget = None
+        self.link_status_showing = False
+        self.link_target = None
+        self.frame = None
+        self.attr_maps = []
+        self.build_display()
+
+        self.history = []
+        self.history_ptr = 0
+        self.history_inc = False
+        self.history_dec = False
+        self.reloading = False
+        self.loaded_from_cache = False
+
+        if self.path == None:
+            self.path = Browser.DEFAULT_PATH
+
+        if self.destination_hash != None:
+            self.load_page()
+
+        self.clean_cache()
+
+    def current_url(self):
+        if self.destination_hash == None:
+            return ""
+        else:
+            if self.path == None:
+                path = ""
+            else:
+                path = self.path
+            return RNS.hexrep(self.destination_hash, delimit=False)+":"+path
+
+    def url_hash(self, url):
+        if url == None:
+            return None
+        else:
+            url = url.encode("utf-8")
+            return RNS.hexrep(RNS.Identity.full_hash(url), delimit=False)
+
+
+    def marked_link(self, link_target):
+        if self.status == Browser.DONE:
+            self.link_target = link_target
+            self.app.ui.loop.set_alarm_in(0.1, self.marked_link_job)
+
+    def marked_link_job(self, sender, event):
+        link_target = self.link_target
+
+        if link_target == None:
+            if self.link_status_showing:
+                self.browser_footer = self.make_status_widget()
+                self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
+                self.link_status_showing = False
+        else:
+            self.link_status_showing = True
+            self.browser_footer = urwid.AttrMap(urwid.Pile([urwid.Divider(self.g["divider1"]), urwid.Text("Link to: "+str(link_target))]), "browser_controls")
+            self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
+
+    def handle_link(self, link_target):
+        if self.status >= Browser.DISCONECTED:
+            RNS.log("Browser handling link to: "+str(link_target), RNS.LOG_DEBUG)
+            try:
+                self.retrieve_url(link_target)
+            except Exception as e:
+                self.browser_footer = urwid.Text("Could not open link: "+str(e))
+                self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
+        else:
+            RNS.log("Browser aleady hadling link, cannot handle link to: "+str(link_target), RNS.LOG_DEBUG)
+
+
+
+    def micron_released_focus(self):
+        if self.delegate != None:
+            self.delegate.focus_lists()
+
+    def build_display(self):
+        self.browser_header = urwid.Text("")
+        self.browser_footer = urwid.Text("")
+
+        self.browser_body = urwid.Filler(urwid.Text("Disconnected\n"+self.g["arrow_l"]+"  "+self.g["arrow_r"], align="center"), "middle")
+
+        self.frame = BrowserFrame(self.browser_body, header=self.browser_header, footer=self.browser_footer)
+        self.frame.delegate = self
+        self.linebox = urwid.LineBox(self.frame, title="Remote Node")
+        self.display_widget = urwid.AttrMap(self.linebox, "inactive_text")
+
+    def make_status_widget(self):
+        if self.response_progress > 0:
+            pb = ResponseProgressBar("progress_empty" , "progress_full", current=self.response_progress, done=1.0, satt=None)
+            widget = urwid.Pile([urwid.Divider(self.g["divider1"]), pb])
+        else:
+            widget = urwid.Pile([urwid.Divider(self.g["divider1"]), urwid.Text(self.status_text())])
+
+        return urwid.AttrMap(widget, "browser_controls")
+
+    def make_control_widget(self):
+        return urwid.AttrMap(urwid.Pile([urwid.Text(self.g["node"]+" "+self.current_url()), urwid.Divider(self.g["divider1"])]), "browser_controls")
+
+    def make_request_failed_widget(self):
+        def back_action(sender):
+            self.status = Browser.DONE
+            self.destination_hash = self.previous_destination_hash
+            self.path = self.previous_path
+            self.update_display()
+
+        columns = urwid.Columns([
+            ("weight", 0.5, urwid.Text(" ")),
+            (8, urwid.Button("Back", on_press=back_action)),
+            ("weight", 0.5, urwid.Text(" "))
+        ])
+
+        if len(self.attr_maps) > 0:
+            pile = urwid.Pile([
+                    urwid.Text("!\n\n"+self.status_text()+"\n", align="center"),
+                    columns
+            ])
+        else:
+            pile = urwid.Pile([
+                    urwid.Text("!\n\n"+self.status_text(), align="center")
+            ])
+
+        return urwid.Filler(pile, "middle")
+    
+    def update_display(self):
+        if self.status == Browser.DISCONECTED:
+            self.display_widget.set_attr_map({None: "inactive_text"})
+            self.browser_body = urwid.Filler(urwid.Text("Disconnected\n"+self.g["arrow_l"]+"  "+self.g["arrow_r"], align="center"), "middle")
+            self.browser_footer = urwid.Text("")
+            self.browser_header = urwid.Text("")
+            self.linebox.set_title("Remote Node")
+        else:
+            self.display_widget.set_attr_map({None: "body_text"})
+            self.browser_header = self.make_control_widget()
+            if self.destination_hash != None:
+                remote_display_string = self.app.directory.simplest_display_str(self.destination_hash)
+            else:
+                remote_display_string = ""
+
+            if self.loopback != None and remote_display_string == RNS.prettyhexrep(self.loopback):
+                remote_display_string = self.app.node.name
+
+            self.linebox.set_title(remote_display_string)
+
+            if self.status == Browser.DONE:
+                self.browser_footer = self.make_status_widget()
+                self.update_page_display()
+            
+            elif self.status == Browser.LINK_TIMEOUT:
+                self.browser_body = self.make_request_failed_widget()
+                self.browser_footer = urwid.Text("")
+            
+            elif self.status <= Browser.REQUEST_SENT:
+                if len(self.attr_maps) == 0:
+                    self.browser_body = urwid.Filler(urwid.Text("Retrieving\n["+self.current_url()+"]", align="center"), "middle")
+
+                self.browser_footer = self.make_status_widget()
+            
+            elif self.status == Browser.REQUEST_FAILED:
+                self.browser_body = self.make_request_failed_widget()
+                self.browser_footer = urwid.Text("")
+            
+            elif self.status == Browser.REQUEST_TIMEOUT:
+                self.browser_body = self.make_request_failed_widget()
+                self.browser_footer = urwid.Text("")
+            
+            else:
+                pass
+
+        self.frame.contents["body"] = (self.browser_body, self.frame.options())
+        self.frame.contents["header"] = (self.browser_header, self.frame.options())
+        self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
+
+    def update_page_display(self):
+        pile = urwid.Pile(self.attr_maps)
+        self.browser_body = urwid.AttrMap(ScrollBar(Scrollable(pile, force_forward_keypress=True), thumb_char="\u2503", trough_char=" "), "scrollbar")
+
+    def identify(self):
+        if self.link != None:
+            if self.link.status == RNS.Link.ACTIVE:
+                self.link.identify(self.auth_identity)
+
+
+    def disconnect(self):
+        if self.link != None:
+            self.link.teardown()
+        
+        self.attr_maps = []
+        self.status = Browser.DISCONECTED
+        self.response_progress = 0
+        self.response_size = None
+        self.response_transfer_size = None
+
+        self.history = []
+        self.history_ptr = 0
+        self.history_inc = False
+        self.history_dec = False
+
+        self.update_display()
+
+
+    def retrieve_url(self, url):
+        self.previous_destination_hash = self.destination_hash
+        self.previous_path = self.path
+
+        destination_hash = None
+        path = None
+
+        components = url.split(":")
+        if len(components) == 1:
+            if len(components[0]) == 20:
+                try:
+                    destination_hash = bytes.fromhex(components[0])
+                except Exception as e:
+                    raise ValueError("Malformed URL")
+                path = Browser.DEFAULT_PATH
+            else:
+                raise ValueError("Malformed URL")
+        elif len(components) == 2:
+            if len(components[0]) == 20:
+                try:
+                    destination_hash = bytes.fromhex(components[0])
+                except Exception as e:
+                    raise ValueError("Malformed URL")
+                path = components[1]
+                if len(path) == 0:
+                    path = Browser.DEFAULT_PATH
+            else:
+                if len(components[0]) == 0:
+                    if self.destination_hash != None:
+                        destination_hash = self.destination_hash
+                        path = components[1]
+                        if len(path) == 0:
+                            path = Browser.DEFAULT_PATH
+                    else:
+                        raise ValueError("Malformed URL")
+                else:
+                        raise ValueError("Malformed URL")
+        else:
+            raise ValueError("Malformed URL")
+
+        if destination_hash != None and path != None:
+            if path.startswith("/file/"):
+                if destination_hash != self.loopback:
+                    if destination_hash == self.destination_hash:
+                        self.download_file(destination_hash, path)
+                    else:
+                        RNS.log("Cannot request file download from a node that is not currently connected.", RNS.LOG_ERROR)
+                        RNS.log("The requested URL was: "+str(url), RNS.LOG_ERROR)
+                else:
+                    self.download_local_file(path)
+            else:
+                self.set_destination_hash(destination_hash)
+                self.set_path(path)
+                self.load_page()
+
+    def set_destination_hash(self, destination_hash):
+        if len(destination_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
+            self.destination_hash = destination_hash
+            return True
+        else:
+            return False
+
+
+    def set_path(self, path):
+        self.path = path
+
+
+    def set_timeout(self, timeout):
+        self.timeout = timeout
+
+    def download_local_file(self, path):
+        try:
+            file_path = self.app.filespath+path.replace("/file", "", 1)
+            if os.path.isfile(file_path):
+                file_name = os.path.basename(file_path)
+                file_destination = self.app.downloads_path+"/"+file_name
+
+                counter = 0
+                while os.path.isfile(file_destination):
+                    counter += 1
+                    file_destination = self.app.downloads_path+"/"+file_name+"."+str(counter)
+
+                fs = open(file_path, "rb")
+                fd = open(file_destination, "wb")
+                fd.write(fs.read())
+                fd.close()
+                fs.close()
+
+                self.saved_file_name = file_destination.replace(self.app.downloads_path+"/", "", 1)
+                
+                self.update_display()
+            else:
+                RNS.log("The requested local download file does not exist: "+str(file_path), RNS.LOG_ERROR)
+
+            self.status = Browser.DONE
+            self.response_progress = 0
+            
+        except Exception as e:
+            RNS.log("An error occurred while handling file response. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+    def download_file(self, destination_hash, path):
+        if self.link != None and self.link.destination.hash == self.destination_hash:
+            # Send the request
+            self.status = Browser.REQUESTING
+            self.response_progress = 0
+            self.response_size = None
+            self.response_transfer_size = None
+            self.saved_file_name = None
+
+            self.update_display()
+            receipt = self.link.request(
+                path,
+                data = None,
+                response_callback = self.file_received,
+                failed_callback = self.request_failed,
+                progress_callback = self.response_progressed
+            )
+
+            if receipt:
+                self.last_request_receipt = receipt
+                self.last_request_id = receipt.request_id
+                self.status = Browser.REQUEST_SENT
+                self.update_display()
+            else:
+                self.link.teardown()
+
+    def write_history(self):
+        entry = [self.destination_hash, self.path]
+        self.history.insert(self.history_ptr, entry)
+        self.history_ptr += 1
+
+        if len(self.history) > self.history_ptr:
+            self.history = self.history[:self.history_ptr]
+
+    def back(self):
+        target_ptr = self.history_ptr-1
+        if not self.history_inc and not self.history_dec:
+            if target_ptr > 0:
+                self.history_dec = True
+                entry = self.history[target_ptr-1]
+                url = RNS.hexrep(entry[0], delimit=False)+":"+entry[1]
+                self.history_ptr = target_ptr
+                self.retrieve_url(url)
+
+    def forward(self):
+        target_ptr = self.history_ptr+1
+        if not self.history_inc and not self.history_dec:
+            if target_ptr <= len(self.history):
+                self.history_dec = True
+                entry = self.history[target_ptr-1]
+                url = RNS.hexrep(entry[0], delimit=False)+":"+entry[1]
+                self.history_ptr = target_ptr
+                self.retrieve_url(url)
+
+    def reload(self):
+        if not self.reloading and self.status == Browser.DONE:
+            self.reloading = True
+            self.uncache_page(self.current_url())
+            self.load_page()
+
+    def close_dialogs(self):
+        options = self.delegate.columns.options("weight", self.delegate.right_area_width)
+        self.delegate.columns.contents[1] = (self.display_widget, options)
+
+    def url_dialog(self):
+        e_url = UrlEdit(caption="URL : ", edit_text=self.current_url())
+
+        def dismiss_dialog(sender):
+            self.close_dialogs()
+
+        def confirmed(sender):
+            self.retrieve_url(e_url.get_edit_text())
+            self.close_dialogs()
+
+        dialog = UrlDialogLineBox(
+            urwid.Pile([
+                e_url,
+                urwid.Columns([("weight", 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Go", on_press=confirmed))])
+            ]), title="Enter URL"
+        )
+        e_url.confirmed = confirmed
+        dialog.confirmed = confirmed
+        dialog.delegate = self
+        bottom = self.display_widget
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 65), valign="middle", height="pack", left=2, right=2)
+
+        options = self.delegate.columns.options("weight", self.delegate.right_area_width)
+        self.delegate.columns.contents[1] = (overlay, options)
+        self.delegate.columns.focus_position = 1
+
+
+    def load_page(self):
+        cached = self.get_cached(self.current_url())
+        if cached:
+            self.status = Browser.DONE
+            self.page_data = cached
+            self.markup = self.page_data.decode("utf-8")
+            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
+            
+            self.response_progress = 0
+            self.response_size = None
+            self.response_transfer_size = None
+            self.saved_file_name = None
+            self.loaded_from_cache = True
+
+            self.update_display()
+
+            if not self.history_inc and not self.history_dec and not self.reloading:
+                self.write_history()
+            else:
+                self.history_dec = False
+                self.history_inc = False
+                self.reloading = False
+
+        else:
+            if self.destination_hash != self.loopback:
+                load_thread = threading.Thread(target=self.__load)
+                load_thread.setDaemon(True)
+                load_thread.start()
+            else:
+                RNS.log("Browser handling local page: "+str(self.path), RNS.LOG_DEBUG)
+                page_path = self.app.pagespath+self.path.replace("/page", "", 1)
+
+                page_data = b"The requested local page did not exist in the file system"
+                if os.path.isfile(page_path):
+                    if os.access(page_path, os.X_OK):
+                        generated = subprocess.run([page_path], stdout=subprocess.PIPE)
+                        page_data = generated.stdout
+                    else:
+                        file = open(page_path, "rb")
+                        page_data = file.read()
+                        file.close()
+
+                self.status = Browser.DONE
+                self.page_data = page_data
+                self.markup = self.page_data.decode("utf-8")
+                self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
+                
+                self.response_progress = 0
+                self.response_size = None
+                self.response_transfer_size = None
+                self.saved_file_name = None
+                self.loaded_from_cache = False
+
+                self.update_display()
+
+                if not self.history_inc and not self.history_dec and not self.reloading:
+                    self.write_history()
+                else:
+                    self.history_dec = False
+                    self.history_inc = False
+                    self.reloading = False
+
+
+    def __load(self):
+        # If an established link exists, but it doesn't match the target
+        # destination, we close and clear it.
+        if self.link != None and self.link.destination.hash != self.destination_hash:
+            self.link.teardown()
+            self.link = None
+
+        # If no link to the destination exists, we create one.
+        if self.link == None:
+            if not RNS.Transport.has_path(self.destination_hash):
+                self.status = Browser.NO_PATH
+                self.update_display()
+
+                RNS.Transport.request_path(self.destination_hash)
+                self.status = Browser.PATH_REQUESTED
+                self.update_display()
+
+                pr_time = time.time()
+                while not RNS.Transport.has_path(self.destination_hash):
+                    now = time.time()
+                    if now > pr_time+self.timeout:
+                        self.request_timeout()
+                        return
+
+                    time.sleep(0.25)
+
+            self.status = Browser.ESTABLISHING_LINK
+            self.update_display()
+
+            identity = RNS.Identity.recall(self.destination_hash)
+            destination = RNS.Destination(
+                identity,
+                RNS.Destination.OUT,
+                RNS.Destination.SINGLE,
+                self.app_name,
+                self.aspects
+            )
+
+            self.link = RNS.Link(destination, established_callback = self.link_established, closed_callback = self.link_closed)
+
+            while self.status == Browser.ESTABLISHING_LINK:
+                time.sleep(0.1)
+
+            if self.status != Browser.LINK_ESTABLISHED:
+                return
+
+            self.update_display()
+
+        # Send the request
+        self.status = Browser.REQUESTING
+        self.response_progress = 0
+        self.response_size = None
+        self.response_transfer_size = None
+        self.saved_file_name = None
+
+
+        self.update_display()
+        receipt = self.link.request(
+            self.path,
+            data = None,
+            response_callback = self.response_received,
+            failed_callback = self.request_failed,
+            progress_callback = self.response_progressed
+        )
+
+        if receipt:
+            self.last_request_receipt = receipt
+            self.last_request_id = receipt.request_id
+            self.status = Browser.REQUEST_SENT
+            self.update_display()
+        else:
+            self.link.teardown()
+
+
+
+    def link_established(self, link):
+        self.status = Browser.LINK_ESTABLISHED
+
+
+    def link_closed(self, link):
+        if self.status == Browser.DISCONECTED or self.status == Browser.DONE:
+            self.link = None
+        elif self.status == Browser.ESTABLISHING_LINK:
+            self.link_establishment_timeout()
+        else:
+            self.link = None
+            self.status = Browser.REQUEST_FAILED
+        self.update_display()
+
+    def link_establishment_timeout(self):
+        self.status = Browser.LINK_TIMEOUT
+        self.response_progress = 0
+        self.response_size = None
+        self.response_transfer_size = None
+        self.link = None
+
+        self.update_display()
+
+
+    def response_received(self, request_receipt):
+        try:
+            self.status = Browser.DONE
+            self.page_data = request_receipt.response
+            self.markup = self.page_data.decode("utf-8")
+            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
+            self.response_progress = 0
+            self.loaded_from_cache = False
+
+            # Simple header handling. Should be expanded when more
+            # header tags are added.
+            cache_time = Browser.DEFAULT_CACHE_TIME
+            if self.markup[:4] == "#!c=":
+                endpos = self.markup.find("\n")
+                if endpos == -1:
+                    endpos = len(self.markup)
+                cache_time = int(self.markup[4:endpos])
+
+            self.update_display()
+
+            if not self.history_inc and not self.history_dec and not self.reloading:
+                self.write_history()
+            else:
+                self.history_dec = False
+                self.history_inc = False
+                self.reloading = False
+
+            if cache_time == 0:
+                RNS.log("Received page "+str(self.current_url())+", not caching due to header.", RNS.LOG_DEBUG)
+            else:
+                RNS.log("Received page "+str(self.current_url())+", caching for %.3f hours." % (cache_time/60/60), RNS.LOG_DEBUG)    
+                self.cache_page(cache_time)
+
+        except Exception as e:
+            RNS.log("An error occurred while handling response. The contained exception was: "+str(e))
+
+    def uncache_page(self, url):
+        url_hash = self.url_hash(url)
+        files = os.listdir(self.app.cachepath)
+        for file in files:
+            if file.startswith(url_hash):
+                cachefile = self.app.cachepath+"/"+file
+                os.unlink(cachefile)
+                RNS.log("Removed "+str(cachefile)+" from cache.", RNS.LOG_DEBUG)
+
+    def get_cached(self, url):
+        url_hash = self.url_hash(url)
+        files = os.listdir(self.app.cachepath)
+        for file in files:
+            cachepath = self.app.cachepath+"/"+file
+            try:
+                components = file.split("_")
+                if len(components) == 2 and len(components[0]) == 64 and len(components[1]) > 0:
+                    expires = float(components[1])
+
+                    if time.time() > expires:
+                        RNS.log("Removing stale cache entry "+str(file), RNS.LOG_DEBUG)
+                        os.unlink(cachepath)
+                    else:
+                        if file.startswith(url_hash):
+                            RNS.log("Found "+str(file)+" in cache.", RNS.LOG_DEBUG)
+                            RNS.log("Returning cached page", RNS.LOG_DEBUG)
+                            file = open(cachepath, "rb")
+                            data = file.read()
+                            file.close()
+                            return data
+
+            except Exception as e:
+                RNS.log("Error while parsing cache entry "+str(cachepath)+", removing it.", RNS.LOG_ERROR)
+                RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+                try:
+                    os.unlink(cachepath)
+                except Exception as e:
+                    RNS.log("Additionally, an exception occurred while unlinking the entry: "+str(e), RNS.LOG_ERROR)
+                    RNS.log("You will probably need to remove this entry manually by deleting the file: "+str(cachepath), RNS.LOG_ERROR)
+
+                
+        return None
+
+    def clean_cache(self):
+        files = os.listdir(self.app.cachepath)
+        for file in files:
+            cachepath = self.app.cachepath+"/"+file
+            try:
+                components = file.split("_")
+                if len(components) == 2 and len(components[0]) == 64 and len(components[1]) > 0:
+                    expires = float(components[1])
+
+                    if time.time() > expires:
+                        RNS.log("Removing stale cache entry "+str(file), RNS.LOG_DEBUG)
+                        os.unlink(cachepath)
+
+            except Exception as e:
+                pass
+
+
+    def cache_page(self, cache_time):
+        url_hash = self.url_hash(self.current_url())
+        if url_hash == None:
+            RNS.log("Could not cache page "+str(self.current_url()), RNS.LOG_ERROR)
+        else:
+            try:
+                self.uncache_page(self.current_url())
+                cache_expires = time.time()+cache_time
+                filename = url_hash+"_"+str(cache_expires)
+                cachefile = self.app.cachepath+"/"+filename
+                file = open(cachefile, "wb")
+                file.write(self.page_data)
+                file.close()
+                RNS.log("Cached page "+str(self.current_url())+" to "+str(cachefile), RNS.LOG_DEBUG)
+
+            except Exception as e:
+                RNS.log("Could not write cache file for page "+str(self.current_url()), RNS.LOG_ERROR)
+                RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+
+    def file_received(self, request_receipt):
+        try:
+            file_name = request_receipt.response[0]
+            file_data = request_receipt.response[1]
+            file_destination = self.app.downloads_path+"/"+file_name
+            
+            counter = 0
+            while os.path.isfile(file_destination):
+                counter += 1
+                file_destination = self.app.downloads_path+"/"+file_name+"."+str(counter)
+
+            fh = open(file_destination, "wb")
+            fh.write(file_data)
+            fh.close()
+
+            self.saved_file_name = file_destination.replace(self.app.downloads_path+"/", "", 1)
+            self.status = Browser.DONE
+            self.response_progress = 0
+
+            self.update_display()
+        except Exception as e:
+            RNS.log("An error occurred while handling file response. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+    
+    def request_failed(self, request_receipt=None):
+        if request_receipt != None:
+            if request_receipt.request_id == self.last_request_id:
+                self.status = Browser.REQUEST_FAILED
+                self.response_progress = 0
+                self.response_size = None
+                self.response_transfer_size = None
+
+                self.update_display()
+        else:
+            self.status = Browser.REQUEST_FAILED
+            self.response_progress = 0
+            self.response_size = None
+            self.response_transfer_size = None
+
+            self.update_display()
+
+
+    def request_timeout(self, request_receipt=None):
+        self.status = Browser.REQUEST_TIMEOUT
+        self.response_progress = 0
+        self.response_size = None
+        self.response_transfer_size = None
+
+        self.update_display()
+
+
+    def response_progressed(self, request_receipt):
+        self.response_progress      = request_receipt.progress
+        self.response_time          = request_receipt.get_response_time()
+        self.response_size          = request_receipt.response_size
+        self.response_transfer_size = request_receipt.response_transfer_size
+        self.update_display()
+
+
+    def status_text(self):
+        if self.status == Browser.DONE and self.response_transfer_size != None:
+            if self.response_time != None:
+                response_time_str = "{:.2f}".format(self.response_time)
+            else:
+                response_time_str = "None"
+
+            stats_string = "  "+self.g["page"]+size_str(self.response_size)
+            stats_string += "   "+self.g["arrow_d"]+size_str(self.response_transfer_size)+" in "+response_time_str
+            stats_string += "s   "+self.g["speed"]+size_str(self.response_transfer_size/self.response_time, suffix="b")+"/s"
+        elif self.loaded_from_cache:
+            stats_string = " (cached)"
+        else:
+            stats_string = ""
+
+        if self.status == Browser.NO_PATH:
+            return "No path to destination known"
+        elif self.status == Browser.PATH_REQUESTED:
+            return "Path requested, waiting for path..."
+        elif self.status == Browser.ESTABLISHING_LINK:
+            return "Establishing link..."
+        elif self.status == Browser.LINK_TIMEOUT:
+            return "Link establishment timed out"
+        elif self.status == Browser.LINK_ESTABLISHED:
+            return "Link established"
+        elif self.status == Browser.REQUESTING:
+            return "Sending request..."
+        elif self.status == Browser.REQUEST_SENT:
+            return "Request sent, awaiting response..."
+        elif self.status == Browser.REQUEST_FAILED:
+            return "Request failed"
+        elif self.status == Browser.REQUEST_TIMEOUT:
+            return "Request timed out"
+        elif self.status == Browser.RECEIVING_RESPONSE:
+            return "Receiving response..."
+        elif self.status == Browser.DONE:
+            if self.saved_file_name == None:
+                return "Done"+stats_string
+            else:
+                return "Saved "+str(self.saved_file_name)+stats_string
+        elif self.status == Browser.DISCONECTED:
+            return "Disconnected"
+        else:
+            return "Browser Status Unknown"
+
+
+class ResponseProgressBar(urwid.ProgressBar):
+    def get_text(self):
+        return "Receiving response "+super().get_text()
+
+# A convenience function for printing a human-
+# readable file size
+def size_str(num, suffix='B'):
+    units = ['','K','M','G','T','P','E','Z']
+    last_unit = 'Y'
+
+    if suffix == 'b':
+        num *= 8
+        units = ['','K','M','G','T','P','E','Z']
+        last_unit = 'Y'
+
+    for unit in units:
+        if abs(num) < 1000.0:
+            if unit == "":
+                return "%.0f%s%s" % (num, unit, suffix)
+            else:
+                return "%.2f%s%s" % (num, unit, suffix)
+        num /= 1000.0
+
+    return "%.2f%s%s" % (num, last_unit, suffix)
+
+class UrlDialogLineBox(urwid.LineBox):
+    def keypress(self, size, key):
+        if key == "esc":
+            self.delegate.close_dialogs()
+        else:
+            return super(UrlDialogLineBox, self).keypress(size, key)
+
+class UrlEdit(urwid.Edit):
+    def keypress(self, size, key):
+        if key == "enter":
+            self.confirmed(self)
+        else:
+            return super(UrlEdit, self).keypress(size, key)

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("[Enter] Open  [C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New"), "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-k] Clear Editor  [C-w] Close  [C-t] Editor Type  [C-p] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
 
 class ConversationsArea(urwid.LineBox):
     def keypress(self, size, key):
@@ -29,6 +30,8 @@ class ConversationsArea(urwid.LineBox):
             self.delegate.delete_selected_conversation()
         elif key == "ctrl n":
             self.delegate.new_conversation()
+        elif key == "ctrl r":
+            self.delegate.sync_conversations()
         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()):
@@ -50,6 +53,7 @@ class ConversationsDisplay():
     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):
@@ -86,7 +90,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,
@@ -127,6 +130,7 @@ class ConversationsDisplay():
         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
         display_name = self.ilb.get_selected_item().display_name
@@ -139,9 +143,12 @@ class ConversationsDisplay():
 
         selected_id_widget = t_id
 
-        untrusted_selected = False
-        unknown_selected   = True
-        trusted_selected   = False
+        untrusted_selected  = False
+        unknown_selected    = True
+        trusted_selected    = False
+
+        direct_selected     = True
+        propagated_selected = False
 
         try:
             if self.app.directory.find(bytes.fromhex(source_hash_text)):
@@ -158,6 +165,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 +178,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 +196,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 +215,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 +226,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 communicate.\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))])
         ])
@@ -303,6 +326,110 @@ class ConversationsDisplay():
             conversation = ConversationsDisplay.cached_conversation_widgets[source_hash]
             self.close_conversation(conversation)
 
+    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()
+
+        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)
+
+            dialog = DialogLineBox(
+                urwid.Pile([
+                    urwid.Text(""+g["node"]+" "+str(pn_entry.display_name), 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", align="center"),
+                    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)
+        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
 
@@ -310,18 +437,55 @@ class ConversationsDisplay():
         ilb_position = self.ilb.get_selected_position()
         self.update_listbox()
         options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
-        self.columns_widget.contents[0] = (self.listbox, options)
+        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)
         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 +523,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 +536,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)
@@ -467,6 +641,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 +654,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 +673,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 +712,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 +746,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(g["info"]+" You cannot currently communicate with this peer, since it's identity keys are not known", align="center")), "msg_header_caution")
                 self.frame.contents["footer"] = (warning, None)
 
     def toggle_focus_area(self):
@@ -574,6 +777,11 @@ class ConversationWidget(urwid.WidgetWrap):
             self.conversation_changed(None)
         elif key == "ctrl t":
             self.toggle_editor()
+        elif key == "ctrl x":
+            self.clear_history_dialog()
+        elif key == "ctrl o":
+            self.sort_by_timestamp ^= True
+            self.conversation_changed(None)
         else:
             return super(ConversationWidget, self).keypress(size, key)
 
@@ -594,7 +802,10 @@ class ConversationWidget(urwid.WidgetWrap):
                 message_widget = LXMessageWidget(message)
                 self.message_widgets.append(message_widget)
         
-        self.message_widgets.sort(key=lambda m: m.timestamp, reverse=False)
+        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)
@@ -626,34 +837,42 @@ 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.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 +886,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/Guide.py

@@ -0,0 +1,702 @@
+import RNS
+import urwid
+import nomadnet
+from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox, MODIFIER_KEY
+from .MicronParser import markup_to_attrmaps
+from nomadnet.vendor.Scrollable import *
+
+class GuideDisplayShortcuts():
+    def __init__(self, app):
+        self.app = app
+        g = app.ui.glyphs
+
+        self.widget = urwid.AttrMap(urwid.Padding(urwid.Text(""), align="left"), "shortcutbar")
+
+class ListEntry(urwid.Text):
+    _selectable = True
+
+    signals = ["click"]
+
+    def keypress(self, size, key):
+        """
+        Send 'click' signal on 'activate' command.
+        """
+        if self._command_map[key] != urwid.ACTIVATE:
+            return key
+
+        self._emit('click')
+
+    def mouse_event(self, size, event, button, x, y, focus):
+        """
+        Send 'click' signal on button 1 press.
+        """
+        if button != 1 or not urwid.util.is_mouse_press(event):
+            return False
+
+        self._emit('click')
+        return True
+
+class SelectText(urwid.Text):
+    _selectable = True
+
+    signals = ["click"]
+
+    def keypress(self, size, key):
+        """
+        Send 'click' signal on 'activate' command.
+        """
+        if self._command_map[key] != urwid.ACTIVATE:
+            return key
+
+        self._emit('click')
+
+    def mouse_event(self, size, event, button, x, y, focus):
+        """
+        Send 'click' signal on button 1 press.
+        """
+        if button != 1 or not urwid.util.is_mouse_press(event):
+            return False
+
+        self._emit('click')
+        return True
+
+class GuideEntry(urwid.WidgetWrap):
+    def __init__(self, app, parent, reader, topic_name):
+        self.app = app
+        self.parent = parent
+        self.reader = reader
+        self.last_keypress = None
+        self.topic_name = topic_name
+        g = self.app.ui.glyphs
+
+        widget = ListEntry(topic_name)
+        urwid.connect_signal(widget, "click", self.display_topic, self.topic_name)
+
+        style = "topic_list_normal"
+        focus_style = "list_focus"
+        self.display_widget = urwid.AttrMap(widget, style, focus_style)
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def display_topic(self, event, topic):
+        markup = TOPICS[topic]
+        attrmaps = markup_to_attrmaps(markup, url_delegate=None)
+
+        topic_position = None
+        index = 0
+        for topic in self.parent.topic_list:
+            widget = topic._original_widget
+            if widget.topic_name == self.topic_name:
+                topic_position = index
+            index += 1
+
+        if topic_position != None:
+            self.parent.ilb.select_item(topic_position)
+
+        self.reader.set_content_widgets(attrmaps)
+        self.reader.focus_reader()
+
+
+    def micron_released_focus(self):
+        self.reader.focus_topics()
+
+class TopicList(urwid.WidgetWrap):
+    def __init__(self, app, guide_display):
+        self.app = app
+        g = self.app.ui.glyphs
+
+        self.first_run_entry = GuideEntry(self.app, self, guide_display, "First Run")
+
+        self.topic_list = [
+            GuideEntry(self.app, self, guide_display, "Introduction"),
+            GuideEntry(self.app, self, guide_display, "Concepts & Terminology"),
+            GuideEntry(self.app, self, guide_display, "Hosting a Node"),
+            GuideEntry(self.app, self, guide_display, "Markup"),
+            self.first_run_entry,
+            GuideEntry(self.app, self, guide_display, "Network Configuration"),
+            GuideEntry(self.app, self, guide_display, "Display Test"),
+            GuideEntry(self.app, self, guide_display, "Credits & Licenses"),
+        ]
+
+        self.ilb = IndicativeListBox(
+            self.topic_list,
+            initialization_is_selection_change=False,
+            highlight_offFocus="list_off_focus"
+        )
+
+        urwid.WidgetWrap.__init__(self, urwid.LineBox(self.ilb, title="Topics"))
+
+
+    def keypress(self, size, key):
+        if key == "up" and (self.ilb.first_item_is_selected()):
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+            
+        return super(TopicList, self).keypress(size, key)
+
+class GuideDisplay():
+    list_width = 0.33
+
+    def __init__(self, app):
+        self.app = app
+        g = self.app.ui.glyphs
+
+        topic_text = urwid.Text("\n  No topic selected", align="left")
+
+        self.left_area  = TopicList(self.app, self)
+        self.right_area = urwid.LineBox(urwid.Filler(topic_text, "top"))
+
+
+        self.columns = urwid.Columns(
+            [
+                ("weight", GuideDisplay.list_width, self.left_area),
+                ("weight", 1-GuideDisplay.list_width, self.right_area)
+            ],
+            dividechars=0, focus_column=0
+        )
+
+        self.shortcuts_display = GuideDisplayShortcuts(self.app)
+        self.widget = self.columns
+
+        if self.app.firstrun:
+            entry = self.left_area.first_run_entry
+            entry.display_topic(entry.display_topic, entry.topic_name)
+
+    def set_content_widgets(self, new_content):
+        options = self.columns.options(width_type="weight", width_amount=1-GuideDisplay.list_width)
+        pile = urwid.Pile(new_content)
+        #content = urwid.LineBox(urwid.Filler(pile, "top"))
+        content = urwid.LineBox(urwid.AttrMap(ScrollBar(Scrollable(pile), thumb_char="\u2503", trough_char=" "), "scrollbar"))
+
+        self.columns.contents[1] = (content, options)
+
+    def shortcuts(self):
+        return self.shortcuts_display
+
+    def focus_topics(self):
+        self.columns.focus_position = 0
+
+    def focus_reader(self):
+        self.columns.focus_position = 1
+
+
+TOPIC_INTRODUCTION = '''>Nomad Network
+
+`c`*Communicate Freely.`*
+`a
+
+The intention with this program is to provide a tool to that allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them.
+
+Nomad Network is build on LXMF and Reticulum, which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to fiber.
+
+Nomad Network does not need any connections to the public internet to work. In fact, it doesn't even need an IP or Ethernet network. You can use it entirely over packet radio, LoRa or even serial lines. But if you wish, you can bridge islanded Reticulum networks over the Internet or private ethernet networks, or you can build networks running completely over the Internet. The choice is yours.
+
+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 best time to have an influence on the direction of the development of Nomad Network. To do so, join the discussion on the Nomad Network project on GitHub.
+
+'''
+
+TOPIC_CONCEPTS = '''>Concepts and Terminology
+
+The following section will briefly introduce various concepts and terms used in the program.
+
+>>Peer
+
+A `*peer`* refers to another Nomad Network client, which will generally be operated by another person. But since Nomad Network is a general LXMF client, it could also be any other LXMF client, program, automated system or machine that can communicate over LXMF.
+
+All peers (and nodes) are identified by their `*address`* (which is, technically speaking, a Reticulum destination hash). An address consist of 20 hexadecimal characters, and looks like this:
+
+`c<b8ea8f92541c9a275f0e>
+`l
+
+Anyone can choose whatever display name they want, but addresses are always unique, and generated from the unique cryptographic keys of the peer. This is an important point to understand. Since there is not anyone controlling naming or address spaces in Nomad Network, you can easily come across another user with the same display name as you.
+
+Your addresses will always be unique though, and you must always verify that the address you are communicating with is matching the address of the peer you expect to be in the other end.
+
+To make this easier, Nomad Network allows you to mark peers and nodes as either `*trusted`*, `*unknown`* or `*untrusted`*. In this way, you can mark the peers and nodes that you know to be legitimate, and easily spot peers with similar names as unrelated.
+
+>>Announces
+
+An `*announce`* can be sent by any peer or node on the network, which will notify other peers of its existence, and contains the cryptographic keys that allows other peers to communicate with it.
+
+In the `![ Network ]`! section of the program, you can monitor announces on the network, initiate conversations with announced peers, and announce your own peer on the network. You can also connect to nodes on the network and browse information shared by them.
+
+>>Conversations
+
+Nomad Network uses the term `*conversation`* to signify both direct peer-to-peer messaging threads, and also discussion threads with an arbitrary number of participants that might change over time.
+
+Both things like discussion forums and chat threads can be encapsulated as conversations in Nomad Network. The user interface will indicate the different characteristics a conversation can take, and also what form of transport encryption was used for messages within.
+
+In the `![ Conversations ]`! part of the program you can view and interact with all currently active conversations. You can also edit nickname and trust settings for peers belonging to these conversations here. To edit settings for a peer, select it in the conversation list, and press `!Ctrl-E`!.
+
+By default, Nomad Network will attempt to deliver messages to a peer directly. This happens by first establishing an encrypted link directly to the peer, and then delivering the message over it.
+
+If the desired peer is not available because it has disconnected from the network, this method will obviously fail. In this case, Nomad Network will attempt to deliver the message to a node, which will store and forward it over the network, for later retrieval by the destination peer. The message is encrypted with an ephemeral key before being transmitted to the network, and is only readable by the intended recipient.
+
+For propagated delivery to work, one or more nodes must be available on the network. If one or more trusted nodes are available, Nomad Network will automatically select the most suitable node to send the message via, but you can also manually specify what node to use.
+
+To select a node manually, go to the `![ Network ]`! part of the program, choose the desired node in the `*Known Nodes`* list, and select the `!< Info >`! button. In the `!Node Info`! dialog, you can specify the selected node as the default propagation node.
+
+>>Node
+
+A Nomad Network `*node`* is an instance of the Nomad Network program that has been configured to host information for other peers and help propagate messages and information on the network.
+
+Nodes can host pages (similar to webpages) written in a markup-language called `*micron`*, as well as make files and other resources available for download for peers on the network. Nodes also form a distributed message store for offline users, and allows messages to be exchanged between peers that are not online at the same time.
+
+If no nodes exist on a network, all peers will still be able to communicate directly peer-to-peer, but both endpoints of a conversation will need to be available at the same time to converse. When nodes exist on the network, messages will be held and syncronised between nodes for deferred delivery if the destination peer is unavailable. Nodes will automatically discover and peer with each other, and handle synchronisation of message stores.
+
+To learn how to host your own node, read the `*Hosting a Node`* section of this guide.
+
+'''
+
+TOPIC_HOSTING = '''>Hosting a Node
+
+To host a node on the network, you must enable it in the configuration file, by setting `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is lauched, and other peers on the network will be able to connect and interact with content on your node.
+
+By default, no content is defined, apart from a short placeholder home page. To learn how to add your own content, read on.
+
+>>Pages
+
+Nomad Network nodes can host pages similar to web pages, that other peers can read and interact with. Pages are written in a compact markup language called `*micron`*. To learn how to write formatted pages with micron, see the `*Markup`* section of this guide (which is, itself, written in micron). Pages can be linked arbitrarily with hyperlinks, that can also link to pages (or other resources) on other nodes.
+
+To add pages to your node, place micron files in the `*pages`* directory of your Nomad Network programs `*storage`* directory. By default, the path to this will be `!~/.nomadnetwork/storage/pages`!. You should probably create the file `!index.mu`! first, as this is the page that will get served by default to a connecting peer.
+
+You can control how long a peer will cache your pages by including the cache header in a page. To do so, the first line of your page must start with `!#!c=X`!, where `!X`! is the cache time in seconds. To tell the peer to always load the page from your node, and never cache it, set the cache time to zero. You should only do this if there is a real need, for example if your page displays dynamic content that `*must`* be updated at every page view. The default caching time is 12 hours. In most cases, you should not need to include the cache control header in your pages.
+
+You can use a preprocessor such as PHP, bash, Python (or whatever you prefer) to generate dynamic pages. To do so, just set executable permissions on the relevant page file, and be sure to include the interpreter at the beginning of the file, for example `!#!/usr/bin/python3`!.
+
+>>Files
+
+Like pages, you can place files you want to make available in the `!~/.nomadnetwork/storage/files`! directory. To let a peer download a file, you should create a link to it in one of your pages.
+
+>>Links and URLs
+
+Links to pages and resources in Nomad Network use a simple URL format. Here is an example:
+
+`!1385edace36466a6b3dd:/page/index.mu`!
+
+The first part is the 10 byte destination address of the node (represented as readable hexadecimal), followed by the `!:`! character. Everything after the `!:`! represents the request path.
+
+By convention, Nomad Network nodes maps all hosted pages under the `!/page`! path, and all hosted files under the `!/file`! path. You can create as many subdirectories for pages and files as you please, and they will be automatically mapped to corresponding request paths.
+
+You can omit the destination address of the node, if you are reffering to a local page or file. You must still keep the `!:`! character. In such a case, the URL to a page could look like this:
+
+`!:/page/other_page.mu`!
+
+The URL to a local file could look like this:
+
+`!:/file/document.pdf`!
+
+Links can be inserted into micron documents. See the `*Markup`* section of this guide for info on how to do so.
+
+'''
+
+TOPIC_CONVERSATIONS = '''>Conversations
+
+Conversations in Nomad Network
+'''
+
+
+TOPIC_FIRST_RUN = '''>First Time Information
+
+Hi there. This first run message will only appear once. It contains a few pointers on getting started with Nomad Network, and getting the most out of the program.
+
+You're currently located in the guide section of the program. I'm sorry I had to drag you here by force, but it will only happen this one time, I promise. If you ever get lost, return here and peruse the list of topics you see on the left. I will do my best to fill it with answers to mostly anything about Nomad Network.
+
+To get the most out of Nomad Network, you will need a terminal that supports UTF-8 and at least 256 colors, ideally true-color. If your terminal supports true-color, you can go to the `![ Config ]`! menu item, launch the editor and change the configuration.
+
+If you don't already have a Nerd Font installed (see https://www.nerdfonts.com/), I also highly recommend to do so, since it will greatly expand the amount of glyphs, icons and graphics that Nomad Network can use. Once you have your terminal set up with a Nerd Font, go to the `![ Config ]`! menu item and enable Nerd Fonts in the configuration instead of normal unicode glyphs.
+
+Nomad Network expects that you are already connected to some form of Reticulum network. That could be as simple as the default UDP-based demo interface on your local ethernet network. This short guide won't go into any details on building networks, but you will find other entries in the guide that deal with network setup and configuration.
+
+At least, if Nomad Network launches, it means that it is connected to a running Reticulum instance, that should in turn be connected to `*something`*, which should get you started.
+
+For more some more information, you can also read the `*Introduction`* section of this guide.
+
+Now go out there and explore. This is still early days. See what you can find and create.
+
+>>>>>>>>>>>>>>>
+-\u223f
+<
+
+'''
+
+TOPIC_NETWORKS = '''>Network Configuration
+
+Nomad Network uses the Reticulum Network Stack for communication and encryption. This means that it will use any interfaces and communications channels already defined in your Reticulum configuration.
+
+Reticulum supports using many kinds of devices as networking interfaces, and allows you to mix and match them in any way you choose. The number of distinct network topologies you can create with Reticulum is more or less endless, but common to them all is that you will need to define one or more interfaces for Reticulum to use.
+
+If you have not changed the default Reticulum configuration, which should be located at `!~/.reticulum/config`!, you will have one interface active right now. With it, you should be able to communicate with any other peers and nodes that exist on your local ethernet or WiFi network, if your system is connected to one, and most probably nothing else outside of that.
+
+To learn how to configure your Reticulum setup to use LoRa radios, packet radio or other interfaces, or connect to other Reticulum networks via the Internet, the best places to start is to read the relevant parts of the Reticulum Manual, which can be found on GitHub:
+
+`c`_https://markqvist.github.io/Reticulum/manual/interfaces.html`_
+`l
+
+If you don't currently have access to the Internet, the default Reticulum configuration file is also full of examples of all the supported interface types, and it should be relatively simple to get a working setup going just from those examples.
+
+For future reference, you can download the Reticulum Manual in PDF format here:
+
+`c`_https://github.com/markqvist/Reticulum/raw/master/docs/Reticulum%20Manual.pdf`_
+`l
+
+It might be nice to keep that handy when you are not connected to the Internet, as it is full of information and examples that are also very relevant to Nomad Network.
+
+>The Unsigned.io Testnet
+
+If you have Internet access, and just want to get started experimenting, you are welcome to join the Unsigned.io RNS Testnet. The testnet is just that, an informal network for testing and experimenting. It will be up most of the time, and anyone can join, but it also means that there's no guarantees for service availability.
+
+The Testnet also runs the latest version of Reticulum, often even a short while before it is publicly released, which means strange behaviour might occur. If none of that scares you, add the following interface to your Reticulum configuration file to join:
+
+>>
+[[RNS Testnet Frankfurt]]
+  type = TCPClientInterface
+  interface_enabled = yes
+  outgoing = True
+  target_host = frankfurt.rns.unsigned.io
+  target_port = 4965
+
+'''
+
+TOPIC_DISPLAYTEST = '''>Markup & Color Display Test
+
+
+`cYou can use this section to gauge how well your terminal reproduces the various types of formatting used by Nomad Network.
+``
+
+
+>>>>>>>>>>>>>>>>>>>>
+-\u223f
+<
+
+
+>>
+`a`!This line should be bold, and aligned to the left`!
+
+`c`*This one should be italic and centered`*
+
+`r`_And this one should be underlined, aligned right`_
+``
+
+The following line should contain a red gradient bar:
+`B100 `B200 `B300 `B400 `B500 `B600 `B700 `B800 `B900 `Ba00 `Bb00 `Bc00 `Bd00 `Be00 `Bf00`b
+
+The following line should contain a green gradient bar:
+`B010 `B020 `B030 `B040 `B050 `B060 `B070 `B080 `B090 `B0a0 `B0b0 `B0c0 `B0d0 `B0e0 `B0f0`b
+
+The following line should contain a blue gradient bar:
+`B001 `B002 `B003 `B004 `B005 `B006 `B007 `B008 `B009 `B00a `B00b `B00c `B00d `B00e `B00f`b
+
+Unicode Glyphs   : \u2713  \u2715  \u26a0  \u24c3  \u2193
+
+Nerd Font Glyphs : \uf484  \uf9c4 \uf719  \uf502  \uf415  \uf023  \uf06e
+'''
+
+
+TOPIC_LICENSES = '''>Thanks, Acknowledgements and Licenses
+
+This program uses various other software components, without which Nomad Network would not have been possible. Sincere thanks to the authors and contributors of the following projects
+
+>>>
+ - `!Cryptography.io`! by `*pyca`*
+   https://cryptography.io/
+   BSD License
+
+ - `!Urwid`! by `*Ian Ward`*
+   http://urwid.org/
+   LGPL-2.1 License
+
+ - `!Additional Urwid Widgets`! by `*AFoeee`*
+   https://github.com/AFoeee/additional_urwid_widgets
+   MIT License
+
+ - `!Scrollable`! by `*rndusr`*
+   https://github.com/rndusr/stig/blob/master/stig/tui/scroll.py
+   GPLv3 License
+
+ - `!Configobj`! by `*Michael Foord`*
+   https://github.com/DiffSK/configobj
+   BSD License
+
+ - `!Reticulum Network Stack`! by `*unsignedmark`*
+   https://github.com/markqvist/Reticulum
+   MIT License
+
+ - `!LXMF`! by `*unsignedmark`*
+   https://github.com/markqvist/LXMF
+   MIT License
+'''
+
+
+TOPIC_MARKUP = '''>Outputting Formatted Text
+
+
+>>>>>>>>>>>>>>>
+-\u223f
+<
+
+`c`!Hello!`! This is output from `*micron`*
+Micron generates formatted text for your terminal
+`a
+
+>>>>>>>>>>>>>>>
+-\u223f
+<
+
+
+Nomad Network supports a simple and functional markup language called `*micron`*. If you are familiar with `*markdown`* or `*HTML`*, you will feel right at home writing pages with micron.
+
+With micron you can easily create structured documents and pages with formatting, colors, glyphs and icons, ideal for display in terminals.
+
+>>Recommendations and Requirements
+
+While micron can output formatted text to even the most basic terminal, there's a few capabilities your terminal `*must`* support to display micron output correctly, and some that, while not strictly necessary, make the experience a lot better.
+
+Formatting such as `_underline`_, `!bold`! or `*italics`* will be displayed if your terminal supports it.
+
+If you are having trouble getting micron output to display correctly, try using `*gnome-terminal`*, which should work with all formatting options out of the box. Most other terminals will work fine as well, but you might have to change some settings to get certain formatting to display correctly.
+
+>>>Encoding
+
+All micron sources are intepreted as UTF-8, and micron assumes it can output UTF-8 characters to the terminal. If your terminal does not support UTF-8, output will be faulty.
+
+>>>Colors
+
+Shading and coloring text and backgrounds is integral to micron output, and while micron will attempt to gracefully degrade output even to 1-bit terminals, you will get the best output with terminals supporting at least 256 colors. True-color support is recommended.
+
+>>>Terminal Font
+
+While any unicode capable font can be used with micron, it's highly recommended to use a `*"Nerd Font"`* (see https://www.nerdfonts.com/), which will add a lot of extra glyphs and icons to your output.
+
+> A Few Demo Outputs
+
+`F222`Bddd
+
+`cWith micron, you can control layout and presentation
+`a
+
+``
+
+`B33f
+
+You can change background ...
+
+``
+
+`B393
+
+`r`F320... and foreground colors`f
+`a
+
+`b
+
+If you want to make a break, horizontal dividers can be inserted. They can be plain, like the one below this text, or you can style them with unicode characters and glyphs, like the wavy divider in the beginning of this document.
+
+-
+
+`cText can be `_underlined`_, `!bold`! or `*italic`*.
+
+You can also `_`*`!`B5d5`F222combine`f`b`_ `_`Ff00f`Ff80o`Ffd0r`F9f0m`F0f2a`F0fdt`F07ft`F43fi`F70fn`Fe0fg`` for some fabulous effects.
+`a
+
+
+>>>Sections and Headings
+
+You can define an arbitrary number of sections and sub sections, each with their own named headings. Text inside sections will be automatically indented.
+
+-
+
+If you place a divider inside a section, it will adhere to the section indents.
+
+>>>>>
+If no heading text is defined, the section will appear as a sub-section without a header. This can be useful for creating indented blocks of text, like this one.
+
+>Micron tags
+
+Tags are used to format text with micron. Some tags can appear anywhere in text, and some must appear at the beginning of a line. If you need to write text that contains a sequence that would be interpreted as a tag, you can escape it with the character \\.
+
+In the following sections, the different tags will be introduced. Any styling set within micron can be reset to the default style by using the special \\`\\` tag anywhere in the markup, which will immediately remove any formatting previously specified. 
+
+>>Alignment
+
+To control text alignment use the tag \\`c to center text, \\`l to left-align, \\`r to right-align, and \\`a to return to the default alignment of the document. Alignment tags must appear at the beginning of a line. Here is an example:
+
+`Faaa
+`=
+`cThis line will be centered.
+So will this.
+`aThe alignment has now been returned to default.
+`rThis will be aligned to the right
+``
+`=
+``
+
+The above markup produces the following output:
+
+`Faaa`B333
+
+`cThis line will be centered.
+So will this.
+
+`aThe alignment has now been returned to default.
+
+`rThis will be aligned to the right
+
+``
+
+
+>>Formatting
+
+Text can be formatted as `!bold`! by using the \\`! tag, `_underline`_ by using the \\`_ tag and `*italic`* by using the \\`* tag.
+
+Here's an example of formatting text:
+
+`Faaa
+`=
+We shall soon see `!bold`! paragraphs of text decorated with `_underlines`_ and `*italics`*. Some even dare `!`*`_combine`` them!
+`=
+``
+
+The above markup produces the following output:
+
+`Faaa`B333
+
+We shall soon see `!bold`! paragraphs of text decorated with `_underlines`_ and `*italics`*. Some even dare `!`*`_combine`!`*`_ them!
+
+``
+
+
+>>Sections
+
+To create sections and subsections, use the > tag. This tag must be placed at the beginning of a line. To specify a sub-section of any level, use any number of > tags. If text is placed after a > tag, it will be used as a heading.
+
+Here is an example of sections:
+
+`Faaa
+`=
+>High Level Stuff
+This is a section. It contains this text.
+
+>>Another Level
+This is a sub section.
+
+>>>Going deeper
+A sub sub section. We could continue, but you get the point.
+
+>>>>
+Wait! It's worth noting that we can also create sections without headings. They look like this.
+`=
+``
+
+The above markup produces the following output:
+
+`Faaa`B333
+>High Level Stuff
+This is a section. It contains this text.
+
+>>Another Level
+This is a sub section.
+
+>>>Going deeper
+A sub sub section. We could continue, but you get the point.
+
+>>>>
+Wait! It's worth noting that we can also create sections without headings. They look like this.
+``
+
+
+>Colors
+
+Foreground colors can be specified with the \\`F tag, followed by three hexadecimal characters. To return to the default foreground color, use the \\`f tag. Background color is specified in the same way, but by using the \\`B and \\`b tags.
+
+Here's a few examples:
+
+`Faaa
+`=
+You can use `B5d5`F222 color `f`b `Ff00f`Ff80o`Ffd0r`F9f0m`F0f2a`F0fdt`F07ft`F43fi`F70fn`Fe0fg`f for some fabulous effects.
+`=
+``
+
+The above markup produces the following output:
+
+`Faaa`B333
+
+You can use `B5d5`F222 color `f`B333 `Ff00f`Ff80o`Ffd0r`F9f0m`F0f2a`F0fdt`F07ft`F43fi`F70fn`Fe0fg`f for some fabulous effects.
+
+``
+
+
+>Links
+
+Links to pages, files or other resources can be created with the \\`[ tag, which should always be terminated with a closing ]. You can create links with and without labels, it is up to you to control the formatting of links with other tags. Although not strictly necessary, it is good practice to at least format links with underlining.
+
+Here's a few examples:
+
+`Faaa
+`=
+Here is a link without any label: `[1385edace36466a6b3dd:/page/index.mu]
+
+This is a `[labeled link`1385edace36466a6b3dd:/page/index.mu] to the same page, but it's hard to see if you don't know it
+
+Here is `F00a`_`[a more visible link`1385edace36466a6b3dd:/page/index.mu]`_`f
+`=
+``
+
+The above markup produces the following output:
+
+`Faaa`B333
+
+Here is a link without any label: `[1385edace36466a6b3dd:/page/index.mu]
+
+This is a `[labeled link`1385edace36466a6b3dd:/page/index.mu] to the same page, but it's hard to see if you don't know it
+
+Here is `F00f`_`[a more visible link`1385edace36466a6b3dd:/page/index.mu]`_`f
+
+``
+
+When links like these are displayed in the built-in browser, clicking on them or activating them using the keyboard will cause the browser to load the specified URL.
+
+>Comments
+
+You can insert comments that will not be displayed in the output by starting a line with the # character.
+
+Here's an example:
+
+`Faaa
+`=
+# This line will not be displayed
+This line will
+`=
+``
+
+The above markup produces the following output:
+
+`Faaa`B333
+
+# This line will not be displayed
+This line will
+
+``
+
+
+>Literals
+
+To display literal content, for example source-code, or blocks of text that should not be interpreted by micron, you can use literal blocks, specified by the \\`= tag. Below is the source code of this entire document, presented as a literal block.
+
+-
+
+`=
+'''
+TOPIC_MARKUP += TOPIC_MARKUP.replace("`=", "\\`=") + "[ micron source for document goes here, we don't want infinite recursion now, do we? ]\n\\`="
+TOPIC_MARKUP += "\n`=\n\n>Closing Remarks\n\nIf you made it all the way here, you should be well equipped to write documents and pages using micron. Thank you for staying with me.\n\n`c\U0001F332\n"
+
+
+TOPICS = {
+    "Introduction": TOPIC_INTRODUCTION,
+    "Concepts & Terminology": TOPIC_CONCEPTS,
+    "Conversations": TOPIC_CONVERSATIONS,
+    "Hosting a Node": TOPIC_HOSTING,
+    "Markup": TOPIC_MARKUP,
+    "First Run": TOPIC_FIRST_RUN,
+    "Display Test": TOPIC_DISPLAYTEST,
+    "Network Configuration": TOPIC_NETWORKS,
+    "Credits & Licenses": TOPIC_LICENSES,
+}

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,9 +16,15 @@ 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)
 
-        self.active_display = self.conversations_display
+        if app.firstrun:
+            self.active_display = self.guide_display
+        else:
+            self.active_display = self.conversations_display
 
     def active(self):
         return self.active_display
@@ -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,6 +129,15 @@ class MainDisplay():
     def update_active_shortcuts(self):
         self.frame.contents["footer"] = (self.sub_displays.active().shortcuts().widget, None)
 
+    def request_redraw(self):
+        self.app.ui.loop.set_alarm_in(0.25, self.redraw_now)
+    
+    def redraw_now(self, sender=None, data=None):
+        self.app.ui.loop.draw_screen()
+
+    def start(self):
+        self.menu_display.start()
+
     def quit(self, sender=None):
         raise urwid.ExitMainLoop
 
@@ -120,19 +150,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_quit          = (8, MenuButton("Quit", on_press=handler.quit))
+        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,513 @@
+import nomadnet
+import urwid
+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_widget = parse_line(line, state, url_delegate)
+        else:
+            display_widget = urwid.Text("")
+        
+        if display_widget != None:
+            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:
+            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):
+        # TODO: Implement low-color mapper
+        return "default"
+    def high_color(color):
+        if color == "default":
+            return color
+        else:
+            return "#"+color
+
+    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 == "[":
+                        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_url = link_data
+                            elif len(link_components) == 2:
+                                link_label = link_components[0]
+                                link_url = link_components[1]
+                            else:
+                                link_url = ""
+                                link_label = ""
+
+                            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)
+                                    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 == "\\":
+                        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
+
+        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
+        if self.delegate != None:
+            self.delegate.last_keypress = 0
+
+    def handle_link(self, link_target):
+        if self.delegate != None:
+            self.delegate.handle_link(link_target)
+
+
+    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)
+
+        elif key == "up":
+            self._cursor_position = 0
+            return key
+        
+        elif key == "down":
+            self._cursor_position = 0
+            return key
+        
+        elif key == "right":
+            self._cursor_position = self.find_next_part_pos(self._cursor_position, part_positions)
+            self._invalidate()
+        
+        elif key == "left":
+            if self._cursor_position > 0:
+                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):
+        if button != 1 or not is_mouse_press(event):
+            return False
+        else:
+            pos = (y * size[0]) + 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)
+
+            self._invalidate()
+            self._emit("change")
+            
+            return True

nomadnet/ui/textui/Network.py

@@ -1,15 +1,20 @@
 import RNS
 import urwid
 import nomadnet
+import time
 from datetime import datetime
 from nomadnet.Directory import DirectoryEntry
 from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox, MODIFIER_KEY
 
+from .Browser import Browser
+
 class NetworkDisplayShortcuts():
     def __init__(self, app):
         self.app = app
+        g = app.ui.glyphs
 
-        self.widget = urwid.AttrMap(urwid.Text("Network Display Shortcuts"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-l] Nodes/Announces  [C-x] Remove  [C-w] Disconnect  [C-d] Back  [C-f] Forward  [C-r] Reload  [C-u] URL"), "shortcutbar")
+        #   "[C-"+g["arrow_u"]+g["arrow_d"]+"] Navigate Lists"
 
 
 class DialogLineBox(urwid.LineBox):
@@ -44,43 +49,198 @@ class ListEntry(urwid.Text):
         self._emit('click')
         return True
 
+
+class AnnounceInfo(urwid.WidgetWrap):
+    def __init__(self, announce, parent, app):
+        self.app = nomadnet.NomadNetworkApp.get_shared_instance()
+        self.parent = self.app.ui.main_display.sub_displays.network_display
+        g = self.app.ui.glyphs
+
+        source_hash  = announce[1]
+        time_format  = app.time_format
+        dt           = datetime.fromtimestamp(announce[0])
+        ts_string    = dt.strftime(time_format)
+        trust_level  = self.app.directory.trust_level(source_hash)
+        trust_str    = ""
+        display_str  = self.app.directory.simplest_display_str(source_hash)
+        addr_str     = "<"+RNS.hexrep(source_hash, delimit=False)+">"
+        is_node      = announce[3]
+
+        if is_node:
+            type_string = "Node " + g["node"]
+        else:
+            type_string = "Peer " + g["peer"]
+
+        try:
+            data_str = announce[2].decode("utf-8")
+            data_style = ""
+            if trust_level != DirectoryEntry.TRUSTED and len(data_str) > 32:
+                data_str = data_str[:32]+" [...]"
+        except Exception as e:
+            data_str = "Decode failed"
+            data_style = "list_untrusted"
+
+
+        if trust_level == DirectoryEntry.UNTRUSTED:
+            trust_str     = "Untrusted"
+            symbol        = g["cross"]
+            style         = "list_untrusted"
+        elif trust_level == DirectoryEntry.UNKNOWN:
+            trust_str     = "Unknown"
+            symbol        = g["unknown"]
+            style         = "list_unknown"
+        elif trust_level == DirectoryEntry.TRUSTED:
+            trust_str     = "Trusted"
+            symbol        = g["check"]
+            style         = "list_trusted"
+        elif trust_level == DirectoryEntry.WARNING:
+            trust_str     = "Warning"
+            symbol        = g["warning"]
+            style         = "list_warning"
+        else:
+            trust_str     = "Warning"
+            symbol        = g["warning"]
+            style         = "list_untrusted"
+
+        def show_announce_stream(sender):
+            options = self.parent.left_pile.options(height_type="weight", height_amount=1)
+            self.parent.left_pile.contents[0] = (self.parent.announce_stream_display, options)
+
+        def connect(sender):
+            self.parent.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
+            show_announce_stream(None)
+
+        def save_node(sender):
+            node_entry = DirectoryEntry(source_hash, display_name=data_str, trust_level=trust_level, hosts_node=True)
+            self.app.directory.remember(node_entry)
+            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+            show_announce_stream(None)
+
+        def converse(sender):
+            show_announce_stream(None)
+            try:
+                existing_conversations = nomadnet.Conversation.conversation_list(self.app)
+                
+                source_hash_text = RNS.hexrep(source_hash, delimit=False)
+                display_name = data_str
+
+                if not source_hash_text in [c[0] for c in existing_conversations]:
+                    entry = DirectoryEntry(source_hash, display_name, trust_level)
+                    self.app.directory.remember(entry)
+
+                    new_conversation = nomadnet.Conversation(source_hash_text, nomadnet.NomadNetworkApp.get_shared_instance(), initiator=True)
+                    self.app.ui.main_display.sub_displays.conversations_display.update_conversation_list()
+
+                self.app.ui.main_display.sub_displays.conversations_display.display_conversation(None, source_hash_text)
+                self.app.ui.main_display.show_conversations(None)
+
+            except Exception as e:
+                RNS.log("Error while starting conversation from announce. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+        if is_node:
+            type_button = ("weight", 0.45, urwid.Button("Connect", on_press=connect))
+            save_button = ("weight", 0.45, urwid.Button("Save", on_press=save_node))
+        else:
+            type_button = ("weight", 0.45, urwid.Button("Converse", on_press=converse))
+            save_button = None
+
+        if is_node:
+            button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), save_button, ("weight", 0.1, urwid.Text("")), type_button])
+        else:
+            button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), type_button])
+
+        pile_widgets = [
+            urwid.Text("Time  : "+ts_string, align="left"),
+            urwid.Text("Addr  : "+addr_str, align="left"),
+            urwid.Text("Type  : "+type_string, align="left"),
+            urwid.Text("Name  : "+display_str, align="left"),
+            urwid.Text(["Trust : ", (style, trust_str)], align="left"),
+            urwid.Divider(g["divider1"]),
+            urwid.Text(["Announce Data: \n", (data_style, data_str)], align="left"),
+            urwid.Divider(g["divider1"]),
+            button_columns
+        ]
+
+        if is_node:
+            node_ident = RNS.Identity.recall(source_hash)
+            op_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", node_ident)
+            op_str = self.app.directory.simplest_display_str(op_hash)
+            operator_entry = urwid.Text("Oprtr : "+op_str, align="left")
+            pile_widgets.insert(4, operator_entry)
+
+        pile = urwid.Pile(pile_widgets)
+
+        self.display_widget = urwid.Filler(pile, valign="top", height="pack")
+
+        urwid.WidgetWrap.__init__(self, urwid.LineBox(self.display_widget, title="Announce Info"))
+
+
 class AnnounceStreamEntry(urwid.WidgetWrap):
-    def __init__(self, app, timestamp, source_hash):
+    def __init__(self, app, announce):
+        full_time_format = "%Y-%m-%d %H:%M:%S"
+        date_time_format = "%Y-%m-%d"
+        time_time_format = "%H:%M:%S"
+        short_time_format = "%Y-%m-%d %H:%M"
+
+        timestamp = announce[0]
+        source_hash = announce[1]
+        is_node = announce[3]
         self.app = app
         self.timestamp = timestamp
         time_format = app.time_format
         dt = datetime.fromtimestamp(self.timestamp)
-        ts_string = dt.strftime(time_format)
+        dtn = datetime.fromtimestamp(time.time())
+        g = self.app.ui.glyphs
+
+        if dt.strftime(date_time_format) == dtn.strftime(date_time_format):
+            ts_string = dt.strftime(time_time_format)
+        else:
+            ts_string = dt.strftime(short_time_format)
 
         trust_level  = self.app.directory.trust_level(source_hash)
         display_str = self.app.directory.simplest_display_str(source_hash)
 
         if trust_level == DirectoryEntry.UNTRUSTED:
-            symbol        = "\u2715"
+            symbol        = g["cross"]
             style         = "list_untrusted"
             focus_style   = "list_focus_untrusted"
         elif trust_level == DirectoryEntry.UNKNOWN:
-            symbol        = "?"
+            symbol        = g["unknown"]
             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"
 
-        widget = ListEntry(ts_string+" "+display_str)
+        if is_node:
+            type_symbol = g["node"]
+        else:
+            type_symbol = g["peer"]
+
+        widget = ListEntry(ts_string+" "+type_symbol+" "+display_str)
+        urwid.connect_signal(widget, "click", self.display_announce, announce)
 
         self.display_widget = urwid.AttrMap(widget, style, focus_style)
         urwid.WidgetWrap.__init__(self, self.display_widget)
 
+    def display_announce(self, event, announce):
+        parent = self.app.ui.main_display.sub_displays.network_display
+        info_widget = AnnounceInfo(announce, parent, self.app)
+        options = parent.left_pile.options(height_type="weight", height_amount=1)
+        parent.left_pile.contents[0] = (info_widget, options)
+
+    def timestamp(self):
+        return self.timestamp
+
 class AnnounceStream(urwid.WidgetWrap):
     def __init__(self, app, parent):
         self.app = app
@@ -88,25 +248,38 @@ class AnnounceStream(urwid.WidgetWrap):
         self.started = False
         self.timeout = self.app.config["textui"]["animation_interval"]*2
         self.ilb = None
+        self.no_content = True
         
         self.added_entries = []
         self.widget_list = []
         self.update_widget_list()
 
-        wlt = [AnnounceStreamEntry(self.app, e[0], e[1]) for e in self.app.directory.announce_stream]
         self.ilb = IndicativeListBox(
             self.widget_list,
-            #wlt,
             on_selection_change=self.list_selection,
             initialization_is_selection_change=False,
-            modifier_key=MODIFIER_KEY.CTRL,
+            #modifier_key=MODIFIER_KEY.CTRL,
             #highlight_offFocus="list_off_focus"
         )
 
         self.display_widget = self.ilb
         urwid.WidgetWrap.__init__(self, urwid.LineBox(self.display_widget, title="Announce Stream"))
 
+    def keypress(self, size, key):
+        if key == "up" and (self.no_content or self.ilb.first_item_is_selected()):
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+        elif key == "ctrl x":
+            self.delete_selected_entry()
+            
+        return super(AnnounceStream, self).keypress(size, key)
+
+    def delete_selected_entry(self):
+        if self.ilb.get_selected_item() != None:
+            self.app.directory.remove_announce_with_timestamp(self.ilb.get_selected_item().original_widget.timestamp)
+            self.rebuild_widget_list()
+
     def rebuild_widget_list(self):
+        self.no_content = True
         self.added_entries = []
         self.widget_list = []
         self.update_widget_list()
@@ -118,13 +291,22 @@ class AnnounceStream(urwid.WidgetWrap):
                 self.added_entries.insert(0, e[0])
                 new_entries.insert(0, e)
 
-        new_widgets = [AnnounceStreamEntry(self.app, e[0], e[1]) for e in new_entries]
-        for nw in new_widgets:
+        for e in new_entries:
+            nw = AnnounceStreamEntry(self.app, e)
+            nw.timestamp = e[0]
             self.widget_list.insert(0, nw)
 
-        if len(new_widgets) > 0:
+        if len(new_entries) > 0:
+            self.no_content = False
             if self.ilb != None:
                 self.ilb.set_body(self.widget_list)
+        else:
+            if len(self.widget_list) == 0:
+                self.no_content = True
+            
+            if self.ilb != None:
+                self.ilb.set_body(self.widget_list)
+
 
     def list_selection(self, arg1, arg2):
         pass
@@ -170,13 +352,160 @@ class SelectText(urwid.Text):
         self._emit('click')
         return True
 
+class ListDialogLineBox(urwid.LineBox):
+    def keypress(self, size, key):
+        if key == "esc":
+            self.delegate.close_list_dialogs()
+        else:
+            return super(ListDialogLineBox, self).keypress(size, key)
+
+class KnownNodeInfo(urwid.WidgetWrap):
+    def __init__(self, node_hash):
+        self.app = nomadnet.NomadNetworkApp.get_shared_instance()
+        self.parent = self.app.ui.main_display.sub_displays.network_display
+        self.pn_changed = False
+        g = self.app.ui.glyphs
+
+        source_hash  = node_hash
+        node_ident   = RNS.Identity.recall(node_hash)
+        time_format  = self.app.time_format
+        trust_level  = self.app.directory.trust_level(source_hash)
+        trust_str    = ""
+        node_entry   = self.app.directory.find(source_hash)
+        if node_entry == None:
+            display_str = self.app.directory.simplest_display_str(source_hash)
+        else:
+            display_str = node_entry.display_name
+
+        addr_str     = "<"+RNS.hexrep(source_hash, delimit=False)+">"
+
+        if node_ident != None:
+            lxmf_addr_str = RNS.prettyhexrep(RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_ident))
+        else:
+            lxmf_addr_str = "Unknown"
+
+
+        type_string = "Node " + g["node"]
+
+        if trust_level == DirectoryEntry.UNTRUSTED:
+            trust_str     = "Untrusted"
+            symbol        = g["cross"]
+            style         = "list_untrusted"
+        elif trust_level == DirectoryEntry.UNKNOWN:
+            trust_str     = "Unknown"
+            symbol        = g["unknown"]
+            style         = "list_unknown"
+        elif trust_level == DirectoryEntry.TRUSTED:
+            trust_str     = "Trusted"
+            symbol        = g["check"]
+            style         = "list_trusted"
+        elif trust_level == DirectoryEntry.WARNING:
+            trust_str     = "Warning"
+            symbol        = g["warning"]
+            style         = "list_warning"
+        else:
+            trust_str     = "Warning"
+            symbol        = g["warning"]
+            style         = "list_untrusted"
+
+        if trust_level == DirectoryEntry.UNTRUSTED:
+            untrusted_selected = True
+            unknown_selected   = False
+            trusted_selected   = False
+        elif trust_level == DirectoryEntry.UNKNOWN:
+            untrusted_selected = False
+            unknown_selected   = True
+            trusted_selected   = False
+        elif trust_level == DirectoryEntry.TRUSTED:
+            untrusted_selected = False
+            unknown_selected   = False
+            trusted_selected   = True
+
+        trust_button_group = []
+        r_untrusted = urwid.RadioButton(trust_button_group, "Untrusted", state=untrusted_selected)
+        r_unknown   = urwid.RadioButton(trust_button_group, "Unknown", state=unknown_selected)
+        r_trusted   = urwid.RadioButton(trust_button_group, "Trusted", state=trusted_selected)
+
+        e_name = urwid.Edit(caption="Name      : ",edit_text=display_str)
+
+        def show_known_nodes(sender):
+            options = self.parent.left_pile.options(height_type="weight", height_amount=1)
+            self.parent.left_pile.contents[0] = (self.parent.known_nodes_display, options)
+
+        def connect(sender):
+            self.parent.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
+            show_known_nodes(None)
+
+        def pn_change(sender, userdata):
+            self.pn_changed = True
+
+        propagation_node_checkbox = urwid.CheckBox("Use as default propagation node", state=(self.app.get_user_selected_propagation_node() == source_hash), on_state_change=pn_change)
+
+        def save_node(sender):
+            if self.pn_changed:
+                if propagation_node_checkbox.get_state():
+                    self.app.set_user_selected_propagation_node(source_hash)
+                else:
+                    self.app.set_user_selected_propagation_node(None)
+
+            trust_level = DirectoryEntry.UNTRUSTED
+            if r_unknown.get_state() == True:
+                trust_level = DirectoryEntry.UNKNOWN
+            
+            if r_trusted.get_state() == True:
+                trust_level = DirectoryEntry.TRUSTED
+
+            display_str = e_name.get_edit_text()
+
+            node_entry = DirectoryEntry(source_hash, display_name=display_str, trust_level=trust_level, hosts_node=True)
+            self.app.directory.remember(node_entry)
+            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+            show_known_nodes(None)
+
+        type_button = ("weight", 0.45, urwid.Button("Connect", on_press=connect))
+        save_button = ("weight", 0.45, urwid.Button("Save", on_press=save_node))
+        button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_known_nodes)), ("weight", 0.1, urwid.Text("")), save_button, ("weight", 0.1, urwid.Text("")), type_button])
+
+        pile_widgets = [
+            urwid.Text("Type      : "+type_string, align="left"),
+            # urwid.Text("Name      : "+display_str, align="left"),
+            e_name,
+            urwid.Text("Node Addr : "+addr_str, align="left"),
+            urwid.Text("LXMF Addr : "+lxmf_addr_str, align="left"),
+            # urwid.Text(["Trust     : ", (style, trust_str)], align="left"),
+            urwid.Divider(g["divider1"]),
+            propagation_node_checkbox,
+            urwid.Divider(g["divider1"]),
+            r_untrusted,
+            r_unknown,
+            r_trusted,
+            urwid.Divider(g["divider1"]),
+            button_columns
+        ]
+
+        node_ident = RNS.Identity.recall(source_hash)
+        op_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", node_ident)
+        op_str = self.app.directory.simplest_display_str(op_hash)
+        operator_entry = urwid.Text("Operator  : "+op_str, align="left")
+        pile_widgets.insert(4, operator_entry)
+
+        pile = urwid.Pile(pile_widgets)
+
+        self.display_widget = urwid.Filler(pile, valign="top", height="pack")
+
+        urwid.WidgetWrap.__init__(self, urwid.LineBox(self.display_widget, title="Node Info"))
+
+
 class KnownNodes(urwid.WidgetWrap):
     def __init__(self, app):
         self.app = app
         self.node_list = app.directory.known_nodes()
+        g = self.app.ui.glyphs
+
+        self.widget_list = self.make_node_widgets()
         
         self.ilb = IndicativeListBox(
-            self.make_node_widgets(),
+            self.widget_list,
             on_selection_change=self.node_list_selection,
             initialization_is_selection_change=False,
             highlight_offFocus="list_off_focus"
@@ -189,13 +518,16 @@ class KnownNodes(urwid.WidgetWrap):
         else:
             self.no_content = True
             widget_style = "inactive_text"
-            self.display_widget = urwid.Pile([urwid.Text(("warning_text", "- i -\n"), align="center"), SelectText(("warning_text", "Currently, no nodes are known\n\n"), align="center")])
+            self.pile = urwid.Pile([urwid.Text(("warning_text", g["info"]+"\n"), align="center"), SelectText(("warning_text", "Currently, no nodes are known\n\n"), align="center")])
+            self.display_widget = urwid.Filler(self.pile, valign="top", height="pack")
 
         urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="Known Nodes"), widget_style))
 
     def keypress(self, size, key):
-        if key == "up" and (self.no_content or self.ilb.top_is_visible):
+        if key == "up" and (self.no_content or self.ilb.first_item_is_selected()):
             nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+        elif key == "ctrl x":
+            self.delete_selected_entry()
             
         return super(KnownNodes, self).keypress(size, key)
 
@@ -203,15 +535,135 @@ class KnownNodes(urwid.WidgetWrap):
     def node_list_selection(self, arg1, arg2):
         pass
 
+    def connect_node(self, event, node):
+        source_hash = node.source_hash
+        trust_level = node.trust_level
+        trust_level  = self.app.directory.trust_level(source_hash)
+        display_str = self.app.directory.simplest_display_str(source_hash)
+
+        parent = self.app.ui.main_display.sub_displays.network_display
+
+        def dismiss_dialog(sender):
+            self.delegate.close_list_dialogs()
+
+        def confirmed(sender):
+            self.delegate.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
+            self.delegate.close_list_dialogs()
+
+        def show_info(sender):
+            info_widget = KnownNodeInfo(source_hash)
+            options = parent.left_pile.options(height_type="weight", height_amount=1)
+            parent.left_pile.contents[0] = (info_widget, options)
+
+
+        dialog = ListDialogLineBox(
+            urwid.Pile([
+                urwid.Text("Connect to node\n"+self.app.directory.simplest_display_str(source_hash)+"\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)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.45, urwid.Button("Info", on_press=show_info))])
+            ]), title="?"
+        )
+        dialog.delegate = self.delegate
+        bottom = self
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+        options = self.delegate.left_pile.options("weight", 1)
+        self.delegate.left_pile.contents[0] = (overlay, options)
+
+    def delete_selected_entry(self):
+        source_hash = self.ilb.get_selected_item().original_widget.source_hash
+
+        def dismiss_dialog(sender):
+            self.delegate.close_list_dialogs()
+
+        def confirmed(sender):
+            self.app.directory.forget(source_hash)
+            self.rebuild_widget_list()
+            self.delegate.close_list_dialogs()
+
+
+        dialog = ListDialogLineBox(
+            urwid.Pile([
+                urwid.Text("Delete Node\n"+self.app.directory.simplest_display_str(source_hash)+"\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.delegate
+        bottom = self
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+        options = self.delegate.left_pile.options("weight", 1)
+        self.delegate.left_pile.contents[0] = (overlay, options)
+
+
+    def rebuild_widget_list(self):
+        self.node_list = self.app.directory.known_nodes()
+        self.widget_list = self.make_node_widgets()
+        self.ilb.set_body(self.widget_list)
+        if len(self.widget_list) > 0:
+            self.no_content = False
+        else:
+            self.no_content = True
+            self.delegate.reinit_known_nodes()
+
     def make_node_widgets(self):
         widget_list = []
         for node_entry in self.node_list:
             # TODO: Implement this
-            widget_list.append(ListEntry("Node "+RNS.prettyhexrep(node_entry.source_hash)))
+            ne = NodeEntry(self.app, node_entry, self)
+            ne.source_hash = node_entry.source_hash
+            widget_list.append(ne)
 
         # TODO: Sort list
         return widget_list
 
+class NodeEntry(urwid.WidgetWrap):
+    def __init__(self, app, node, delegate):
+        source_hash = node.source_hash
+        trust_level = node.trust_level
+
+        self.app = app
+        g = self.app.ui.glyphs
+
+        trust_level  = self.app.directory.trust_level(source_hash)
+        display_str = self.app.directory.simplest_display_str(source_hash)
+
+        if trust_level == DirectoryEntry.UNTRUSTED:
+            symbol        = g["cross"]
+            style         = "list_untrusted"
+            focus_style   = "list_focus_untrusted"
+        elif trust_level == DirectoryEntry.UNKNOWN:
+            symbol        = g["unknown"]
+            style         = "list_unknown"
+            focus_style   = "list_focus"
+        elif trust_level == DirectoryEntry.TRUSTED:
+            symbol        = g["check"]
+            style         = "list_trusted"
+            focus_style   = "list_focus_trusted"
+        elif trust_level == DirectoryEntry.WARNING:
+            symbol        = g["warning"]
+            style         = "list_warning"
+            focus_style   = "list_focus"
+        else:
+            symbol        = g["warning"]
+            style         = "list_untrusted"
+            focus_style   = "list_focus_untrusted"
+
+        type_symbol = g["node"]
+        
+        widget = ListEntry(type_symbol+" "+display_str)
+        urwid.connect_signal(widget, "click", delegate.connect_node, node)
+
+        self.display_widget = urwid.AttrMap(widget, style, focus_style)
+        self.display_widget.source_hash = source_hash
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
 
 class AnnounceTime(urwid.WidgetWrap):
     def __init__(self, app):
@@ -245,12 +697,76 @@ class AnnounceTime(urwid.WidgetWrap):
         self.started = False
 
 
+class NodeAnnounceTime(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_time()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_time(self):
+        self.last_announce_string = "Never"
+        if self.app.peer_settings["node_last_announce"] != None:
+            self.last_announce_string = pretty_date(int(self.app.peer_settings["node_last_announce"]))
+
+        self.display_widget.set_text("Last Announce   : "+self.last_announce_string)
+
+    def update_time_callback(self, loop=None, user_data=None):
+        self.update_time()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_time_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_time_callback()
+
+    def stop(self):
+        self.started = False
+
+class NodeActiveConnections(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_stat()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_stat(self):
+        self.stat_string = "None"
+        if self.app.node != None:
+            self.stat_string = str(len(self.app.node.destination.links))
+
+        self.display_widget.set_text("Connected Peers : "+self.stat_string)
+
+    def update_stat_callback(self, loop=None, user_data=None):
+        self.update_stat()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_stat_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_stat_callback()
+
+    def stop(self):
+        self.started = False
+
+
 class LocalPeer(urwid.WidgetWrap):
     announce_timer = None
 
     def __init__(self, app, parent):
         self.app = app
         self.parent = parent
+        g = self.app.ui.glyphs
         self.dialog_open = False
         display_name = self.app.lxmf_destination.display_name
         if display_name == None:
@@ -262,7 +778,7 @@ class LocalPeer(urwid.WidgetWrap):
         def save_query(sender):
             def dismiss_dialog(sender):
                 self.dialog_open = False
-                self.parent.left_pile.contents[3] = (LocalPeer(self.app, self.parent), options)
+                self.parent.left_pile.contents[2] = (LocalPeer(self.app, self.parent), options)
 
             self.app.set_display_name(e_name.get_edit_text())
 
@@ -270,7 +786,7 @@ class LocalPeer(urwid.WidgetWrap):
                 urwid.Pile([
                     urwid.Text("\n\n\nSaved\n\n", align="center"),
                     urwid.Button("OK", on_press=dismiss_dialog)
-                ]), title="i"
+                ]), title=g["info"]
             )
             dialog.delegate = self
             bottom = self
@@ -279,13 +795,13 @@ class LocalPeer(urwid.WidgetWrap):
             overlay = dialog
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
             self.dialog_open = True
-            self.parent.left_pile.contents[3] = (overlay, options)
+            self.parent.left_pile.contents[2] = (overlay, options)
 
         def announce_query(sender):
             def dismiss_dialog(sender):
                 self.dialog_open = False
                 options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-                self.parent.left_pile.contents[3] = (LocalPeer(self.app, self.parent), options)
+                self.parent.left_pile.contents[2] = (LocalPeer(self.app, self.parent), options)
 
             self.app.announce_now()
 
@@ -293,7 +809,7 @@ class LocalPeer(urwid.WidgetWrap):
                 urwid.Pile([
                     urwid.Text("\n\n\nAnnounce Sent\n\n", align="center"),
                     urwid.Button("OK", on_press=dismiss_dialog)
-                ]), title="i"
+                ]), title=g["info"]
             )
             dialog.delegate = self
             bottom = self
@@ -303,11 +819,11 @@ class LocalPeer(urwid.WidgetWrap):
             
             self.dialog_open = True
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-            self.parent.left_pile.contents[3] = (overlay, options)
+            self.parent.left_pile.contents[2] = (overlay, options)
 
-        def node_settings_query(sender):
+        def node_info_query(sender):
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-            self.parent.left_pile.contents[3] = (self.parent.node_settings_display, options)
+            self.parent.left_pile.contents[2] = (self.parent.node_info_display, options)
 
         if LocalPeer.announce_timer == None:
             self.t_last_announce = AnnounceTime(self.app)
@@ -322,11 +838,11 @@ class LocalPeer(urwid.WidgetWrap):
             [
                 t_id,
                 e_name,
-                urwid.Divider("\u2504"),
+                urwid.Divider(g["divider1"]),
                 self.t_last_announce,
                 announce_button,
-                urwid.Divider("\u2504"),
-                urwid.Columns([("weight", 0.45, urwid.Button("Save", on_press=save_query)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Node Cfg", on_press=node_settings_query))])
+                urwid.Divider(g["divider1"]),
+                urwid.Columns([("weight", 0.45, urwid.Button("Save", on_press=save_query)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Node Info", on_press=node_info_query))])
             ]
         )
 
@@ -336,37 +852,110 @@ class LocalPeer(urwid.WidgetWrap):
         self.t_last_announce.start()
 
 
-class NodeSettings(urwid.WidgetWrap):
+class NodeInfo(urwid.WidgetWrap):
+    announce_timer = None
+    links_timer = None
+
     def __init__(self, app, parent):
         self.app = app
         self.parent = parent
+        g = self.app.ui.glyphs
+
+        self.dialog_open = False
+
+        widget_style = ""
 
         def show_peer_info(sender):
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-            self.parent.left_pile.contents[3] = (LocalPeer(self.app, self.parent), options)
+            self.parent.left_pile.contents[2] = (LocalPeer(self.app, self.parent), options)
         
-        widget_style = "inactive_text"
-        pile = urwid.Pile([
-            urwid.Text("- i -\n", align="center"),
-            urwid.Text("\nNode Hosting currently unavailable\n\n", align="center"),
-            urwid.Padding(urwid.Button("Back", on_press=show_peer_info), "center", "pack")
-        ])
+        if self.app.enable_node:
+            if self.app.node != None:
+                display_name = self.app.node.name
+            else:
+                display_name = None
+        
+            if display_name == None:
+                display_name = ""
+
+            t_id = urwid.Text("Addr : "+RNS.hexrep(self.app.node.destination.hash, delimit=False))
+            e_name = urwid.Text("Name : "+display_name)
+
+            def announce_query(sender):
+                def dismiss_dialog(sender):
+                    self.dialog_open = False
+                    options = self.parent.left_pile.options(height_type="pack", height_amount=None)
+                    self.parent.left_pile.contents[2] = (NodeInfo(self.app, self.parent), options)
+
+                self.app.node.announce()
+
+                dialog = DialogLineBox(
+                    urwid.Pile([
+                        urwid.Text("\n\n\nAnnounce Sent\n\n", align="center"),
+                        urwid.Button("OK", on_press=dismiss_dialog)
+                    ]), title=g["info"]
+                )
+                dialog.delegate = self
+                bottom = self
+
+                #overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=4, right=4)
+                overlay = dialog
+                
+                self.dialog_open = True
+                options = self.parent.left_pile.options(height_type="pack", height_amount=None)
+                self.parent.left_pile.contents[2] = (overlay, options)
+
+            def connect_query(sender):
+                self.parent.browser.retrieve_url(RNS.hexrep(self.app.node.destination.hash, delimit=False))
+
+            if NodeInfo.announce_timer == None:
+                self.t_last_announce = NodeAnnounceTime(self.app)
+                NodeInfo.announce_timer = self.t_last_announce
+            else:
+                self.t_last_announce = NodeInfo.announce_timer
+                self.t_last_announce.update_time()
+
+            if NodeInfo.links_timer == None:
+                self.t_active_links = NodeActiveConnections(self.app)
+                NodeInfo.links_timer = self.t_active_links
+            else:
+                self.t_active_links = NodeInfo.links_timer
+                self.t_active_links.update_stat()
+
+            announce_button = urwid.Button("Announce Now", on_press=announce_query)
+            connect_button = urwid.Button("Browse", on_press=connect_query)
+
+            pile = urwid.Pile([
+                t_id,
+                e_name,
+                urwid.Divider(g["divider1"]),
+                self.t_last_announce,
+                self.t_active_links,
+                urwid.Divider(g["divider1"]),
+                urwid.Columns([
+                    ("weight", 0.3, urwid.Button("Back", on_press=show_peer_info)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.3, connect_button),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.3, announce_button)
+                ])
+            ])
+        else:
+            pile = urwid.Pile([
+                urwid.Text("\n"+g["info"], align="center"),
+                urwid.Text("\nThis instance is not hosting a node\n\n", align="center"),
+                urwid.Padding(urwid.Button("Back", on_press=show_peer_info), "center", "pack")
+            ])
 
         self.display_widget = pile
 
-        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="Node Settings"), widget_style))
+        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="Local Node Info"), widget_style))
 
-    def node_list_selection(self, arg1, arg2):
-        pass
+    def start(self):
+        if self.app.node != None:
+            self.t_last_announce.start()
+            self.t_active_links.start()
 
-    def make_node_widgets(self):
-        widget_list = []
-        for node_entry in self.node_list:
-            # TODO: Implement this
-            widget_list.append(ListEntry("Node "+RNS.prettyhexrep(node_entry.source_hash)))
-
-        # TODO: Sort list
-        return widget_list
 
 
 class UpdatingText(urwid.WidgetWrap):
@@ -429,32 +1018,55 @@ class NetworkStats(urwid.WidgetWrap):
         self.w_heard_peers.start()
         self.w_known_nodes.start()
 
+class NetworkLeftPile(urwid.Pile):
+    def keypress(self, size, key):
+        if key == "ctrl l":
+            self.parent.toggle_list()
+        elif key == "ctrl w":
+            self.parent.browser.disconnect()
+        elif key == "ctrl u":
+            self.parent.browser.url_dialog()
+        else:
+            return super(NetworkLeftPile, self).keypress(size, key)
+
+
 class NetworkDisplay():
     list_width = 0.33
 
     def __init__(self, app):
         self.app = app
+        g = self.app.ui.glyphs
+
+        self.browser = Browser(self.app, "nomadnetwork", "node", auth_identity = self.app.identity, delegate = self)
+
+        if self.app.node != None:
+            self.browser.loopback = self.app.node.destination.hash
 
         self.known_nodes_display = KnownNodes(self.app)
         self.network_stats_display = NetworkStats(self.app, self)
         self.announce_stream_display = AnnounceStream(self.app, self)
         self.local_peer_display = LocalPeer(self.app, self)
-        self.node_settings_display = NodeSettings(self.app, self)
+        self.node_info_display = NodeInfo(self.app, self)
 
-        self.left_pile = urwid.Pile([
-            ("pack", self.known_nodes_display),
-            ("weight", 1, self.announce_stream_display),
+        self.known_nodes_display.delegate = self
+
+        self.list_display = 1
+        self.left_pile = NetworkLeftPile([
+            ("weight", 1, self.known_nodes_display),
             ("pack", self.network_stats_display),
             ("pack", self.local_peer_display),
         ])
 
+        self.left_pile.parent = self
+
         self.left_area = self.left_pile
-        self.right_area = urwid.AttrMap(urwid.LineBox(urwid.Filler(urwid.Text("Disconnected\n\u2190  \u2192", align="center"), "middle"), title="Remote Node"), "inactive_text")
+        self.right_area = self.browser.display_widget
+        self.right_area_width = 1-NetworkDisplay.list_width
 
         self.columns = urwid.Columns(
             [
                 ("weight", NetworkDisplay.list_width, self.left_area),
-                ("weight", 1-NetworkDisplay.list_width, self.right_area)
+                ("weight", self.right_area_width, self.right_area)
             ],
             dividechars=0, focus_column=0
         )
@@ -462,16 +1074,51 @@ class NetworkDisplay():
         self.shortcuts_display = NetworkDisplayShortcuts(self.app)
         self.widget = self.columns
 
+    def toggle_list(self):
+        if self.list_display != 0:
+            options = self.left_pile.options(height_type="weight", height_amount=1)
+            self.left_pile.contents[0] = (self.announce_stream_display, options)
+            self.list_display = 0
+        else:
+            options = self.left_pile.options(height_type="weight", height_amount=1)
+            self.left_pile.contents[0] = (self.known_nodes_display, options)
+            self.list_display = 1
+
+    def focus_lists(self):
+        self.columns.focus_position = 0
+
+    def reinit_known_nodes(self):
+        self.known_nodes_display = KnownNodes(self.app)
+        self.known_nodes_display.delegate = self
+        self.close_list_dialogs()
+        self.announce_stream_display.rebuild_widget_list()
+
+    def close_list_dialogs(self):
+        if self.list_display == 0:
+            options = self.left_pile.options(height_type="weight", height_amount=1)
+            self.left_pile.contents[0] = (self.announce_stream_display, options)
+        else:
+            options = self.left_pile.options(height_type="weight", height_amount=1)
+            self.left_pile.contents[0] = (self.known_nodes_display, options)
+
     def start(self):
         self.local_peer_display.start()
+        self.node_info_display.start()
         self.network_stats_display.start()
-        self.announce_stream_display.start()
+        # There seems to be an intermittent memory leak somewhere
+        # in the periodic updating here. The periodic updater should
+        # not be needed anymore, so dis
+        #self.announce_stream_display.start()
 
     def shortcuts(self):
         return self.shortcuts_display
 
     def directory_change_callback(self):
         self.announce_stream_display.rebuild_widget_list()
+        if self.known_nodes_display.no_content:
+            self.reinit_known_nodes()
+        else:
+            self.known_nodes_display.rebuild_widget_list()
 
 
 

nomadnet/vendor/Scrollable.py

@@ -0,0 +1,425 @@
+# 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
+            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/quotes.py

@@ -1,4 +1,6 @@
 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")
 ]

setup.py

@@ -23,6 +23,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.2.7', 'lxmf>=0.1.0', 'urwid>=2.1.2'],
+    python_requires='>=3.6',
 )