matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: Use a property factory for the server config.

Browse source
This commit is contained in:
Damir Jelić 2018-08-28 17:22:56 +02:00
parent 7c7612bdcd
commit b05c016fbd
2 changed files with 24 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main.py
View file

@ -151,6 +151,7 @@ def print_certificate_info(buff, sock, cert):
W.prnt(buff, message)
def wrap_socket(server, file_descriptor):
# type: (MatrixServer, int) -> None
sock = None # type: socket.socket

66
matrix/server.py
View file

@ -49,7 +49,22 @@ except NameError:
class ServerConfig(object):
_section_name = "{}.{}".format(SCRIPT_NAME, "server")
def option_property(name, option_type):
def bool_getter(self):
return bool(W.config_boolean(self.options[name]))
def str_getter(self):
return W.config_string(self.options[name])
def int_getter(self):
return W.config_integer(self.options[name])
if option_type == str:
return property(str_getter)
elif option_type == bool:
return property(bool_getter)
elif option_type == int:
return property(int_getter)
def __init__(self, server_name, config_ptr):
# type: (str, str) -> None
@ -94,43 +109,13 @@ class ServerConfig(object):
def _get_str_option(self, option_name):
return W.config_string(self.options[option_name])
def _get_bool_option(self, option_name):
return bool(W.config_boolean(self.options[option_name]))
@property
def config_section(self):
# type: () -> str
return "{}.{}".format(self._server_name, self._server_name)
@property
def autoconnect(self):
# type: () -> bool
return self._get_bool_option("autoconnect")
@property
def address(self):
# type: () -> str
return self._get_str_option("address")
@property
def port(self):
# type: () -> int
return W.config_integer(self.options["port"])
@property
def proxy(self):
# type: () -> str
return self._get_str_option("proxy")
@property
def ssl_verify(self):
# type: () -> bool
return self._get_bool_option("ssl_verify")
@property
def username(self):
# type: () -> str
return self._get_str_option("username")
autoconnect = option_property("autoconnect", bool)
address = option_property("address", str)
port = option_property("port", int)
proxy = option_property("proxy", str)
ssl_verify = option_property("ssl_verify", bool)
username = option_property("username", str)
device_name = option_property("device_name", str)
@property
def password(self):
@ -142,11 +127,6 @@ class ServerConfig(object):
{}
)
@property
def device_name(self):
# type: () -> str
return self._get_str_option("device_name")
class MatrixServer(object):
# pylint: disable=too-many-instance-attributes