PDBA/bot-base
8
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[bot-base] Lève une erreur si les versions de dépendances sont pas bien faites

Browse Source
This commit is contained in:
Louis Chauvet 2020-04-27 18:36:53 +02:00
parent f7b227e8c6
commit 7f71f4bafa
Signed by: fomys
GPG Key ID: 1ECA046A9615ABA0
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bot_base/bot_base.py
View File

@ -9,7 +9,7 @@ import traceback
import discord import discord
import toml import toml
from packaging.specifiers import SpecifierSet from packaging.specifiers import SpecifierSet, InvalidSpecifier
from config import Config, config_types from config import Config, config_types
from config.config_types import factory from config.config_types import factory
@ -100,9 +100,16 @@ class BotBase(discord.Client):
for dep, version in infos["dependencies"].items(): for dep, version in infos["dependencies"].items():
if not dep in self.modules.keys(): if not dep in self.modules.keys():
self.load_module(dep) self.load_module(dep)
dep_version_specifier = SpecifierSet(version) dep_version_specifier = None
try:
dep_version_specifier = SpecifierSet(version)
except InvalidSpecifier:
self.warning(f"Attempt to load incompatible module {module}: dependance version is invalid ({version} for {dep})")
raise errors.IncompatibleModuleError(f"Module {module} is not compatible with your current "
f"installation (version specifier {version} for {dep} is "
f"invalid.")
if self.modules[dep]["infos"]["version"] not in dep_version_specifier: if self.modules[dep]["infos"]["version"] not in dep_version_specifier:
self.warning(f"Attempt to load incompatible module {module}: (require {dep} ({version}) " self.warning(f"Attempt to load incompatible module {module}: require {dep} ({version}) "
f"and you have {dep} ({self.modules[dep]['infos']['version']})") f"and you have {dep} ({self.modules[dep]['infos']['version']})")
raise errors.IncompatibleModuleError(f"Module {module} is not compatible with your current install " raise errors.IncompatibleModuleError(f"Module {module} is not compatible with your current install "
f"(require {dep} ({version}) and you have {dep} " f"(require {dep} ({version}) and you have {dep} "
@ -193,8 +200,8 @@ class BotBase(discord.Client):
for module in self.modules.values(): for module in self.modules.values():
module["dispatch"](event, *args, **kwargs) module["dispatch"](event, *args, **kwargs)
async def on_error(self, event_method, exc, *args, **kwargs): async def on_error(self, event_method, *args, **kwargs):
self.error(f"Error in {event_method}: \n{exc}") self.error(f"Error in {event_method}: \n{traceback.format_exc()}")
# Logging # Logging
def info(self, info, *args, **kwargs): def info(self, info, *args, **kwargs):