A-0.1 - Modularer Aufbau #13
3
.gitignore
vendored
3
.gitignore
vendored
@ -138,3 +138,6 @@ dmypy.json
|
|||||||
# Cython debug symbols
|
# Cython debug symbols
|
||||||
cython_debug/
|
cython_debug/
|
||||||
|
|
||||||
|
# gismo
|
||||||
|
g-env/
|
||||||
|
|
||||||
|
2
LICENSE
2
LICENSE
@ -1,4 +1,4 @@
|
|||||||
MIT License Copyright (c) <year> <copyright holders>
|
MIT License Copyright (c) 2021-2022 sh-edraft.de
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
from cpl_core.application import ApplicationABC
|
|
||||||
from cpl_core.configuration import ConfigurationABC
|
|
||||||
from cpl_core.console import Console
|
|
||||||
from cpl_core.dependency_injection import ServiceProviderABC
|
|
||||||
|
|
||||||
|
|
||||||
class Application(ApplicationABC):
|
class Application(ApplicationABC):
|
||||||
|
|
||||||
def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
|
def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
|
||||||
ApplicationABC.__init__(self, config, services)
|
ApplicationABC.__init__(self, config, services)
|
||||||
|
|
||||||
|
self._bot: BotService = services.get_service(BotServiceABC)
|
||||||
|
self._logger: LoggerABC = services.get_service(LoggerABC)
|
||||||
|
|
||||||
async def configure(self):
|
async def configure(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
async def main(self):
|
async def main(self):
|
||||||
Console.write_line('Hello World')
|
try:
|
||||||
|
await self._bot.run()
|
||||||
|
except Exception as e:
|
||||||
|
self._logger.error(__name__, 'A fatal error occured starting the bot', e)
|
||||||
|
15
src/gismo/appsettings.development.json
Normal file
15
src/gismo/appsettings.development.json
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"TimeFormatSettings": {
|
||||||
|
"DateFormat": "%Y-%m-%d",
|
||||||
|
"TimeFormat": "%H:%M:%S",
|
||||||
|
"DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
|
||||||
|
"DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
|
||||||
|
},
|
||||||
|
|
||||||
|
"LoggingSettings": {
|
||||||
|
"Path": "logs/",
|
||||||
|
"Filename": "log_$start_time.log",
|
||||||
|
"ConsoleLogLevel": "TRACE",
|
||||||
|
"FileLogLevel": "TRACE"
|
||||||
|
}
|
||||||
|
}
|
5
src/gismo/appsettings.edrafts-pc.json
Normal file
5
src/gismo/appsettings.edrafts-pc.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"Discord": {
|
||||||
|
"Token": ""
|
||||||
|
}
|
||||||
|
}
|
15
src/gismo/appsettings.production.json
Normal file
15
src/gismo/appsettings.production.json
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"TimeFormatSettings": {
|
||||||
|
"DateFormat": "%Y-%m-%d",
|
||||||
|
"TimeFormat": "%H:%M:%S",
|
||||||
|
"DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
|
||||||
|
"DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
|
||||||
|
},
|
||||||
|
|
||||||
|
"LoggingSettings": {
|
||||||
|
"Path": "logs/",
|
||||||
|
"Filename": "log_$start_time.log",
|
||||||
|
"ConsoleLogLevel": "ERROR",
|
||||||
|
"FileLogLevel": "WARN"
|
||||||
|
}
|
||||||
|
}
|
15
src/gismo/appsettings.staging.json
Normal file
15
src/gismo/appsettings.staging.json
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"TimeFormatSettings": {
|
||||||
|
"DateFormat": "%Y-%m-%d",
|
||||||
|
"TimeFormat": "%H:%M:%S",
|
||||||
|
"DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
|
||||||
|
"DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
|
||||||
|
},
|
||||||
|
|
||||||
|
"LoggingSettings": {
|
||||||
|
"Path": "logs/",
|
||||||
|
"Filename": "log_$start_time.log",
|
||||||
|
"ConsoleLogLevel": "DEBUG",
|
||||||
|
"FileLogLevel": "DEBUG"
|
||||||
|
}
|
||||||
|
}
|
@ -17,7 +17,8 @@
|
|||||||
"LicenseDescription": "MIT, see LICENSE for more details.",
|
"LicenseDescription": "MIT, see LICENSE for more details.",
|
||||||
"Dependencies": [
|
"Dependencies": [
|
||||||
"sh_cpl-core>=2021.10.2",
|
"sh_cpl-core>=2021.10.2",
|
||||||
"sh_cpl-query>=2021.10.2"
|
"sh_cpl-query>=2021.10.2",
|
||||||
|
"discord.py==1.7.3"
|
||||||
],
|
],
|
||||||
"PythonVersion": ">=3.9.2",
|
"PythonVersion": ">=3.9.2",
|
||||||
"PythonPath": {
|
"PythonPath": {
|
||||||
|
@ -2,8 +2,8 @@ import asyncio
|
|||||||
|
|
||||||
from cpl_core.application import ApplicationBuilder
|
from cpl_core.application import ApplicationBuilder
|
||||||
|
|
||||||
from gismo.application import Application
|
from application import Application
|
||||||
from gismo.startup import Startup
|
from startup import Startup
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
async def main():
|
||||||
|
@ -3,6 +3,9 @@ from cpl_core.configuration import ConfigurationABC
|
|||||||
from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
|
from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
|
||||||
from cpl_core.environment import ApplicationEnvironment
|
from cpl_core.environment import ApplicationEnvironment
|
||||||
|
|
||||||
|
from gismo_core.abc.bot_service_abc import BotServiceABC
|
||||||
|
from gismo_core.services.bot_service import BotService
|
||||||
|
|
||||||
|
|
||||||
class Startup(StartupABC):
|
class Startup(StartupABC):
|
||||||
|
|
||||||
@ -10,7 +13,17 @@ class Startup(StartupABC):
|
|||||||
StartupABC.__init__(self)
|
StartupABC.__init__(self)
|
||||||
|
|
||||||
async def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
|
async def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
|
||||||
|
configuration.add_environment_variables('GISMO_')
|
||||||
|
configuration.add_console_arguments()
|
||||||
|
configuration.add_json_file(f'appsettings.json', optional=False)
|
||||||
|
configuration.add_json_file(f'appsettings.{environment.environment_name}.json', optional=True)
|
||||||
|
configuration.add_json_file(f'appsettings.{environment.host_name}.json', optional=True)
|
||||||
|
|
||||||
return configuration
|
return configuration
|
||||||
|
|
||||||
async def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
|
async def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
|
||||||
|
services.add_logging()
|
||||||
|
|
||||||
|
services.add_singleton(BotServiceABC, BotService)
|
||||||
|
|
||||||
return services.build_service_provider()
|
return services.build_service_provider()
|
||||||
|
@ -1,25 +1 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# imports
|
||||||
|
|
||||||
"""
|
|
||||||
gismo sh-edraft Gismo
|
|
||||||
~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
sh-edraft Dicord bot Gismo
|
|
||||||
|
|
||||||
:copyright: (c) 2021 - 2022 sh-edraft.de
|
|
||||||
:license: MIT, see LICENSE for more details.
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
__title__ = 'gismo_core'
|
|
||||||
__author__ = 'Sven Heidemann'
|
|
||||||
__license__ = 'MIT'
|
|
||||||
__copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de'
|
|
||||||
__version__ = '0.1.0'
|
|
||||||
|
|
||||||
from collections import namedtuple
|
|
||||||
|
|
||||||
# imports:
|
|
||||||
|
|
||||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
|
|
||||||
version_info = VersionInfo(major='0', minor='1', micro='0')
|
|
||||||
|
1
src/gismo_core/abc/__init__.py
Normal file
1
src/gismo_core/abc/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
# imports
|
13
src/gismo_core/abc/bot_service_abc.py
Normal file
13
src/gismo_core/abc/bot_service_abc.py
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
from abc import ABC, abstractmethod
|
||||||
|
|
||||||
|
|
||||||
|
class BotServiceABC(ABC):
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def __init__(self): pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
async def run(self): pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
async def exit(self): pass
|
1
src/gismo_core/configuration/__init__.py
Normal file
1
src/gismo_core/configuration/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
# imports
|
23
src/gismo_core/configuration/discord_settings.py
Normal file
23
src/gismo_core/configuration/discord_settings.py
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import traceback
|
||||||
|
|
||||||
|
from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
|
||||||
|
from cpl_core.console import Console
|
||||||
|
|
||||||
|
|
||||||
|
class DiscordSettings(ConfigurationModelABC):
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
ConfigurationModelABC.__init__(self)
|
||||||
|
|
||||||
|
self._token: str = ''
|
||||||
|
|
||||||
|
@property
|
||||||
|
def token(self) -> str:
|
||||||
|
return self._token
|
||||||
|
|
||||||
|
def from_dict(self, settings: dict):
|
||||||
|
try:
|
||||||
|
self._token = settings['Token']
|
||||||
|
except Exception as e:
|
||||||
|
Console.error(f'[ ERROR ] [ {__name__} ]: Reading error in {self.__name__} settings')
|
||||||
|
Console.error(f'[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}')
|
1
src/gismo_core/services/__init__.py
Normal file
1
src/gismo_core/services/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
# imports
|
15
src/gismo_core/services/bot_service.py
Normal file
15
src/gismo_core/services/bot_service.py
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
from gismo_core.abc.bot_service_abc import BotServiceABC
|
||||||
|
from gismo_core.configuration.discord_settings import DiscordSettings
|
||||||
|
|
||||||
|
|
||||||
|
class BotService(BotServiceABC):
|
||||||
|
|
||||||
|
def __init__(self, discord_settings: DiscordSettings):
|
||||||
|
# setup self
|
||||||
|
commands.Bot.__init__(self, command_prefix=discord_settings.bot.prefix, help_command=None)
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
async def exit(self):
|
||||||
|
pass
|
Reference in New Issue
Block a user