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

Support explicit workdir parameter override in Config constructor.

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

27
platypush/config/__init__.py
View file

@ -65,13 +65,14 @@ class Config:
_included_files: Set[str] = set() _included_files: Set[str] = set()
def __init__(self, cfgfile: Optional[str] = None): def __init__(self, cfgfile: Optional[str] = None, workdir: Optional[str] = None):
""" """
Constructor. Always use the class as a singleton (i.e. through Constructor. Always use the class as a singleton (i.e. through
Config.init), you won't probably need to call the constructor directly Config.init), you won't probably need to call the constructor directly
:param cfgfile: Config file path (default: retrieve the first available :param cfgfile: Config file path (default: retrieve the first available
location in _cfgfile_locations). location in _cfgfile_locations).
:param workdir: Overrides the default working directory.
""" """
self.backends = {} self.backends = {}
@ -89,7 +90,7 @@ class Config:
self._config = self._read_config_file(self.config_file) self._config = self._read_config_file(self.config_file)
self._init_secrets() self._init_secrets()
self._init_dirs() self._init_dirs(workdir=workdir)
self._init_db() self._init_db()
self._init_logging() self._init_logging()
self._init_device_id() self._init_device_id()
@ -163,11 +164,16 @@ class Config:
for k, v in self._config['environment'].items(): for k, v in self._config['environment'].items():
os.environ[k] = str(v) os.environ[k] = str(v)
def _init_dirs(self): def _init_dirs(self, workdir: Optional[str] = None):
if 'workdir' not in self._config: if workdir:
self._config['workdir'] = workdir
if not self._config.get('workdir'):
self._config['workdir'] = self._workdir_location self._config['workdir'] = self._workdir_location
self._config['workdir'] = os.path.expanduser(self._config['workdir'])
os.makedirs(self._config['workdir'], exist_ok=True) self._config['workdir'] = os.path.expanduser(
os.path.expanduser(self._config['workdir'])
)
pathlib.Path(self._config['workdir']).mkdir(parents=True, exist_ok=True)
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(
@ -396,14 +402,17 @@ class Config:
@classmethod @classmethod
def _get_instance( def _get_instance(
cls, cfgfile: Optional[str] = None, force_reload: bool = False cls,
cfgfile: Optional[str] = None,
workdir: Optional[str] = None,
force_reload: bool = False,
) -> "Config": ) -> "Config":
""" """
Lazy getter/setter for the default configuration instance. Lazy getter/setter for the default configuration instance.
""" """
if force_reload or cls._instance is None: if force_reload or cls._instance is None:
cfg_args = [cfgfile] if cfgfile else [] cfg_args = [cfgfile] if cfgfile else []
cls._instance = Config(*cfg_args) cls._instance = Config(*cfg_args, workdir=workdir)
return cls._instance return cls._instance
@classmethod @classmethod
@ -478,7 +487,7 @@ class Config:
:param workdir: Override the configured working directory. :param workdir: Override the configured working directory.
:param ctrl_sock: Override the configured control socket. :param ctrl_sock: Override the configured control socket.
""" """
cfg = cls._get_instance(cfgfile, force_reload=True) cfg = cls._get_instance(cfgfile, workdir=workdir, force_reload=True)
if device_id: if device_id:
cfg.set('device_id', device_id) cfg.set('device_id', device_id)
if workdir: if workdir: