mirror of
https://github.com/krateng/maloja.git
synced 2025-07-09 03:04:07 -04:00
Adjusted globalconfig to new configuration module
This commit is contained in:
krateng
parent
77667e7066
commit
b212e6b921
@ -1,11 +1,39 @@
|
|||||||
import os
|
import os
|
||||||
from doreah.settings import get_settings
|
|
||||||
from doreah.settings import config as settingsconfig
|
from doreah.settings import config as settingsconfig
|
||||||
from doreah.configuration import Configuration
|
from doreah.configuration import Configuration
|
||||||
from doreah.configuration import types as tp
|
from doreah.configuration import types as tp
|
||||||
|
|
||||||
|
|
||||||
|
# USEFUL FUNCS
|
||||||
pthj = os.path.join
|
pthj = os.path.join
|
||||||
|
|
||||||
|
def is_dir_usable(pth):
|
||||||
|
try:
|
||||||
|
os.makedirs(pth,exist_ok=True)
|
||||||
|
os.mknod(pthj(pth,".test"))
|
||||||
|
os.remove(pthj(pth,".test"))
|
||||||
|
return True
|
||||||
|
except:
|
||||||
|
return False
|
||||||
|
|
||||||
|
def get_env_vars(key,pathsuffix=[]):
|
||||||
|
return [pthj(pth,*pathsuffix) for pth in os.environ.get(key,'').split(':') if pth != '']
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# get user dirs from environment
|
||||||
|
user_dirs = {}
|
||||||
|
|
||||||
|
user_dirs["home"] = get_env_vars("HOME")
|
||||||
|
user_dirs["config"] = get_env_vars("XDG_CONFIG_HOME",['maloja'])
|
||||||
|
user_dirs["cache"] = get_env_vars("XDG_CACHE_HOME",['maloja'])
|
||||||
|
user_dirs["data"] = get_env_vars("XDG_DATA_HOME",['maloja'])
|
||||||
|
try:
|
||||||
|
user_data_dir = os.environ["XDG_DATA_HOME"].split(":")[0]
|
||||||
|
assert os.path.exists(user_data_dir)
|
||||||
|
except:
|
||||||
|
user_data_dir = os.path.join(os.environ["HOME"],".local/share/")
|
||||||
|
user_data_dir = pthj(user_data_dir,"maloja")
|
||||||
|
|
||||||
# if DATA_DIRECTORY is specified, this is the directory to use for EVERYTHING, no matter what
|
# if DATA_DIRECTORY is specified, this is the directory to use for EVERYTHING, no matter what
|
||||||
# but with asynnetrical structure, cache and logs in subfolders
|
# but with asynnetrical structure, cache and logs in subfolders
|
||||||
@ -19,188 +47,40 @@ pthj = os.path.join
|
|||||||
# if not, use the first we have permissions for
|
# if not, use the first we have permissions for
|
||||||
# after we decide which to use, fix it in settings to avoid future heuristics
|
# after we decide which to use, fix it in settings to avoid future heuristics
|
||||||
|
|
||||||
try:
|
|
||||||
HOME_DIR = os.environ["XDG_DATA_HOME"].split(":")[0]
|
|
||||||
assert os.path.exists(HOME_DIR)
|
|
||||||
except:
|
|
||||||
HOME_DIR = os.path.join(os.environ["HOME"],".local/share/")
|
|
||||||
usrfol = pthj(HOME_DIR,"maloja")
|
|
||||||
etccfg = '/etc/maloja'
|
|
||||||
varlib = '/var/lib/maloja'
|
|
||||||
varcac = '/var/cache/maloja'
|
|
||||||
varlog = '/var/log/maloja'
|
|
||||||
|
|
||||||
dir_settings = {
|
|
||||||
"config":None,
|
|
||||||
"state":None,
|
|
||||||
"logs":None,
|
|
||||||
"cache":None,
|
|
||||||
# "clients":None,
|
|
||||||
# "rules":None,
|
|
||||||
# "settings":None,
|
|
||||||
# "auth":None,
|
|
||||||
# "backups":None,
|
|
||||||
# "images":None,
|
|
||||||
# "scrobbles":None,
|
|
||||||
# "logs":None,
|
|
||||||
# "cache":None
|
|
||||||
}
|
|
||||||
|
|
||||||
dir_options = {
|
### STEP 1 - find out where the settings file is
|
||||||
"config":[
|
# environment variables
|
||||||
|
maloja_dir_config = os.environ.get("MALOJA_DATA_DIRECTORY") or os.environ.get("MALOJA_DIRECTORY_CONFIG")
|
||||||
|
|
||||||
|
if maloja_dir_config is None:
|
||||||
|
potentialpaths = [
|
||||||
"/etc/maloja",
|
"/etc/maloja",
|
||||||
usrfol
|
user_data_dir
|
||||||
],
|
|
||||||
"state":[
|
|
||||||
"/var/lib/maloja",
|
|
||||||
"/etc/maloja",
|
|
||||||
usrfol
|
|
||||||
],
|
|
||||||
"logs":[
|
|
||||||
"/var/log/maloja",
|
|
||||||
"/etc/maloja/logs",
|
|
||||||
pthj(usrfol,"logs")
|
|
||||||
],
|
|
||||||
"cache":[
|
|
||||||
"/var/cache/maloja",
|
|
||||||
"/etc/maloja/cache",
|
|
||||||
pthj(usrfol,"cache")
|
|
||||||
]
|
]
|
||||||
}
|
# check if it exists anywhere else
|
||||||
|
for pth in potentialpaths:
|
||||||
sentinels = {
|
if os.path.exists(pthj(pth,"settings")):
|
||||||
"config":"settings",
|
maloja_dir_config = pth
|
||||||
"state":"scrobbles",
|
|
||||||
"logs":None,
|
|
||||||
"cache":None,
|
|
||||||
}
|
|
||||||
|
|
||||||
# check environ variables
|
|
||||||
stng_data = get_settings("DATA_DIRECTORY",files=[],environ_prefix="MALOJA_")
|
|
||||||
if stng_data is not None:
|
|
||||||
dir_settings['config'] = stng_data
|
|
||||||
dir_settings['state'] = stng_data
|
|
||||||
dir_settings['cache'] = pthj(stng_data,'cache')
|
|
||||||
dir_settings['logs'] = pthj(stng_data,'logs')
|
|
||||||
else:
|
|
||||||
dir_settings['config'], dir_settings['state'], dir_settings['cache'], dir_settings['logs'] = get_settings("DIRECTORY_CONFIG","DIRECTORY_STATE","DIRECTORY_LOGS","DIRECTORY_CACHE",files=[],environ_prefix="MALOJA_")
|
|
||||||
# as soon as we know the config directory, we can load from settings file
|
|
||||||
if dir_settings['config'] is not None:
|
|
||||||
settingsfiles = [pthj(dir_settings['config'],'settings','default.ini'),pthj(dir_settings['config'],'settings','settings.ini')]
|
|
||||||
dir_settings['config'], dir_settings['state'], dir_settings['cache'], dir_settings['logs'] = get_settings("DIRECTORY_CONFIG","DIRECTORY_STATE","DIRECTORY_LOGS","DIRECTORY_CACHE",files=settingsfiles,environ_prefix="MALOJA_")
|
|
||||||
|
|
||||||
|
|
||||||
# now to the stuff no setting has explicitly defined
|
|
||||||
for dirtype in dir_settings:
|
|
||||||
if dir_settings[dirtype] is None:
|
|
||||||
for option in dir_options[dirtype]:
|
|
||||||
if os.path.exists(option):
|
|
||||||
# check if this is really the directory used for this category (/etc/maloja could be used for state or just config)
|
|
||||||
if sentinels[dirtype] is None or os.path.exists(pthj(option,sentinels[dirtype])):
|
|
||||||
dir_settings[dirtype] = option
|
|
||||||
break
|
break
|
||||||
|
# new installation, pick where to put it
|
||||||
# if no directory seems to exist, use the first writable one
|
else:
|
||||||
for dirtype in dir_settings:
|
# test if we can write to that location
|
||||||
if dir_settings[dirtype] is None:
|
for pth in potentialpaths:
|
||||||
for option in dir_options[dirtype]:
|
if is_dir_usable(pth):
|
||||||
try:
|
maloja_dir_config = pth
|
||||||
os.makedirs(option,exist_ok=True)
|
|
||||||
os.mknod(pthj(option,".test"))
|
|
||||||
os.remove(pthj(option,".test"))
|
|
||||||
dir_settings[dirtype] = option
|
|
||||||
break
|
break
|
||||||
except:
|
else:
|
||||||
pass
|
print("Could not find a proper path to put settings file. Please check your permissions!")
|
||||||
|
|
||||||
|
oldsettingsfile = pthj(maloja_dir_config,"settings","settings.ini")
|
||||||
|
newsettingsfile = pthj(maloja_dir_config,"settings.ini")
|
||||||
|
|
||||||
|
if os.path.exists(oldsettingsfile):
|
||||||
|
os.rename(oldsettingsfile,newsettingsfile)
|
||||||
|
|
||||||
|
|
||||||
assert all((dir_settings[s] is not None) for s in dir_settings)
|
### STEP 2 - create settings object
|
||||||
|
|
||||||
|
|
||||||
data_directories = {
|
|
||||||
"auth":pthj(dir_settings['state'],"auth"),
|
|
||||||
"backups":pthj(dir_settings['state'],"backups"),
|
|
||||||
"images":pthj(dir_settings['state'],"images"),
|
|
||||||
"scrobbles":pthj(dir_settings['state'],"scrobbles"),
|
|
||||||
"rules":pthj(dir_settings['config'],"rules"),
|
|
||||||
"clients":pthj(dir_settings['config'],"clients"),
|
|
||||||
"settings":pthj(dir_settings['config'],"settings"),
|
|
||||||
"css":pthj(dir_settings['config'],"custom_css"),
|
|
||||||
"logs":pthj(dir_settings['logs']),
|
|
||||||
"cache":pthj(dir_settings['cache']),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
data_dir = {
|
|
||||||
k:lambda *x,k=k: pthj(data_directories[k],*x) for k in data_directories
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### DOREAH CONFIGURATION
|
|
||||||
|
|
||||||
from doreah import config
|
|
||||||
|
|
||||||
config(
|
|
||||||
settings={
|
|
||||||
"files":[
|
|
||||||
data_dir['settings']("default.ini"),
|
|
||||||
data_dir['settings']("settings.ini")
|
|
||||||
],
|
|
||||||
"environ_prefix":"MALOJA_"
|
|
||||||
},
|
|
||||||
caching={
|
|
||||||
"folder": data_dir['cache']()
|
|
||||||
},
|
|
||||||
auth={
|
|
||||||
"multiuser":False,
|
|
||||||
"cookieprefix":"maloja",
|
|
||||||
"stylesheets":["/style.css"],
|
|
||||||
"dbfile":data_dir['auth']("auth.ddb")
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
# because we loaded a doreah module already before setting the config, we need to to that manually
|
|
||||||
settingsconfig._readpreconfig()
|
|
||||||
|
|
||||||
config(
|
|
||||||
logging={
|
|
||||||
"logfolder": data_dir['logs']() if get_settings("LOGGING") else None
|
|
||||||
},
|
|
||||||
regular={
|
|
||||||
"autostart": False,
|
|
||||||
"offset": get_settings("TIMEZONE")
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
settingsconfig._readpreconfig()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# thumbor
|
|
||||||
|
|
||||||
THUMBOR_SERVER, THUMBOR_SECRET = get_settings("THUMBOR_SERVER","THUMBOR_SECRET")
|
|
||||||
try:
|
|
||||||
USE_THUMBOR = THUMBOR_SERVER is not None and THUMBOR_SECRET is not None
|
|
||||||
if USE_THUMBOR:
|
|
||||||
from libthumbor import CryptoURL
|
|
||||||
THUMBOR_GENERATOR = CryptoURL(key=THUMBOR_SECRET)
|
|
||||||
OWNURL = get_settings("PUBLIC_URL")
|
|
||||||
assert OWNURL is not None
|
|
||||||
except:
|
|
||||||
USE_THUMBOR = False
|
|
||||||
log("Thumbor could not be initialized. Is libthumbor installed?")
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# new config
|
|
||||||
|
|
||||||
|
|
||||||
malojaconfig = Configuration(
|
malojaconfig = Configuration(
|
||||||
@ -270,8 +150,129 @@ malojaconfig = Configuration(
|
|||||||
"time_format":(tp.String(), "Time Format", "%d. %b %Y %I:%M %p")
|
"time_format":(tp.String(), "Time Format", "%d. %b %Y %I:%M %p")
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
configfile=data_dir['settings']("settings.ini"),
|
configfile=newsettingsfile,
|
||||||
save_endpoint="/apis/mlj_1/settings",
|
save_endpoint="/apis/mlj_1/settings",
|
||||||
env_prefix="MALOJA_"
|
env_prefix="MALOJA_"
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
malojaconfig["DIRECTORY_CONFIG"] = maloja_dir_config
|
||||||
|
|
||||||
|
|
||||||
|
### STEP 3 - check all possible folders for files (old installation)
|
||||||
|
|
||||||
|
directory_info = {
|
||||||
|
"cache":{
|
||||||
|
"sentinel":"dummy",
|
||||||
|
"possible_folders":[
|
||||||
|
"/var/cache/maloja",
|
||||||
|
"$HOME/.local/share/maloja/cache"
|
||||||
|
],
|
||||||
|
"setting":"directory_cache"
|
||||||
|
},
|
||||||
|
"state":{
|
||||||
|
"sentinel":"scrobbles",
|
||||||
|
"possible_folders":[
|
||||||
|
"/var/lib/maloja",
|
||||||
|
"$HOME/.local/share/maloja"
|
||||||
|
],
|
||||||
|
"setting":"directory_state"
|
||||||
|
},
|
||||||
|
"logs":{
|
||||||
|
"sentinel":"dbfix",
|
||||||
|
"possible_folders":[
|
||||||
|
"/var/log/maloja",
|
||||||
|
"$HOME/.local/share/maloja/logs"
|
||||||
|
],
|
||||||
|
"setting":"directory_logs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
for datatype in directory_info:
|
||||||
|
info = directory_info[datatype]
|
||||||
|
|
||||||
|
# check if we already have a user-specified setting
|
||||||
|
# default obv shouldn't count here, so use get_specified
|
||||||
|
if malojaconfig.get_specified(info['setting']) is None and malojaconfig.get_specified('DATA_DIRECTORY') is None:
|
||||||
|
# check each possible folder if its used
|
||||||
|
for p in info['possible_folders']:
|
||||||
|
if os.path.exists(pthj(p,info['sentinel'])):
|
||||||
|
print(p,"has been determined as maloja's folder for",datatype)
|
||||||
|
malojaconfig[info['setting']] = p
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
print("Could not find previous",datatype,"folder")
|
||||||
|
# check which one we can use
|
||||||
|
for p in info['possible_folders']:
|
||||||
|
if is_dir_usable(p):
|
||||||
|
print(p,"has been selected as maloja's folder for",datatype)
|
||||||
|
malojaconfig[info['setting']] = p
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
print("No folder can be used for",datatype)
|
||||||
|
print("This should not happen!")
|
||||||
|
|
||||||
|
if malojaconfig['DATA_DIRECTORY'] is None:
|
||||||
|
top_dirs = {
|
||||||
|
"config":malojaconfig['DIRECTORY_CONFIG'],
|
||||||
|
"state":malojaconfig['DIRECTORY_STATE'],
|
||||||
|
"cache":malojaconfig['DIRECTORY_CACHE'],
|
||||||
|
"logs":malojaconfig['DIRECTORY_LOGS'],
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
top_dirs = {
|
||||||
|
"config":malojaconfig['DATA_DIRECTORY'],
|
||||||
|
"state":malojaconfig['DATA_DIRECTORY'],
|
||||||
|
"cache":pthj(malojaconfig['DATA_DIRECTORY'],"cache"),
|
||||||
|
"logs":pthj(malojaconfig['DATA_DIRECTORY'],"logs"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
data_directories = {
|
||||||
|
"auth":pthj(top_dirs['state'],"auth"),
|
||||||
|
"backups":pthj(top_dirs['state'],"backups"),
|
||||||
|
"images":pthj(top_dirs['state'],"images"),
|
||||||
|
"scrobbles":pthj(top_dirs['state'],"scrobbles"),
|
||||||
|
"rules":pthj(top_dirs['config'],"rules"),
|
||||||
|
"clients":pthj(top_dirs['config'],"clients"),
|
||||||
|
"settings":pthj(top_dirs['config']),
|
||||||
|
"css":pthj(top_dirs['config'],"custom_css"),
|
||||||
|
"logs":pthj(top_dirs['logs']),
|
||||||
|
"cache":pthj(top_dirs['cache']),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
data_dir = {
|
||||||
|
k:lambda *x,k=k: pthj(data_directories[k],*x) for k in data_directories
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### DOREAH CONFIGURATION
|
||||||
|
|
||||||
|
from doreah import config
|
||||||
|
|
||||||
|
config(
|
||||||
|
caching={
|
||||||
|
"folder": data_dir['cache']()
|
||||||
|
},
|
||||||
|
auth={
|
||||||
|
"multiuser":False,
|
||||||
|
"cookieprefix":"maloja",
|
||||||
|
"stylesheets":["/style.css"],
|
||||||
|
"dbfile":data_dir['auth']("auth.ddb")
|
||||||
|
},
|
||||||
|
logging={
|
||||||
|
"logfolder": data_dir['logs']() if malojaconfig["LOGGING"] else None
|
||||||
|
},
|
||||||
|
regular={
|
||||||
|
"autostart": False,
|
||||||
|
"offset": malojaconfig["TIMEZONE"]
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
settingsconfig._readpreconfig()
|
||||||
|
|||||||
@ -43,7 +43,7 @@ def setup():
|
|||||||
key = prompt("",types=(str,),default=False,skip=SKIP)
|
key = prompt("",types=(str,),default=False,skip=SKIP)
|
||||||
malojaconfig[k] = key
|
malojaconfig[k] = key
|
||||||
else:
|
else:
|
||||||
print("\t" + col['green'](apikeys[k]) + " found.")
|
print("\t" + col['lawngreen'](apikeys[k]) + " found.")
|
||||||
|
|
||||||
|
|
||||||
# OWN API KEY
|
# OWN API KEY
|
||||||
@ -56,7 +56,6 @@ def setup():
|
|||||||
keyfile.write(key + "\t" + "Default Generated Key")
|
keyfile.write(key + "\t" + "Default Generated Key")
|
||||||
|
|
||||||
# PASSWORD
|
# PASSWORD
|
||||||
defaultpassword = malojaconfig["DEFAULT_PASSWORD"]
|
|
||||||
forcepassword = malojaconfig["FORCE_PASSWORD"]
|
forcepassword = malojaconfig["FORCE_PASSWORD"]
|
||||||
# this is mainly meant for docker, supply password via environment variable
|
# this is mainly meant for docker, supply password via environment variable
|
||||||
|
|
||||||
@ -66,23 +65,12 @@ def setup():
|
|||||||
print("Password has been set.")
|
print("Password has been set.")
|
||||||
elif auth.defaultuser.checkpw("admin"):
|
elif auth.defaultuser.checkpw("admin"):
|
||||||
# if the actual pw is admin, it means we've never set this up properly (eg first start after update)
|
# if the actual pw is admin, it means we've never set this up properly (eg first start after update)
|
||||||
if defaultpassword is None:
|
|
||||||
# non-docker installation or user didn't set environment variable
|
|
||||||
defaultpassword = randomstring(32)
|
|
||||||
newpw = prompt("Please set a password for web backend access. Leave this empty to generate a random password.",skip=SKIP,secret=True)
|
newpw = prompt("Please set a password for web backend access. Leave this empty to generate a random password.",skip=SKIP,secret=True)
|
||||||
if newpw is None:
|
if newpw is None:
|
||||||
newpw = defaultpassword
|
newpw = randomstring(32)
|
||||||
print("Generated password:",newpw)
|
print("Generated password:",newpw)
|
||||||
else:
|
|
||||||
# docker installation (or settings file, but don't do that)
|
|
||||||
# we still 'ask' the user to set one, but for docker this will be skipped
|
|
||||||
newpw = prompt("Please set a password for web backend access. Leave this empty to use the default password.",skip=SKIP,default=defaultpassword,secret=True)
|
|
||||||
auth.defaultuser.setpw(newpw)
|
auth.defaultuser.setpw(newpw)
|
||||||
if malojaconfig["NAME"] == "Generic Maloja User":
|
|
||||||
name = prompt("Please enter your name. This will be displayed e.g. when comparing your charts to another user. Leave this empty if you would not like to specify a name right now.",default="Maloja User",skip=SKIP)
|
|
||||||
malojaconfig["NAME"] = name
|
|
||||||
# setting this as an actual setting instead of leaving the default fallback
|
|
||||||
# so we know not to ask again
|
|
||||||
|
|
||||||
if malojaconfig["SEND_STATS"] is None:
|
if malojaconfig["SEND_STATS"] is None:
|
||||||
answer = ask("I would like to know how many people use Maloja. Would it be okay to send a daily ping to my server (this contains no data that isn't accessible via your web interface already)?",default=True,skip=SKIP)
|
answer = ask("I would like to know how many people use Maloja. Would it be okay to send a daily ping to my server (this contains no data that isn't accessible via your web interface already)?",default=True,skip=SKIP)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user