refactor: 更新Python版本并移除flet-audio依赖

FUCK

Author: html5syt

.github/workflows/desktop-and-mobile-builds.yml

@@ -19,7 +19,7 @@ env:
 #   # https://flet.dev/docs/publish#versioning
 #   BUILD_NUMBER: 1
 #   BUILD_VERSION: 1.0.0
-  PYTHON_VERSION: 3.12
+  PYTHON_VERSION: 3.13
   FLUTTER_VERSION: 3.24.0
   KEYSTORE_FILE: /home/runner/work/PhiStore/PhiStore/html5syt.jks
   KEYSTORE_ALIAS: html5syt

pyproject.toml

@@ -6,7 +6,7 @@ description = "PhiStore"
 # requires-python = ">=3.8"
 dependencies = [
   "flet",
-  "flet-audio"
+  # "flet-audio"
 ]
 
 

src/PhiControls.py

@@ -119,13 +119,14 @@ def chance_prize(prize_list):
 
 def storage(
     page: ft.Page,
-    key: str | None,
+    key="",
     value=None,
     type="s",
+    # TODO: 增加持久化存储
     mode="r",
     prefix="phistore_",
 ):
-    """存储数据，默认使用 client_storage 存储，模式为读取，前缀为 phistore_
+    """存储数据，默认使用 session 存储，模式为读取，前缀为 phistore_
     Args:
         key (str): 键
         value (_type_): 值
@@ -134,9 +135,11 @@ def storage(
         prefix (str, optional): 前缀.
     """
 
-    async def _storage(key, mode, value=None):
+    async def _storage(key, mode, value=None) -> float:
         if mode == "w":
             await page.client_storage.set_async(key, value)
+        elif mode == "r":
+            return await page.client_storage.get_async(key)
         elif mode == "s":
             return await page.client_storage.contains_key_async(key)
 
@@ -157,14 +160,15 @@ async def _storage(key, mode, value=None):
         print(f"[Log]{key}值为: {page.session.get(key)}")
     # elif type == "c":
     #     if mode == "r":
-    #         if _storage(key, "s"):
-    #             return page.client_storage.get(key)
+    #         if page.client_storage.contains_key_async(key):
+    #             temp=await page.client_storage.get_async(key)
+    #             return temp
     #         else:
     #             raise LookupError("Key not found in client storage")
     #     elif mode == "w":
-    #         _storage(key, "w", value)
+    #         page.client_storage.set_async(key, value)
     #     elif mode == "d":
-    #         if _storage(key, "s"):
+    #         if page.client_storage.contains_key_async(key):
     #             page.client_storage.remove(key)
     #         else:
     #             raise LookupError("Key not found in client storage")

src/main.py

@@ -1,7 +1,7 @@
 import asyncio
 import random
 import flet as ft
-import flet_audio as ft_a
+# import flet_audio as ft_a
 import PhiControls as Phi
 import assets.default_json as default_json
 
@@ -52,8 +52,8 @@ def on_keyboard(e: ft.KeyboardEvent):
     page.theme = ft.Theme(font_family="Exo")  # 默认应用字体
 
     # 背景音乐
-    audio1 = ft_a.Audio(
-        src="Shop0.wav", autoplay=True, release_mode=ft_a.audio.ReleaseMode.LOOP
+    audio1 = ft.Audio(
+        src="Shop0.wav", autoplay=True, release_mode=ft.audio.ReleaseMode.LOOP
     )
     page.overlay.append(audio1)
 
@@ -75,7 +75,8 @@ def on_keyboard(e: ft.KeyboardEvent):
         ),
         actions=[
             ft.Button(
-                "清空session和client_storage（危险！仅供调试）", on_click=lambda e: DEL
+                "清空session和client_storage（危险！仅供调试）",
+                on_click=lambda e: DEL(e, page),
             ),
             ft.Button("确定"),
         ],
@@ -179,9 +180,10 @@ def setting_on_submit(e, datashow, page=ft.Page):
         )
         page.close(setting)
 
-    def DEL(e):
-        nonlocal page
+    def DEL(e, page=ft.Page):
+        nonlocal setting
         Phi.storage(page=page, type="DEL")
+        page.close(setting)
 
     # 页面组件树
     page.add(
@@ -271,6 +273,7 @@ def DEL(e):
             expand=True,
         )
     )
+    # print("[Log]",Phi.storage(page=page, key="data"))
     Phi.PhiData.on_data_change(
         datashow, Phi.hum_convert(Phi.storage(page=page, key="data")), page=page
     )