feat: 简化配置项的取值与写入

Author: hite4044

Gui/InfoGui.py

@@ -111,7 +111,7 @@ def load_data(self, data: ServerInfo):
         self.data = data
 
         self.text.configure(text=f"人数：{data.player_online}/{data.player_max}")
-        if not user_settings_loader.configs["players_all"]:
+        if not config.accumulation_player:
             self.players.clear()
         for player in data.players:
             if player["name"] not in self.players:
@@ -209,7 +209,7 @@ def __init__(self, master: Misc):
 
         super(VersionInfo, self).__init__(master)
         self.data = None
-        self.if_version_name_shown_as_label: bool = user_settings_loader.configs['if_version_name_shown_as_label']
+        self.version_name_label_show: bool = config.version_name_label_show
 
         self.version_name_frame = Frame(self)
         self.version_name_label = Label(self.version_name_frame, anchor=CENTER)
@@ -235,7 +235,7 @@ def bind_tip(self):
     def pack_widgets(self):
         self.version_name_frame.pack()
         self.version_name_label.pack(side=LEFT)
-        if not self.if_version_name_shown_as_label:
+        if not self.version_name_label_show:
             self.version_name_text.configure(height=1, width=20)
             self.version_name_text.pack(side=LEFT)
         self.minecraft_version.pack()
@@ -251,7 +251,7 @@ def load_data(self, data: ServerInfo):
         else:
             description_json = [{"text": data.version_name}]
         self.version_name_label.configure(text="版本名：")
-        if self.if_version_name_shown_as_label:
+        if self.version_name_label_show:
             self.version_name_label.configure(text=f"版本名：{data.version_name}")
         self.version_name_text.load_motd(description_json)
         self.minecraft_version.configure(text=f"正式版本名：{data.protocol_name}")

Gui/ScanBarGui.py

@@ -46,7 +46,7 @@ def __init__(self, master: Misc, logger: Logger, server_list: ServerList, hot_vi
         self.host_input = TextCombobox(self.input_frame, "域名: ", server_addresses)
         self.timeout_input = EntryScaleFloatFrame(self.input_frame, 0.1, 3.0, 0.2, "超时时间: ")
         self.thread_num_input = EntryScaleIntFrame(self.input_frame, 1,
-                                                   Vars.user_settings_loader.configs["max_thread_number"],
+                                                   Vars.config.max_thread_number,
                                                    1,
                                                    "线程数: ")
         self.range_input = RangeSelector(self.input_frame, "端口选择: ", 1024, 65535)
@@ -145,7 +145,7 @@ def start_scan(self):  # 20500 - 25000
 
         self.gui.servers.empty_tip.configure(text="检验连通性...")
         self.gui.update()
-        if user_settings_loader.configs['ping_before_scan'] and not self.check_host(host):
+        if config.ping_before_scan and not self.check_host(host):
             self.gui.servers.empty_tip.configure(text="没有服务器")
             return
         self.gui.servers.empty_tip.configure(text="没有服务器")

Gui/ServerListGui.py

@@ -249,7 +249,7 @@ def __init__(self, master: Misc, logger: Logger):
         self.sep = Separator(self, orient=HORIZONTAL)  # 分割线
         self.servers_frame = ScrolledFrame(self, autohide=True, height=300)  # 装服务器的容器
         self.empty_tip = Label(self, text="没有服务器",
-                               font=(Vars.user_settings_loader.configs['global_font'], 25))  # 提示
+                               font=(Vars.config.global_font, 25))  # 提示
         self.record_bar = RecordBar(self, self)  # 保存加载功能
         self.servers_info = ServerInfoFrame(self.record_bar)  # 服务器数量信息
 
@@ -363,7 +363,7 @@ def __init__(self, master: Misc, data: ServerInfo):
 
         self.favicon = Label(self)
         self.MOTD = MOTD(self, viewable_callback=self.viewable_callback)
-        self.base_info = Label(self, font=(Vars.user_settings_loader.configs['global_font'], 9))
+        self.base_info = Label(self, font=(Vars.config.configs['global_font'], 9))
 
         self.events_add()
         self.pack_weights()

Gui/SettingsFrame.py

