William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-23 06:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Place config in .config dir by default

Browse Source
This commit is contained in:
Mark Qvist 2022-09-14 16:21:34 +02:00
parent 03695565ba
commit b3d85b583f
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RNS/Reticulum.py
View File

@ -136,7 +136,8 @@ class Reticulum:
# The default configuration path will be expanded to a directory # The default configuration path will be expanded to a directory
# named ".reticulum" inside the current users home directory # named ".reticulum" inside the current users home directory
configdir = os.path.expanduser("~")+"/.reticulum" userdir = os.path.expanduser("~")
configdir = None
configpath = "" configpath = ""
storagepath = "" storagepath = ""
cachepath = "" cachepath = ""
@ -163,7 +164,7 @@ class Reticulum:
RNS.exit() RNS.exit()
def __init__(self,configdir=None, loglevel=None): def __init__(self,configdir=None, loglevel=None, logdest=None):
""" """
Initialises and starts a Reticulum instance. This must be Initialises and starts a Reticulum instance. This must be
done before any other operations, and Reticulum will not done before any other operations, and Reticulum will not
@ -176,6 +177,15 @@ class Reticulum:
if configdir != None: if configdir != None:
Reticulum.configdir = configdir Reticulum.configdir = configdir
else:
if os.path.isdir(Reticulum.userdir+"/.reticulum") and os.path.isfile(Reticulum.userdir+"/.reticulum/config"):
Reticulum.configdir = Reticulum.userdir+"/.reticulum"
else:
Reticulum.configdir = Reticulum.userdir+"/.config/reticulum"
if logdest == RNS.LOG_FILE:
RNS.logdest = RNS.LOG_FILE
RNS.logfile = Reticulum.configdir+"/logfile"
Reticulum.configpath = Reticulum.configdir+"/config" Reticulum.configpath = Reticulum.configdir+"/config"
Reticulum.storagepath = Reticulum.configdir+"/storage" Reticulum.storagepath = Reticulum.configdir+"/storage"

7
RNS/Utilities/rnsd.py
View File

@ -33,11 +33,12 @@ def program_setup(configdir, verbosity = 0, quietness = 0, service = False):
targetloglevel = 3+verbosity-quietness targetloglevel = 3+verbosity-quietness
if service: if service:
RNS.logdest = RNS.LOG_FILE targetlogdest = RNS.LOG_FILE
RNS.logfile = RNS.Reticulum.configdir+"/logfile"
targetloglevel = None targetloglevel = None
else:
targetlogdest = RNS.LOG_STDOUT
reticulum = RNS.Reticulum(configdir=configdir, loglevel=targetloglevel) reticulum = RNS.Reticulum(configdir=configdir, loglevel=targetloglevel, logdest=targetlogdest)
if reticulum.is_connected_to_shared_instance: if reticulum.is_connected_to_shared_instance:
RNS.log("Started rnsd version {version} connected to another shared local instance, this is probably NOT what you want!".format(version=__version__), RNS.LOG_WARNING) RNS.log("Started rnsd version {version} connected to another shared local instance, this is probably NOT what you want!".format(version=__version__), RNS.LOG_WARNING)
else: else: