升级依赖；从PySimpleGUI迁移至FreeSimpleGUI；使用requests.Session

Author: Zhao Zuohong

hash.py

@@ -1,7 +1,7 @@
-import xxhash
-import json
 import pathlib
 
+import xxhash
+
 
 def hash(path):
     p = pathlib.Path(path)

main.py

@@ -1,14 +1,15 @@
 #!/usr/bin/env python3
 
-import PySimpleGUI as sg
-import platformdirs
-import pathlib
 import json
-import requests
-import htmllistparse
-from hash import hash
+import pathlib
 from multiprocessing.pool import ThreadPool
 
+import htmllistparse
+import platformdirs
+import FreeSimpleGUI as sg
+import requests
+
+from hash import hash
 
 default_config = {
     "mirror": "https://mower.zhaozuohong.vip",
@@ -35,6 +36,8 @@
 conf = default_config
 
 
+sg.theme("SystemDefaultForReal")
+
 layout = [
     [
         sg.Text("镜像：", size=(10, 1)),
@@ -76,6 +79,8 @@
     enable_close_attempted_event=True,
 )
 
+s = requests.Session()
+
 
 def connect_mirror(mirror):
     try:
@@ -98,7 +103,7 @@ def fetch_version_details(mirror, versions):
     for v in versions:
         url = mirror + v + "/version.json"
         try:
-            r = requests.get(url)
+            r = s.get(url)
             pub_time = r.json()["time"]
         except Exception as e:
             continue
@@ -166,7 +171,7 @@ def download_single_file(subpath):
         mirror += "/"
     url = f"{mirror}{version_name}/{subpath}"
     try:
-        r = requests.get(url)
+        r = s.get(url)
         path = pathlib.Path(conf["install_dir"]) / conf["dir_name"] / subpath
         path.parent.mkdir(exist_ok=True, parents=True)
         with path.open("wb") as f:
@@ -190,7 +195,7 @@ def download_all_files(window):
 while True:
     event, values = window.read()
     conf["mirror"] = values["-mirror-"]
-    conf["ignore"] = [l for l in values["-ignore-"].splitlines() if l.strip()]
+    conf["ignore"] = [i for i in values["-ignore-"].splitlines() if i.strip()]
     conf["install_dir"] = values["install-dir"]
     conf["dir_name"] = values["dir-name"]
     conf["pool_limit"] = int(values["pool-limit"])

publish.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 
 import json
-from hash import hash
 import pathlib
 from datetime import datetime
 
+from hash import hash
+
 try:
     from zoneinfo import ZoneInfo
 except ImportError:

requirements.txt

@@ -1,18 +1,22 @@
-altgraph==0.17.3
-beautifulsoup4==4.12.2
-certifi==2023.7.22
-charset-normalizer==3.2.0
+altgraph==0.17.4
+backports.zoneinfo==0.2.1
+beautifulsoup4==4.12.3
+certifi==2024.2.2
+charset-normalizer==3.3.2
+FreeSimpleGUI==5.1.0
 fusepy==3.0.1
 html5lib==1.1
 htmllistparse==0.6.1
-idna==3.4
-platformdirs==3.10.0
-pyinstaller==5.13.1
-pyinstaller-hooks-contrib==2023.7
-PySimpleGUI==4.60.5
+idna==3.7
+importlib_metadata==7.1.0
+packaging==24.0
+platformdirs==4.2.1
+pyinstaller==6.6.0
+pyinstaller-hooks-contrib==2024.6
 requests==2.31.0
 six==1.16.0
-soupsieve==2.4.1
-urllib3==2.0.4
+soupsieve==2.5
+urllib3==2.2.1
 webencodings==0.5.1
-xxhash==3.3.0
+xxhash==3.4.1
+zipp==3.18.1