@@ -38,13 +38,13 @@ def __init__(self, master: Misc):
         super().__init__(master)
 
         self.language_support = {
-            "if_version_name_shown_as_label": "将 VersionName 显示为纯文本格式",
+            "version_name_label_show": "将 VersionName 显示为纯文本格式",
             "theme_name": "主题 ( 不建议在此处修改 )",
             "ping_before_scan": "扫描之前先检测连通性",
             "global_font": "字体",
             "max_thread_number": "扫描时允许的最大线程数",
-            "MOTD_use_unicode_font": "MOTD全部使用Unifont字体显示",
-            "players_all": "服务器玩家累积并去重",
+            "MOTD_use_unifont": "MOTD全部使用Unifont字体显示",
+            "accumulation_player": "服务器玩家累积并去重",
             "allow_hor_resize": "允许水平调整窗口 ( 很卡 )",
             "use_proxy": "使用代理",
             "proxy_kind": "代理类型 (sock5, sock4)",
@@ -54,7 +54,7 @@ def __init__(self, master: Misc):
 
         self.config_frame = ScrolledFrame(self)
         self.configs = {}
-        for name, value in user_settings_loader.configs.items():
+        for name, value in config.configs.items():
             self.configs[name] = SettingFrame(self.config_frame, self.language_support.get(name, name + ' ( 不生效 ) '),
                                               name, value, use_sizer=False)
 
@@ -75,8 +75,8 @@ def pack_widgets(self):
 
     def confirm(self):
         for name, widget in self.configs.items():
-            user_settings_loader.configs[name] = widget.get()
+            config.configs[name] = widget.get()
 
     def update_settings(self):
         for name, widget in self.configs.items():
-            widget.set(user_settings_loader.configs[name])
+            widget.set(config.configs[name])

Gui/UserInterface.py

@@ -15,14 +15,14 @@
 
 
 def set_default_font():
-    font.nametofont("TkDefaultFont").config(family=Vars.user_settings_loader.configs['global_font'], size=10)
+    font.nametofont("TkDefaultFont").config(family=Vars.config.global_font, size=10)
 
 
 class Title(Label):
     def __init__(self, master: Misc):
         super(Title, self).__init__(master,
                                     text="Minecraft服务器扫描器",
-                                    font=(Vars.user_settings_loader.configs['global_font'], 24))
+                                    font=(Vars.config.global_font, 24))
 
 
 class TitleBar(Frame):
@@ -36,7 +36,7 @@ def __init__(self, master: Misc):
 
 class GUI(Window):
     def __init__(self):
-        super(GUI, self).__init__(themename=user_settings_loader.configs['theme_name'])
+        super(GUI, self).__init__(themename=config.theme_name)
 
         set_default_font()
         self.config_root_window()
@@ -56,7 +56,7 @@ def __init__(self):
     def config_root_window(self):  # 设置窗体
         self.wm_title("MC服务器扫描器")  # 设置标题
         self.protocol("WM_DELETE_WINDOW", self.on_delete_window)
-        self.wm_resizable(user_settings_loader.configs["allow_hor_resize"], True)
+        self.wm_resizable(config.configs["allow_hor_resize"], True)
         Sty.set_obj(self._style)
         Thread(target=self.set_icon).start()
         #Thread(target=self.place_window_center).start()
@@ -72,7 +72,7 @@ def set_icon(self):
 
     def on_delete_window(self):
         self.scan_bar.close_save_config()
-        UserSettingsSaver.save_user_configs(user_settings_loader)
+        UserSettingsSaver.save_user_configs(config)
         self.destroy()
 
     def pack_widgets(self):

Gui/Widgets.py

