Git-Mirrors/NomadNet
1
0
Fork 0
mirror of https://github.com/markqvist/NomadNet.git synced 2025-02-25 01:19:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Mark Qvist 2021-05-13 16:39:50 +02:00
parent 553ba92b4c
commit c6cf11df36
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nomadnet/NomadNetworkApp.py
View File

@ -16,7 +16,10 @@ class NomadNetworkApp:
configdir = os.path.expanduser("~")+"/.nomadnetwork" configdir = os.path.expanduser("~")+"/.nomadnetwork"
def exit_handler(self): def exit_handler(self):
RNS.log("Nomad Network Client exit handler executing...") RNS.log("Nomad Network Client exit handler executing...", RNS.LOG_VERBOSE)
RNS.log("Saving directory...", RNS.LOG_VERBOSE)
self.directory.save_to_disk()
RNS.log("Nomad Network Client exiting now", RNS.LOG_VERBOSE)
def __init__(self, configdir = None, rnsconfigdir = None): def __init__(self, configdir = None, rnsconfigdir = None):
self.version = __version__ self.version = __version__
@ -34,6 +37,8 @@ class NomadNetworkApp:
if NomadNetworkApp._shared_instance == None: if NomadNetworkApp._shared_instance == None:
NomadNetworkApp._shared_instance = self NomadNetworkApp._shared_instance = self
self.rns = RNS.Reticulum(configdir = rnsconfigdir)
self.configpath = self.configdir+"/config" self.configpath = self.configdir+"/config"
self.logfilepath = self.configdir+"/logfile" self.logfilepath = self.configdir+"/logfile"
self.storagepath = self.configdir+"/storage" self.storagepath = self.configdir+"/storage"
@ -41,6 +46,7 @@ class NomadNetworkApp:
self.cachepath = self.configdir+"/storage/cache" self.cachepath = self.configdir+"/storage/cache"
self.resourcepath = self.configdir+"/storage/resources" self.resourcepath = self.configdir+"/storage/resources"
self.conversationpath = self.configdir+"/storage/conversations" self.conversationpath = self.configdir+"/storage/conversations"
self.directorypath = self.configdir+"/storage/directory"
if not os.path.isdir(self.storagepath): if not os.path.isdir(self.storagepath):
os.makedirs(self.storagepath) os.makedirs(self.storagepath)
@ -97,7 +103,6 @@ class NomadNetworkApp:
nomadnet.panic() nomadnet.panic()
self.rns = RNS.Reticulum(configdir = rnsconfigdir)
atexit.register(self.exit_handler) atexit.register(self.exit_handler)
self.message_router = LXMF.LXMRouter() self.message_router = LXMF.LXMRouter()
@ -106,6 +111,8 @@ class NomadNetworkApp:
self.lxmf_destination = self.message_router.register_delivery_identity(self.identity) self.lxmf_destination = self.message_router.register_delivery_identity(self.identity)
RNS.log("LXMF Router ready to receive on: "+RNS.prettyhexrep(self.lxmf_destination.hash)) RNS.log("LXMF Router ready to receive on: "+RNS.prettyhexrep(self.lxmf_destination.hash))
self.directory = nomadnet.Directory.Directory(self)
nomadnet.ui.spawn(self.uimode) nomadnet.ui.spawn(self.uimode)
@ -122,20 +129,6 @@ class NomadNetworkApp:
nomadnet.Conversation.ingest(message, self) nomadnet.Conversation.ingest(message, self)
# RNS.log("\t+--- LXMF Delivery ---------------------------------------------")
# RNS.log("\t| Message ID : "+RNS.prettyhexrep(message.hash))
# RNS.log("\t| Source hash : "+RNS.prettyhexrep(message.source_hash))
# RNS.log("\t| Source instance : "+str(message.get_source()))
# RNS.log("\t| Destination hash : "+RNS.prettyhexrep(message.destination_hash))
# RNS.log("\t| Destination instance : "+str(message.get_destination()))
# RNS.log("\t| Transport Encryption : "+str(message.transport_encryption))
# RNS.log("\t| Timestamp : "+time_string)
# RNS.log("\t| Title : "+message.title_as_string())
# RNS.log("\t| Content : "+message.content_as_string())
# RNS.log("\t| Fields : "+str(message.fields))
# RNS.log("\t| Message signature : "+signature_string)
# RNS.log("\t+---------------------------------------------------------------")
def conversations(self): def conversations(self):
return nomadnet.Conversation.conversation_list(self) return nomadnet.Conversation.conversation_list(self)