abdallah
/
server-env
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a dictionary to configure the fields

This commit is contained in:
Guewen Baconnier 2018-07-19 18:01:19 +02:00 committed by Stéphane Bidoul (ACSONE)
parent 70d6966ce0
commit 572f581bfa
No known key found for this signature in database
GPG Key ID: BCAB2555446B5B92
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server_environment/models/server_env_mixin.py
View File

@ -24,7 +24,7 @@ class ServerEnvMixin(models.AbstractModel):
@property @property
def _server_env_fields(self): def _server_env_fields(self):
return {"directory_path": 'get'} return {"directory_path": {'getter': 'get'}}
With the snippet above, the "storage.backend" model now uses a server With the snippet above, the "storage.backend" model now uses a server
environment configuration for the field ``directory_path``. environment configuration for the field ``directory_path``.
@ -56,9 +56,16 @@ class ServerEnvMixin(models.AbstractModel):
"""Dict of fields to replace by fields computed from env """Dict of fields to replace by fields computed from env
To override in models. The dictionary is: To override in models. The dictionary is:
{'name_of_the_field': 'name_of_the_configparser_getter'} {'name_of_the_field': options}
The configparser getter can be one of: get, getbool, getint Where ``options`` is a dictionary::
options = {
"getter": "getint",
}
The configparser getter can be one of: get, getbool, getint.
If options is an empty dict, "get" is used.
Example:: Example::
@ -66,10 +73,14 @@ class ServerEnvMixin(models.AbstractModel):
def _server_env_fields(self): def _server_env_fields(self):
base_fields = super()._server_env_fields base_fields = super()._server_env_fields
sftp_fields = { sftp_fields = {
"sftp_server": "get", "sftp_server": {
"sftp_port": "getint", "getter": "get",
"sftp_login": "get", },
"sftp_password": "get", "sftp_port": {
"getter": "getint",
},,
"sftp_login": {},
"sftp_password": {},
} }
sftp_fields.update(base_fields) sftp_fields.update(base_fields)
return sftp_fields return sftp_fields
@ -111,11 +122,11 @@ class ServerEnvMixin(models.AbstractModel):
read from the ``<field>_env_default`` field from database. read from the ``<field>_env_default`` field from database.
""" """
for record in self: for record in self:
for field_name, getter_name in record._server_env_fields.items(): for field_name, options in record._server_env_fields.items():
section_name = record._server_env_section_name() section_name = record._server_env_section_name()
if (section_name in serv_config if (section_name in serv_config
and field_name in serv_config[section_name]): and field_name in serv_config[section_name]):
getter_name = options.get('getter', 'get')
value = record._server_env_read_from_config( value = record._server_env_read_from_config(
section_name, field_name, getter_name section_name, field_name, getter_name
) )