1

djkcyl · Mar 13, 2023 · bfa643b · bfa643b
1 parent 346153f
commit bfa643b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/aunly_bbot/static/mobile_style.js b/aunly_bbot/static/mobile_style.js
@@ -147,7 +147,7 @@ function setFont(font = "", fontSource = "local") {
     const needLoadFontList = [
         {
             fontUrl: "https://fonts.bbot?name=HarmonyOS_Sans_SC_Medium.ttf",
-            fontFamily: "HarmonyOS_Sans_SC_Medium.ttf",
+            fontFamily: "HarmonyOS_Sans_SC_Medium",
         }
     ];
     const emojiFontList = ["Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"];

diff --git a/aunly_bbot/utils/browser_shot.py b/aunly_bbot/utils/browser_shot.py
@@ -42,7 +42,7 @@ async def fill_font(route: Route, request: Request):
         )
         return
     except Exception:
-        logger.debug(f"can't get font {url.name}")
+        logger.error(f"找不到字体 {url.name}")
         await route.fallback()
 
 

diff --git a/main-full.spec b/main-full.spec
@@ -1,5 +1,8 @@
 # -*- mode: python ; coding: utf-8 -*-
-from PyInstaller.utils.hooks import copy_metadata
+from PyInstaller.utils.hooks import copy_metadata, collect_dynamic_libs
+
+binaries = []
+binaries += collect_dynamic_libs('minidynamicrender')
 
 datas = [
     ('aunly_bbot/static/bot_config.exp.yaml', 'aunly_bbot/static'), 
@@ -22,7 +25,7 @@ block_cipher = None
 a = Analysis(
     ['main.py'],
     pathex=[],
-    binaries=[],
+    binaries=binaries,
     datas=datas,
     hiddenimports=['graia.creart', 'graia.creart.broadcast', 'graia.creart.saya', 'graia.ariadne.message.commander.creart'],
     hookspath=[],

diff --git a/main-lite.spec b/main-lite.spec
@@ -1,5 +1,8 @@
 # -*- mode: python ; coding: utf-8 -*-
-from PyInstaller.utils.hooks import copy_metadata
+from PyInstaller.utils.hooks import copy_metadata, collect_dynamic_libs
+
+binaries = []
+binaries += collect_dynamic_libs('minidynamicrender')
 
 datas = [
     ('aunly_bbot/static/bot_config.exp.yaml', 'aunly_bbot/static'), 
@@ -21,7 +24,7 @@ block_cipher = None
 a = Analysis(
     ['main.py'],
     pathex=[],
-    binaries=[],
+    binaries=binaries,
     datas=datas,
     hiddenimports=['graia.creart', 'graia.creart.broadcast', 'graia.creart.saya', 'graia.ariadne.message.commander.creart'],
     hookspath=[],

diff --git a/nuitka-full.yml b/nuitka-full.yml
@@ -46,6 +46,11 @@
     patterns:
       - '_cython\_credentials\roots.pem'
 
+- module-name: minidynamicrender
+  data-files:
+    patterns:
+      - 'Static.zip'
+
 - module-name: playwright
   data-files:
     dirs:

diff --git a/nuitka-lite.yml b/nuitka-lite.yml
@@ -46,4 +46,9 @@
     patterns:
       - '_cython\_credentials\roots.pem'
 
+- module-name: minidynamicrender
+  data-files:
+    patterns:
+      - 'Static.zip'
+
 # nuitka --standalone --show-progress --output-dir=build .\test.py