sh-edraft.de/sh_discord_bot
5
1
Fork 1
Code Issues 26 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Removed from_dict from settings stuff #127

Browse Source
This commit is contained in:
Sven Heidemann
2023-07-19 12:15:57 +02:00
parent 05a2ea9b18
commit c782c11b6d
20 changed files with 126 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kdb-bot/src/modules/permission/configuration/permission_server_settings.py
View File

@@ -1,16 +1,13 @@
import traceback
from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
from cpl_core.console import Console
class PermissionServerSettings(ConfigurationModelABC):
def __init__(self):
def __init__(self, id: int = None, admin_role_ids: list = None, moderator_role_ids: list = None):
ConfigurationModelABC.__init__(self)
self._id: int = 0
self._admin_roles: list[int] = []
self._moderator_roles: list[int] = []
self._id: int = 0 if id is None else id
self._admin_roles: list[int] = [] if admin_role_ids is None else admin_role_ids
self._moderator_roles: list[int] = [] if moderator_role_ids is None else moderator_role_ids
@property
def id(self) -> int:
@@ -23,15 +20,3 @@ class PermissionServerSettings(ConfigurationModelABC):
@property
def moderator_roles(self) -> list[int]:
return self._moderator_roles
def from_dict(self, settings: dict):
try:
self._id = int(settings["Id"])
for index in settings["AdminRoleIds"]:
self._admin_roles.append(int(index))
for index in settings["ModeratorRoleIds"]:
self._moderator_roles.append(int(index))
except Exception as e:
Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {self.__name__} settings")
Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")

22
kdb-bot/src/modules/permission/configuration/permission_settings.py
View File

@@ -1,7 +1,5 @@
import traceback
from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
from cpl_core.console import Console
from cpl_core.utils.json_processor import JSONProcessor
from cpl_query.extension import List
from modules.permission.configuration.permission_server_settings import (
@@ -10,24 +8,14 @@ from modules.permission.configuration.permission_server_settings import (
class PermissionSettings(ConfigurationModelABC):
def __init__(self):
def __init__(self, **kwargs: dict):
ConfigurationModelABC.__init__(self)
self._servers: List[PermissionServerSettings] = List()
for s in kwargs:
kwargs[s]["Id"] = s
self._servers.append(JSONProcessor.process(PermissionServerSettings, kwargs[s]))
@property
def servers(self) -> List[PermissionServerSettings]:
return self._servers
def from_dict(self, settings: dict):
try:
servers = List(PermissionServerSettings)
for s in settings:
st = PermissionServerSettings()
settings[s]["Id"] = s
st.from_dict(settings[s])
servers.append(st)
self._servers = servers
except Exception as e:
Console.error(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
Console.error(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")