diff --git a/Convention/Runtime/Config.py b/Convention/Runtime/Config.py index 610b274..350ec47 100644 --- a/Convention/Runtime/Config.py +++ b/Convention/Runtime/Config.py @@ -5,10 +5,35 @@ import sys import threading import traceback import datetime -import platform -import time -import os -from colorama import Fore as ConsoleFrontColor, Back as ConsoleBackgroundColor, Style as ConsoleStyle +try: + from colorama import Fore as ConsoleFrontColor, Back as ConsoleBackgroundColor, Style as ConsoleStyle +except: + print("colorama is not installed, using default colors") + class ConsoleFrontColor: + RED = "" + GREEN = "" + YELLOW = "" + BLUE = "" + MAGENTA = "" + CYAN = "" + WHITE = "" + RESET = "" + class ConsoleBackgroundColor: + RED = "" + GREEN = "" + YELLOW = "" + BLUE = "" + MAGENTA = "" + CYAN = "" + WHITE = "" + RESET = "" + class ConsoleStyle: + RESET = "" + BOLD = "" + DIM = "" + UNDERLINE = "" + REVERSE = "" + HIDDEN = "" class NotImplementedError(Exception): def __init__(self, message:Optional[str]=None) -> None: diff --git a/Convention/Runtime/GlobalConfig.py b/Convention/Runtime/GlobalConfig.py index 5a56438..904897b 100644 --- a/Convention/Runtime/GlobalConfig.py +++ b/Convention/Runtime/GlobalConfig.py @@ -53,6 +53,7 @@ class GlobalConfig: # 检查配置文件,不存在则生成空配置 self._data_pair: Dict[str, Any] = {} + self._data_find: Dict[str, Any] = {} self._const_config_file = ConstConfigFile config_file = self.ConfigFile @@ -160,7 +161,8 @@ class GlobalConfig: """保存配置到文件""" config = self.ConfigFile config.SaveAsJson({ - "properties": self._data_pair + "properties": self._data_pair, + "find": self._data_find }) return self @@ -232,6 +234,7 @@ class GlobalConfig: return self._data_pair[key] else: self.LogPropertyNotFound(key, default=default) + self._data_find[key] = default return default diff --git a/Convention/Runtime/Web.py b/Convention/Runtime/Web.py index 86cd155..9f5b820 100644 --- a/Convention/Runtime/Web.py +++ b/Convention/Runtime/Web.py @@ -5,7 +5,6 @@ import urllib.parse import urllib.request import urllib.error import asyncio -import aiohttp import os import re from typing import *