From 843b48dfdca3caf8aa228439b6c9c7b8408b535e Mon Sep 17 00:00:00 2001 From: Louis Chauvet Date: Fri, 3 Jul 2020 21:21:11 +0200 Subject: [PATCH] Ajout du webserver --- src/bot_base/__init__.py | 2 +- src/bot_base/bot_base.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/bot_base/__init__.py b/src/bot_base/__init__.py index 331c692..cd681eb 100644 --- a/src/bot_base/__init__.py +++ b/src/bot_base/__init__.py @@ -1 +1 @@ -import bot_base \ No newline at end of file +from .bot_base import * diff --git a/src/bot_base/bot_base.py b/src/bot_base/bot_base.py index d191a94..ab5b46b 100644 --- a/src/bot_base/bot_base.py +++ b/src/bot_base/bot_base.py @@ -1,20 +1,16 @@ from __future__ import annotations -import importlib -import inspect +import asyncio import logging import os -import sys import traceback import discord -import toml -from packaging.specifiers import SpecifierSet, InvalidSpecifier +from aiohttp import web from bot_base.modules import ModuleManager from config import Config, config_types from config.config_types import factory -import errors __version__ = "0.2.0" @@ -37,15 +33,20 @@ class BotBase(discord.Client): self.config = Config(path=os.path.join(data_folder, "config.toml")) self.config.register("data_folder", factory(config_types.Str)) + self.config.register("port", factory(config_types.Int)) self.config.set({ "data_folder": data_folder, + "port": 8080, }, no_save=True) self.config.load() self.modules = ModuleManager(self) + self.webserver = web.Application() + self.loop.create_task(web._run_app(self.webserver, port=self.config["port"]), name="webserver") + async def on_ready(self): self.info("Bot ready.") self.modules.load_modules()