@@ -104,7 +104,7 @@ def return_font():
         Notes:
             有概率会引发 RuntimeError, 原因未知
         """
-        if Vars.user_settings_loader.configs['MOTD_use_unicode_font']:
+        if Vars.config.MOTD_use_unifont:
             if "UnifontExMono" not in font.families():
                 custom_font = font.Font(font="assets/UnifontExMono.ttf", family="UnifontExMono")
             else:
@@ -553,7 +553,7 @@ def thread_load_themes(self):
 
     def on_theme_selected(self, _):
         self.style.theme_use(self.theme_selector.get())
-        Vars.user_settings_loader.configs['theme_name'] = self.theme_selector.get()
+        Vars.config.set_value("theme_name", self.theme_selector.get())
 
 
 class RangeSelector(Frame):

Libs/Vars.py

@@ -204,32 +204,46 @@ def __call__(self) -> float:
 
 
 class UserSettingsLoader:
+    version_name_label_show: bool = False
+    theme_name: str = "darkly"
+    ping_before_scan: bool = True
+    global_font: str = "微软雅黑"
+    max_thread_number: int = 256
+    MOTD_use_unifont: bool = True
+    accumulation_player: bool = True
+    allow_hor_resize: bool = True
+    use_proxy: bool = False
+    proxy_kind: str = "sock5"
+    proxy_host: str = "127.0.0.1"
+    proxy_port: int = 1080
+
     def __init__(self):
         self.config_path = path_join(config_dir, "user_configs.json")
-        self.configs: Dict = self.defaults()
+        self.configs: dict[str, Any] = self.find_default_config()
         if not exists(self.config_path):
             return
         with open(self.config_path, "r", encoding="utf-8") as f:
-            json_configs: Dict = json.load(f)
+            json_configs: dict[str, Any] = json.load(f)
             if self.configs.keys() != json_configs.keys():
                 warnings.warn(f"可能存在潜在的设置信息不兼容问题. 以下是 user_configs.json 中的内容: {json_configs}")
             self.configs = {**self.configs, **json_configs}  # 酷炫就完事了 实际含义是拼接两个字典 并且有重复时遵从后者
+            for name, value in json_configs.items():
+                if name not in self.configs:
+                    print(f"未知的设置项: {name} -> {value}")
+                    continue
+                setattr(self, name, value)
+
+    def set_value(self, key: str, value: Any):
+        setattr(self, key, value)
+        self.configs[key] = value
+
+    def find_default_config(self):
+        config_dict: dict[str, Any] = {}
+        for name in self.__annotations__.keys():
+            value = getattr(self, name)
+            config_dict[name] = value
+        return config_dict
 
-    @staticmethod
-    def defaults() -> Dict:
-        return {'if_version_name_shown_as_label': False,
-                'theme_name': "darkly",
-                'ping_before_scan': True,
-                "global_font": "微软雅黑",
-                "max_thread_number": 256,
-                "MOTD_use_unicode_font": True,
-                "players_all": False,
-                "allow_hor_resize": False,
-                "use_proxy": False,
-                "proxy_kind": "sock5",
-                "proxy_host": "127.0.0.1",
-                "proxy_port": 11451
-                }
 
 
 class UserSettingsSaver:
@@ -243,6 +257,6 @@ def save_user_configs(loader: UserSettingsLoader):
 UserAddressOperator.read_config_file_list()
 
 scale_rater = ScaleRater()
-user_settings_loader = UserSettingsLoader()
+config: UserSettingsLoader = UserSettingsLoader()
 
 Sty = StyOP(None)

Network/Scanner.py

@@ -14,7 +14,7 @@
 from Libs import Vars
 import socks
 
-from Libs.Vars import user_settings_loader
+from Libs.Vars import config
 
 ServerPinger: Any = None
 Address: Any = None
@@ -49,6 +49,16 @@ def __init__(self):
         self.worker_count: int = 0  # 线程数
         self.working_worker: int = 0  # 工作中的线程数
         self.thread_num_lock = Lock()
+        self.set_proxy()
+
+    @staticmethod
+    def set_proxy():
+        if config.use_proxy:
+            kind_map = {"sock5": socks.SOCKS5,
+                        "sock4": socks.SOCKS4}
+            socks.set_default_proxy(kind_map[config.proxy_kind], config.proxy_host, config.proxy_port)
+            from mcstatus.protocol import connection
+            connection.socket.socket = socks.socksocket
 
     def config(self, timeout: float = 0.7, thread_num: int = 256, callback: object = lambda x: None):
         self.thread_num = thread_num
@@ -61,6 +71,8 @@ def run(self, host: str, port_range: range):
                 self.work_queue.get(block=False)
             except Empty:
                 break
+
+        self.set_proxy()
         self.in_scan = True
         self.add_task(host, port_range)
 
@@ -168,17 +180,6 @@ def __init__(self, host: str = "", port: int = 25565, timeout: float = 0.7, prot
         self.port = port
         self.protocol = protocol_version
         self.timeout = timeout
-        self.set_proxy()
-
-    @staticmethod
-    def set_proxy():
-        if user_settings_loader.configs["use_proxy"]:
-            kind_map = {"sock5": socks.SOCKS5,
-                        "sock4": socks.SOCKS4}
-            socks.set_default_proxy(kind_map[user_settings_loader.configs["proxy_kind"]],
-            user_settings_loader.configs["proxy_host"], user_settings_loader.configs["proxy_port"])
-            from mcstatus.protocol import connection
-            connection.socket.socket = socks.socksocket
 
     def get_server_info(self) -> dict:
         """