From e8773cea7f47453cfd8109edf535f4dfff4d7002 Mon Sep 17 00:00:00 2001
From: Soulter <905617992@qq.com>
Date: Sat, 25 May 2024 20:59:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B2=A1=E6=9C=89=E6=9C=89=E6=95=88=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 astrbot/core.py       |  6 +-----
 main.py               |  7 +++----
 util/cmd_config.py    | 26 ++++++++++++++++++++++++++
 util/general_utils.py | 16 ----------------
 4 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/astrbot/core.py b/astrbot/core.py
index d5524dbfb..f21795a29 100644
--- a/astrbot/core.py
+++ b/astrbot/core.py
@@ -54,8 +54,6 @@ baidu_judge = None
 # CLI
 PLATFORM_CLI = 'cli'
 
-init_astrbot_config_items()
-
 # 全局对象
 _global_object: GlobalObject = None
 
@@ -75,9 +73,7 @@ def init():
     global frequency_count, frequency_time
     global _global_object
 
-    # 迁移旧配置
-    gu.try_migrate_config()
-    # 使用新配置
+    init_astrbot_config_items()
     cfg = cc.get_all()
 
     _event_loop = asyncio.new_event_loop()
diff --git a/main.py b/main.py
index 3e32192f0..f33af37b6 100644
--- a/main.py
+++ b/main.py
@@ -5,6 +5,7 @@ import warnings
 import traceback
 import threading
 from logging import Formatter, Logger
+from util.cmd_config import CmdConfig, try_migrate_config
 
 warnings.filterwarnings("ignore")
 abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
@@ -77,9 +78,9 @@ def check_env():
         exit()
 
 if __name__ == "__main__":
+    update_dept()
     
-    # 设置代理
-    from util.cmd_config import CmdConfig
+    try_migrate_config()
     cc = CmdConfig()
     http_proxy = cc.get("http_proxy")
     https_proxy = cc.get("https_proxy")
@@ -88,8 +89,6 @@ if __name__ == "__main__":
     if https_proxy:
         os.environ['HTTPS_PROXY'] = https_proxy
     os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
-
-    update_dept()
     
     from SparkleLogging.utils.core import LogManager
     logger = LogManager.GetLogger(
diff --git a/util/cmd_config.py b/util/cmd_config.py
index 928f3bb25..279f191fb 100644
--- a/util/cmd_config.py
+++ b/util/cmd_config.py
@@ -1,5 +1,6 @@
 import os
 import json
+import yaml
 from typing import Union
 
 cpath = "data/cmd_config.json"
@@ -117,3 +118,28 @@ def init_astrbot_config_items():
     cc.init_attributes("https_proxy", "")
     cc.init_attributes("dashboard_username", "")
     cc.init_attributes("dashboard_password", "")
+
+
+
+def try_migrate_config():
+    '''
+    将 cmd_config.json 迁移至 data/cmd_config.json
+    '''
+    print("try migrate configs")
+    if os.path.exists("cmd_config.json"):
+        with open("cmd_config.json", "r", encoding="utf-8-sig") as f:
+            data = json.load(f)
+        with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
+            json.dump(data, f, indent=2, ensure_ascii=False)
+        try:
+            os.remove("cmd_config.json")
+        except Exception as e:
+            pass
+    if not os.path.exists("cmd_config.json") and not os.path.exists("data/cmd_config.json"):
+        # 从 configs/config.yaml 上拿数据
+        configs_pth = os.path.abspath(os.path.join(os.path.abspath(__file__), "../../configs/config.yaml"))
+        with open(configs_pth, encoding='utf-8') as f:
+            data = yaml.load(f, Loader=yaml.Loader)
+            print(data)
+            with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
+                json.dump(data, f, indent=2, ensure_ascii=False)
diff --git a/util/general_utils.py b/util/general_utils.py
index 931b4314d..2d9a5a86f 100644
--- a/util/general_utils.py
+++ b/util/general_utils.py
@@ -15,7 +15,6 @@ from PIL import Image, ImageDraw, ImageFont
 from type.types import GlobalObject
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
-from collections import defaultdict
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot-core')
 
@@ -423,21 +422,6 @@ def create_markdown_image(text: str):
         raise e
 
 
-def try_migrate_config():
-    '''
-    将 cmd_config.json 迁移至 data/cmd_config.json
-    '''
-    if os.path.exists("cmd_config.json"):
-        with open("cmd_config.json", "r", encoding="utf-8-sig") as f:
-            data = json.load(f)
-        with open("data/cmd_config.json", "w", encoding="utf-8-sig") as f:
-            json.dump(data, f, indent=2, ensure_ascii=False)
-        try:
-            os.remove("cmd_config.json")
-        except Exception as e:
-            pass
-
-
 def get_local_ip_addresses():
     ip = ''
     try: