使得favicon能在InfoGui里显示为128x128

Author: hite4044

Gui/InfoGui.py

@@ -3,6 +3,7 @@
 from tkinter.messagebox import showinfo
 
 from ttkbootstrap.tooltip import ToolTip
+from io import BytesIO
 
 from Gui.Widgets import *
 from Libs.Vars import user_settings_loader
@@ -42,12 +43,17 @@ def __init__(self, master: Misc, data: ServerInfo):
         self.pack_widgets()
 
     def load_data(self, data: ServerInfo):
-        favicon = self.data.favicon_photo if data.has_favicon \
-            else ImageTk.PhotoImage(file=r"assets\server_icon.png")
-        self.favicon.configure(image=favicon)
+        if data.has_favicon:
+            self.favicon.image_io = BytesIO(data.favicon_data)
+        else:
+            with open(r"assets\server_icon.png", "rb") as f:
+                self.favicon.image_io = BytesIO(f.read())
+        self.favicon.image = Image.open(self.favicon.image_io, formats=["PNG"])
+        self.favicon.image = self.favicon.image.resize((128, 128))
+        self.favicon.favicon = ImageTk.PhotoImage(self.favicon.image)
+        self.favicon.configure(image=self.favicon.favicon)
         # 将 favicon 引用传递给 self.favicon.image, 使其变成 self.favicon 的属性, 防止其被 gc 回收
-        self.favicon.image = favicon
-        self.load_icon(favicon)
+        self.load_icon(self.favicon.favicon)
 
         self.data = data
         self.MOTD.load_motd(self.data)
@@ -69,7 +75,7 @@ def load_icon(self, favicon: PhotoImage):
 
         @param favicon: 一个 PIL.ImageTK.PhotoImage 实例化对象
         """
-        self.iconphoto(False, favicon)
+        self.iconphoto(True, favicon)
 
     def pack_widgets(self):
         self.favicon.pack_configure()

Gui/UserInterface.py

@@ -5,7 +5,6 @@
 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 *
 
@@ -71,7 +70,8 @@ def config_root_window(self):  # 设置窗体
 
     def set_icon(self):
         if exists("assets/icon.ico"):
-            self.wm_iconbitmap("assets/icon.ico")
+            self._icon.icon = ImageTk.PhotoImage(file="assets/icon.ico")
+            self.iconphoto(True, self._icon.icon)
         else:
             print("图标文件丢失", file=stderr)
 

Network/Scanner.py

@@ -5,15 +5,17 @@
 from queue import Queue, Empty
 from threading import Thread, Lock
 from time import sleep
-from typing import List, Any, Dict, Literal, Union
+from typing import List, Any, Dict, Literal, Union, Tuple
 
 from PIL import Image, ImageTk
+from PIL.ImageTk import PhotoImage
 
 from Libs import Vars
 
 ServerPinger: Any = None
 Address: Any = None
 TCPSocketConnection: Any = None
+_MaxUnknown = str
 
 
 def import_mcstatus():
@@ -221,6 +223,7 @@ def __init__(self, info: dict) -> None:
         self.player_max, self.player_online, self.players = self.parse_player_info()
 
         # 服务器图标信息
+        self.favicon = None
         self.favicon_data, self.favicon_photo, self.has_favicon = self.parse_icon_info()
 
         # 服务器标题
@@ -261,15 +264,15 @@ def __call__(self) -> dict:
     def __str__(self) -> str:
         return self.text
 
-    def load_favicon_photo(self, has_favicon: bool = True, favicon_data=None, load_from_self=True) -> Union[
-        ImageTk.PhotoImage, None]:
+    def load_favicon_photo(self, has_favicon: bool = True, favicon_data=None, load_from_self=True) ->\
+            Union[ImageTk.PhotoImage, None]:
         if not load_from_self:
             if has_favicon:
-                favicon = Image.open(BytesIO(favicon_data), formats=["PNG"])
-                return ImageTk.PhotoImage(favicon)
+                self.favicon = Image.open(BytesIO(favicon_data), formats=["PNG"])
+                return ImageTk.PhotoImage(self.favicon)
         elif self.has_favicon:
-            favicon = Image.open(BytesIO(self.favicon_data), formats=["PNG"])
-            self.favicon_photo = ImageTk.PhotoImage(favicon)
+            self.favicon = Image.open(BytesIO(self.favicon_data), formats=["PNG"])
+            self.favicon_photo = ImageTk.PhotoImage(self.favicon)
         return None
 
     def parse_version_info(self):
@@ -291,9 +294,7 @@ def parse_version_info(self):
         return version_name, protocol_version, protocol_info, protocol_name, protocol_major_name, version_type
 
     def parse_player_info(self):
-        # 如果你的 IDE 提示我的类型注释不对, 那就是 IDE 的问题
-        # 类型注释是正确的, 一层套一层导致 IDE 爆炸了 ( 其实是因为 self.parsed_data 没有做也很难做类型注释 )
-        player_max: Union[int, Literal["未知"]] = self.parsed_data.get("players", {"max": "未知"})["max"]
+        player_max: Union[int, _MaxUnknown] = self.parsed_data.get("players", {"max": "未知"})["max"]
         player_number = self.parsed_data.get("players", {"online": "未知"})["online"]
         if self.parsed_data.get("players", {}).get("sample"):
             player_list: List = self.parsed_data["players"]["sample"]