Git-Mirrors/NomadNet
1
0
Fork 0
mirror of https://github.com/markqvist/NomadNet.git synced 2025-07-20 22:08:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'markqvist:master' into interface-management

Browse source
This commit is contained in:
Zenith 2025-04-13 22:51:41 -04:00 • committed by GitHub
commit c415345f59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 3 additions and 2486 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nomadnet/Directory.py
View file

@ -345,7 +345,7 @@ class Directory:
if e.hosts_node: if e.hosts_node:
node_list.append(e) node_list.append(e)
node_list.sort(key = lambda e: (e.sort_rank if e.sort_rank != None else 2^32, DirectoryEntry.TRUSTED-e.trust_level, e.display_name)) node_list.sort(key = lambda e: (e.sort_rank if e.sort_rank != None else 2^32, DirectoryEntry.TRUSTED-e.trust_level, e.display_name if e.display_name != None else "_"))
return node_list return node_list
def number_of_known_nodes(self): def number_of_known_nodes(self):

2
nomadnet/NomadNetworkApp.py
View file

@ -19,7 +19,7 @@ from datetime import datetime
import RNS.vendor.umsgpack as msgpack import RNS.vendor.umsgpack as msgpack
from ._version import __version__ from ._version import __version__
from .vendor.configobj import ConfigObj from RNS.vendor.configobj import ConfigObj
class NomadNetworkApp: class NomadNetworkApp:
time_format = "%Y-%m-%d %H:%M:%S" time_format = "%Y-%m-%d %H:%M:%S"

2483
nomadnet/vendor/configobj.py vendored
View file

File diff suppressed because it is too large Load diff

2
setup.py
View file

@ -30,6 +30,6 @@ setuptools.setup(
entry_points= { entry_points= {
'console_scripts': ['nomadnet=nomadnet.nomadnet:main'] 'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
}, },
install_requires=["rns>=0.9.2", "lxmf>=0.6.2", "urwid>=2.6.16", "qrcode"], install_requires=["rns>=0.9.3", "lxmf>=0.6.2", "urwid>=2.6.16", "qrcode"],
python_requires=">=3.7", python_requires=">=3.7",
) )