nomadnet - pypi Package Compare versions

Comparing version 0.9.1 to 0.9.2

nomadnet.egg-info/PKG-INFO

 Metadata-Version: 2.4
 Name: nomadnet
-Version: 0.9.1
+Version: 0.9.2
 Summary: Communicate Freely
@@ -14,4 +14,4 @@ Home-page: https://github.com/markqvist/nomadnet
 License-File: LICENSE
-Requires-Dist: rns>=1.0.1
-Requires-Dist: lxmf>=0.9.1
+Requires-Dist: rns>=1.0.4
+Requires-Dist: lxmf>=0.9.3
 Requires-Dist: urwid>=2.6.16
@@ -18,0 +18,0 @@ Requires-Dist: qrcode

nomadnet.egg-info/requires.txt

@@ -1,4 +0,4 @@
-rns>=1.0.1
-lxmf>=0.9.1
+rns>=1.0.4
+lxmf>=0.9.3
 urwid>=2.6.16
 qrcode

nomadnet/__init__.py

@@ -11,6 +11,8 @@ import os
 
-modules = glob.glob(os.path.dirname(__file__)+"/*.py")
-__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
+py_modules  = glob.glob(os.path.dirname(__file__)+"/*.py")
+pyc_modules = glob.glob(os.path.dirname(__file__)+"/*.pyc")
+modules     = py_modules+pyc_modules
+__all__ = list(set([os.path.basename(f).replace(".pyc", "").replace(".py", "") for f in modules if not (f.endswith("__init__.py") or f.endswith("__init__.pyc"))]))
 
 def panic():
     os._exit(255)

nomadnet/_version.py

@@ -1,1 +0,1 @@
-__version__ = "0.9.1"
+__version__ = "0.9.2"

nomadnet/NomadNetworkApp.py

@@ -248,4 +248,7 @@ import os
             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)
+                RNS.logdest = RNS.LOG_STDOUT
+                RNS.log(f"Could not load local peer settings from {self.peersettingspath}", RNS.LOG_ERROR)
+                RNS.log(f"The contained exception was: {e}", RNS.LOG_ERROR)
+                RNS.log(f"This likely means that the peer settings file has become corrupt.", RNS.LOG_ERROR)
+                RNS.log(f"You can try deleting the file at {self.peersettingspath} and restarting nomadnet.", RNS.LOG_ERROR)
                 nomadnet.panic()
@@ -562,5 +565,5 @@ else:
     def save_peer_settings(self):
-        file = open(self.peersettingspath, "wb")
-        file.write(msgpack.packb(self.peer_settings))
-        file.close()
+        tmp_path = f"{self.peersettingspath}.tmp"
+        with open(tmp_path, "wb") as file: file.write(msgpack.packb(self.peer_settings))
+        os.replace(tmp_path, self.peersettingspath)
 
@@ -810,3 +813,3 @@ def lxmf_delivery(self, message):
                             else:
-                                self.config["textui"]["intro_time"] = self.config["textui"].as_int("intro_time")
+                                self.config["textui"]["intro_time"] = self.config["textui"].as_float("intro_time")
 
@@ -813,0 +816,0 @@ if not "intro_text" in self.config["textui"]:

nomadnet/ui/__init__.py

@@ -6,4 +6,6 @@ import os
 
-modules = glob.glob(os.path.dirname(__file__)+"/*.py")
-__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
+py_modules  = glob.glob(os.path.dirname(__file__)+"/*.py")
+pyc_modules = glob.glob(os.path.dirname(__file__)+"/*.pyc")
+modules     = py_modules+pyc_modules
+__all__ = list(set([os.path.basename(f).replace(".pyc", "").replace(".py", "") for f in modules if not (f.endswith("__init__.py") or f.endswith("__init__.pyc"))]))
 
@@ -10,0 +12,0 @@

nomadnet/ui/textui/__init__.py

 import os
 import glob
 
-modules = glob.glob(os.path.dirname(__file__)+"/*.py")
-__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
+py_modules  = glob.glob(os.path.dirname(__file__)+"/*.py")
+pyc_modules = glob.glob(os.path.dirname(__file__)+"/*.pyc")
+modules     = py_modules+pyc_modules
+__all__ = list(set([os.path.basename(f).replace(".pyc", "").replace(".py", "") for f in modules if not (f.endswith("__init__.py") or f.endswith("__init__.pyc"))]))

nomadnet/ui/textui/Browser.py

@@ -700,3 +700,3 @@ import RNS
             try:
-                self.retrieve_url(e_url.get_edit_text())
+                self.retrieve_url(e_url.get_edit_text().strip())
             except Exception as e:
@@ -803,3 +803,3 @@ self.browser_footer = urwid.Text("Could not open link: "+str(e))
             bgpos = self.markup.find("#!bg=")
-            if bgpos:
+            if bgpos >= 0:
                 endpos = self.markup.find("\n", bgpos)
