✨ env ENTARI_CONFIG_FILE

ArcletProject · Dec 27, 2024 · 64b087a · 64b087a
1 parent 38314be
commit 64b087a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/arclet/entari/__main__.py b/arclet/entari/__main__.py
@@ -37,7 +37,7 @@
 
 JSON_PLUGIN_COMMON_TEMPLATE = """\
   "plugins": {
-    "~record_message": {},
+    ".record_message": {},
     "::echo": {},
     "::inspect": {}
   }
@@ -49,7 +49,10 @@
     "$prelude": [
       "::auto_reload"
     ],
-    "~record_message": {},
+    ".record_message": {
+      "record_send": true,
+    },
+    "::help": {},
     "::echo": {},
     "::inspect": {},
     "::auto_reload": {
@@ -83,8 +86,10 @@
 plugins:
   $prelude:
     - ::auto_reload
-  .record_message: {}
+  .record_message:
+    record_send: true
   ::echo: {}
+  ::help: {}
   ::inspect: {}
   ::auto_reload:
     watch_config: true

diff --git a/arclet/entari/config.py b/arclet/entari/config.py
@@ -51,12 +51,12 @@ def reload(self):
     @classmethod
     def load(cls, path: str | os.PathLike[str] | None = None) -> EntariConfig:
         if path is None:
-            try:
-                import yaml
-
-                _path = Path.cwd() / "entari.yml"
-            except ImportError:
+            if "ENTARI_CONFIG_FILE" in os.environ:
+                _path = Path(os.environ["ENTARI_CONFIG_FILE"])
+            elif (Path.cwd() / ".entari.json").exists():
                 _path = Path.cwd() / ".entari.json"
+            else:
+                _path = Path.cwd() / "entari.yml"
         else:
             _path = Path(path)
         if not _path.exists():