diff --git a/README.md b/README.md index f112943..a1cf654 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ # 基础模块现代化改进分支 您正浏览潜进项目的基础模块现代化改进原型分支! -[] - HeurAMK \ No newline at end of file diff --git a/config b/config new file mode 120000 index 0000000..c4c4a67 --- /dev/null +++ b/config @@ -0,0 +1 @@ +config.example \ No newline at end of file diff --git a/config/config.toml b/config.example/config.toml similarity index 100% rename from config/config.toml rename to config.example/config.toml diff --git a/src/heurams/__init__.py b/src/heurams/__init__.py index cea3db8..b9464d6 100644 --- a/src/heurams/__init__.py +++ b/src/heurams/__init__.py @@ -1 +1,2 @@ -print("Hello from HeurAMS Program :)") \ No newline at end of file +print("Hello from HeurAMS Program :)") + diff --git a/src/heurams/context.py b/src/heurams/context.py index c64b470..cfc79f4 100644 --- a/src/heurams/context.py +++ b/src/heurams/context.py @@ -6,12 +6,18 @@ from contextvars import ContextVar import pathlib from heurams.services.config import ConfigFile +# 默认配置文件路径规定: 以包目录为准 +# 用户配置文件路径规定: 以运行目录为准 +# 数据文件路径规定: 以运行目录为准 + root_dir = pathlib.Path(__file__).parent - +print(f'rootdir: {rootdir}') working_dir = pathlib.Path.cwd() - -config_var: ContextVar[ConfigFile] = ContextVar('config_var', default=ConfigFile(working_dir / "config" / "config.toml")) # 配置文件 - +print(f'workdir: {workdir}') +try: + config_var: ContextVar[ConfigFile] = ContextVar('config_var', default=ConfigFile(workdir / "config" / "config.toml")) # 配置文件 +except: + print('加载用户配置失败') runtime_var: ContextVar = ContextVar('runtime_var', default=dict()) # 运行时共享数据 class ConfigContext: @@ -34,4 +40,4 @@ class ConfigContext: return self def __exit__(self, exc_type, exc_val, exc_tb): - config_var.reset(self._token) # type: ignore \ No newline at end of file + config_var.reset(self._token) # type: ignore diff --git a/src/heurams/interface/__main__.py b/src/heurams/interface/__main__.py index ac2ba6e..d55637b 100644 --- a/src/heurams/interface/__main__.py +++ b/src/heurams/interface/__main__.py @@ -27,5 +27,8 @@ class HeurAMSApp(App): def on_button_pressed(self, event: Button.Pressed) -> None: self.exit(event.button.id) +def environment_check(): + from heurams.context import working_var + app = HeurAMSApp() -app.run() \ No newline at end of file +app.run()