@@ -812,3 +812,3 @@ if endpos-(bgpos+5) == 3:
             fgpos = self.markup.find("#!fg=")
-            if fgpos:
+            if fgpos >= 0:
                 endpos = self.markup.find("\n", fgpos)
@@ -872,3 +872,3 @@ if endpos-(fgpos+5) == 3:
                 bgpos = self.markup.find("#!bg=")
-                if bgpos:
+                if bgpos >= 0:
                     endpos = self.markup.find("\n", bgpos)
@@ -881,3 +881,3 @@ if endpos-(bgpos+5) == 3:
                 fgpos = self.markup.find("#!fg=")
-                if fgpos:
+                if fgpos >= 0:
                     endpos = self.markup.find("\n", fgpos)
@@ -1026,3 +1026,3 @@ if endpos-(fgpos+5) == 3:
             bgpos = self.markup.find("#!bg=")
-            if bgpos:
+            if bgpos >= 0:
                 endpos = self.markup.find("\n", bgpos)
@@ -1035,3 +1035,3 @@ if endpos-(bgpos+5) == 3:
             fgpos = self.markup.find("#!fg=")
-            if fgpos:
+            if fgpos >= 0:
                 endpos = self.markup.find("\n", fgpos)
@@ -1038,0 +1038,0 @@ if endpos-(fgpos+5) == 3:

nomadnet/ui/textui/Conversations.py

@@ -334,3 +334,3 @@ import RNS
                 display_name = e_name.get_edit_text()
-                source_hash_text = e_id.get_edit_text()
+                source_hash_text = e_id.get_edit_text().strip()
                 source_hash = bytes.fromhex(source_hash_text)
@@ -416,3 +416,3 @@ trust_level = DirectoryEntry.UNTRUSTED
                 duplicate_signal = "duplicate_lxm"
-                lxm_uri = e_uri.get_edit_text()
+                lxm_uri = e_uri.get_edit_text().strip()
 
@@ -419,0 +419,0 @@ ingest_result = self.app.message_router.ingest_lxm_uri(

nomadnet/ui/textui/MicronParser.py

@@ -490,16 +490,10 @@ import nomadnet
                     elif c == "c":
-                        if state["align"] != "center":
-                            state["align"] = "center"
-                        else:
-                            state["align"] = state["default_align"]
+                        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"]
+                        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"]
+                        if state["align"] != "right": state["align"] = "right"
+                        # else: state["align"] = state["default_align"]
                     elif c == "a":
@@ -653,3 +647,3 @@ state["align"] = state["default_align"]
                                 if url_delegate != None:
-                                    linkspec = LinkSpec(link_url, orig_spec)
+                                    linkspec = LinkSpec(link_url, orig_spec, cm=cm)
                                     if link_fields != "":
@@ -701,7 +695,7 @@ lf = link_fields.split("|")
 class LinkSpec(urwid.AttrSpec):
-    def __init__(self, link_target, orig_spec):
+    def __init__(self, link_target, orig_spec, cm=256):
         self.link_target = link_target
         self.link_fields = None
 
-        super().__init__(orig_spec.foreground, orig_spec.background)
+        super().__init__(orig_spec.foreground, orig_spec.background, colors=cm)
 
@@ -708,0 +702,0 @@

nomadnet/vendor/__init__.py

 import os
 import glob
 
-modules = glob.glob(os.path.dirname(__file__)+"/*.py")
-__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
+py_modules  = glob.glob(os.path.dirname(__file__)+"/*.py")
+pyc_modules = glob.glob(os.path.dirname(__file__)+"/*.pyc")
+modules     = py_modules+pyc_modules
+__all__ = list(set([os.path.basename(f).replace(".pyc", "").replace(".py", "") for f in modules if not (f.endswith("__init__.py") or f.endswith("__init__.pyc"))]))

PKG-INFO

 Metadata-Version: 2.4
 Name: nomadnet
-Version: 0.9.1
+Version: 0.9.2
 Summary: Communicate Freely
@@ -14,4 +14,4 @@ Home-page: https://github.com/markqvist/nomadnet
 License-File: LICENSE
-Requires-Dist: rns>=1.0.1
-Requires-Dist: lxmf>=0.9.1
+Requires-Dist: rns>=1.0.4
+Requires-Dist: lxmf>=0.9.3
 Requires-Dist: urwid>=2.6.16
@@ -18,0 +18,0 @@ Requires-Dist: qrcode

setup.py

@@ -33,4 +33,4 @@ import setuptools
     },
-    install_requires=["rns>=1.0.1", "lxmf>=0.9.1", "urwid>=2.6.16", "qrcode"],
+    install_requires=["rns>=1.0.4", "lxmf>=0.9.3", "urwid>=2.6.16", "qrcode"],
     python_requires=">=3.7",
 )

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

1134435

0.09%

Lines of code

13018

0.04%