Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

s/Config._cfgfile/Config.config_file/g

Browse source
This commit is contained in:
Fabio Manganiello 2023-08-19 13:13:36 +02:00
parent 181da63c89
commit 5bc82dfe64
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platypush/config/__init__.py
View file

@ -83,10 +83,10 @@ class Config:
self.dashboards = {} self.dashboards = {}
self._plugin_manifests = {} self._plugin_manifests = {}
self._backend_manifests = {} self._backend_manifests = {}
self._cfgfile = '' self.config_file = ''
self._init_cfgfile(cfgfile) self._init_cfgfile(cfgfile)
self._config = self._read_config_file(self._cfgfile) self._config = self._read_config_file(self.config_file)
self._init_secrets() self._init_secrets()
self._init_dirs() self._init_dirs()
@ -107,7 +107,7 @@ class Config:
if cfgfile is None or not os.path.exists(cfgfile): if cfgfile is None or not os.path.exists(cfgfile):
cfgfile = self._create_default_config() cfgfile = self._create_default_config()
self._cfgfile = os.path.abspath(os.path.expanduser(cfgfile)) self.config_file = os.path.abspath(os.path.expanduser(cfgfile))
def _init_logging(self): def _init_logging(self):
logging_config = { logging_config = {
@ -171,13 +171,13 @@ class Config:
if 'scripts_dir' not in self._config: if 'scripts_dir' not in self._config:
self._config['scripts_dir'] = os.path.join( self._config['scripts_dir'] = os.path.join(
os.path.dirname(self._cfgfile), 'scripts' os.path.dirname(self.config_file), 'scripts'
) )
os.makedirs(self._config['scripts_dir'], mode=0o755, exist_ok=True) os.makedirs(self._config['scripts_dir'], mode=0o755, exist_ok=True)
if 'dashboards_dir' not in self._config: if 'dashboards_dir' not in self._config:
self._config['dashboards_dir'] = os.path.join( self._config['dashboards_dir'] = os.path.join(
os.path.dirname(self._cfgfile), 'dashboards' os.path.dirname(self.config_file), 'dashboards'
) )
os.makedirs(self._config['dashboards_dir'], mode=0o755, exist_ok=True) os.makedirs(self._config['dashboards_dir'], mode=0o755, exist_ok=True)
@ -216,7 +216,6 @@ class Config:
def _read_config_file(self, cfgfile): def _read_config_file(self, cfgfile):
cfgfile_dir = os.path.dirname(os.path.abspath(os.path.expanduser(cfgfile))) cfgfile_dir = os.path.dirname(os.path.abspath(os.path.expanduser(cfgfile)))
config = {} config = {}
try: try: