自己编写库加载字体

更改self._callback方法
UserInterface.py:79 FIXME

Author: hite4044

Gui/UserInterface.py

@@ -5,6 +5,7 @@
 from Gui.ScanBarGui import ScanBar
 from Gui.ServerListGui import ServerList
 from Gui.SettingsFrame import SettingsFrame
+from Libs.Vars import main_thread_over
 from Gui.Widgets import *
 from Libs.Vars import *
 
@@ -14,14 +15,14 @@ def set_default_font():
 
 
 def load_unifont():
-    from pyglet.font import add_file
+    from Libs.FontLoader import add_font
 
-    if not exists("assets/Unifont.otf"):  # 若字体文件不存在则退出
+    try:
+        add_font("assets/Unifont.otf")
+    except FileNotFoundError:  # 若字体文件不存在则退出
         print("Unifont字体文件丢失", file=stderr)
         return
 
-    add_file("assets/Unifont.otf")
-
 
 class Title(Label):
     def __init__(self, master: Misc):
@@ -75,6 +76,7 @@ def set_icon(self):
             print("图标文件丢失", file=stderr)
 
     def on_delete_window(self):
+        # FIXME 扫描时结束任务会报错
         # user_settings_loader.configs['theme_name'] = Style().theme_use()
         self.scan_bar.close_save_config()
         UserSettingsSaver.save_user_configs(user_settings_loader)

Libs/FontLoader.py

@@ -0,0 +1,10 @@
+import ctypes
+from ctypes import wintypes
+
+# 加载GDI库
+gdi32 = ctypes.WinDLL("gdi32")
+FR_PRIVATE = ctypes.c_int(1)
+
+
+def add_font(font_path: str) -> None:
+    gdi32.AddFontResourceExW(font_path, FR_PRIVATE, None)

Network/Scanner.py

@@ -101,15 +101,17 @@ def stop_and_wait(self):
 
     def scan_a_port(self, host: str, port: int, callback: Any):
         raw_info = Port(host, port, self.timeout).get_server_info()
-        if raw_info["status"] == "online":
-            Thread(target=callback, args=(ServerInfo(raw_info["info"]),)).start()
-            return
-        Thread(target=self._callback, args=(raw_info, callback)).start()
+        Thread(target=self._callback, args=(raw_info, callback), daemon=True).start()
 
     def _callback(self, raw_info, callback: Any):
         with self.callback_count_lock:
             self.callback_count += 1
-        callback(raw_info)
+        try:
+            if raw_info["status"] == "online":
+                raw_info = ServerInfo(raw_info["info"])
+            callback(raw_info)
+        except RuntimeError:  # TK窗口已销毁
+            pass
         with self.callback_count_lock:
             self.callback_count -= 1