diff --git a/Contributing.md b/Contributing.md index 9ccebd0..0f5a95e 100644 --- a/Contributing.md +++ b/Contributing.md @@ -35,6 +35,7 @@ Pull requests have a high chance of being accepted if they are: - In alignment with the [Roadmap](./Roadmap.md) or solve an open issue or feature request - Sufficiently tested to work with all API functions, and pass the standard test suite - Functionally and conceptually complete and well-designed +- Not simply formatting or code style changes - Well-documented Even new ideas and proposals that have not been approved by a maintainer, or fall outside the established roadmap, are *occasionally* accepted - if they possess the remaining of the above qualities. If not, they will be closed and removed without comments or explanation. diff --git a/Examples/Echo.py b/Examples/Echo.py index e5b3930..8cb8264 100644 --- a/Examples/Echo.py +++ b/Examples/Echo.py @@ -5,6 +5,7 @@ # of the packet. # ########################################################## +import os import argparse import RNS @@ -27,8 +28,19 @@ def server(configpath): # We must first initialise Reticulum reticulum = RNS.Reticulum(configpath) - # Randomly create a new identity for our echo server - server_identity = RNS.Identity() + # Load identity from file if it exist or randomley create + if configpath: + ifilepath = "%s/storage/identitiesy/%s" % (configpath,APP_NAME) + else: + ifilepath = "%s/storage/identities/%s" % (RNS.Reticulum.configdir,APP_NAME) + if os.path.exists(ifilepath): + # Load identity from file + server_identity = RNS.Identity.from_file(ifilepath) + RNS.log("loaded identity from file: "+ifilepath, RNS.LOG_VERBOSE) + else: + # Randomly create a new identity for our echo example + server_identity = RNS.Identity() + RNS.log("created new identity", RNS.LOG_VERBOSE) # We create a destination that clients can query. We want # to be able to verify echo replies to our clients, so we @@ -328,4 +340,4 @@ if __name__ == "__main__": client(args.destination, configarg, timeout=timeoutarg) except KeyboardInterrupt: print("") - exit() \ No newline at end of file + exit() diff --git a/Examples/Link.py b/Examples/Link.py index 6b3210c..4286003 100644 --- a/Examples/Link.py +++ b/Examples/Link.py @@ -28,8 +28,20 @@ def server(configpath): # We must first initialise Reticulum reticulum = RNS.Reticulum(configpath) - # Randomly create a new identity for our link example - server_identity = RNS.Identity() + # Load identity from file if it exist or randomley create + if configpath: + ifilepath = "%s/storage/identitiesy/%s" % (configpath,APP_NAME) + else: + ifilepath = "%s/storage/identities/%s" % (RNS.Reticulum.configdir,APP_NAME) + RNS.log("ifilepath: %s" % ifilepath) + if os.path.exists(ifilepath): + # Load identity from file + server_identity = RNS.Identity.from_file(ifilepath) + RNS.log("loaded identity from file: "+ifilepath, RNS.LOG_VERBOSE) + else: + # Randomly create a new identity for our link example + server_identity = RNS.Identity() + RNS.log("created new identity", RNS.LOG_VERBOSE) # We create a destination that clients can connect to. We # want clients to create links to this destination, so we @@ -288,4 +300,4 @@ if __name__ == "__main__": except KeyboardInterrupt: print("") - exit() \ No newline at end of file + exit()