ksaa 2025.5.23.0__tar.gz → 2025.5.23.1__tar.gz

{ksaa-2025.5.23.0 → ksaa-2025.5.23.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ksaa
-Version: 2025.5.23.0
+Version: 2025.5.23.1
 Summary: Kotones Auto Assistant(kaa) is a script for game 'Gakuen Idol M@ster' that automates the dailies and produces.
 Requires-Python: ~=3.10
 Description-Content-Type: text/markdown

{ksaa-2025.5.23.0 → ksaa-2025.5.23.1}/WHATS_NEW.md

@@ -1,5 +1,13 @@
 # 更新日志
 ## kaa
+### v2025.5.23.1
+界面：
+* [新增] 当检测模拟器扫描失败时避免整个程序崩溃（#3d47d3a）
+
+框架：
+* [修复] 修复 Mumu12Host 意外搜索了国际版 MuMu 导致异常的问题（#191d212）
+* [修复] 修复当只存在单个多开实例时 MuMu12Host 报错（#cfd1f96）
+
 ### v2025.5.23.0
 脚本：
 * [修复] 修复 OCR 错误导致无法开始 MASTER 培育（#b4b14fa）

{ksaa-2025.5.23.0 → ksaa-2025.5.23.1}/kotonebot/client/host/mumu12_host.py

@@ -1,4 +1,5 @@
 import os
+import json
 import subprocess
 from functools import lru_cache
 from typing import Any
@@ -83,7 +84,8 @@ class Mumu12Host(HostProtocol):
 
         uninstall_subkeys = [
             r'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MuMuPlayer-12.0',
-            r'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MuMuPlayerGlobal-12.0'
+            # TODO: 支持国际版 MuMu
+            # r'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\MuMuPlayerGlobal-12.0'
         ]
 
         for subkey in uninstall_subkeys:
@@ -117,7 +119,8 @@ class Mumu12Host(HostProtocol):
             creationflags=subprocess.DETACHED_PROCESS | subprocess.CREATE_NEW_PROCESS_GROUP
         )
         if output.returncode != 0:
-            raise RuntimeError(f'Failed to invoke MuMuManager: {output.stderr}')
+            # raise RuntimeError(f'Failed to invoke MuMuManager: {output.stderr}')
+            logger.warning('Failed to invoke MuMuManager: %s', output.stderr)
         return output.stdout
 
     @staticmethod
@@ -127,9 +130,14 @@ class Mumu12Host(HostProtocol):
     @staticmethod
     def list() -> list[Instance]:
         output = Mumu12Host._invoke_manager(['info', '-v', 'all'])
-        import json
+        logger.debug('MuMuManager.exe output: %s', output)
+        
         try:
-            data: dict[str, dict[str, Any]] = json.loads(output)  # Assuming the output is a JSON array
+            data: dict[str, dict[str, Any]] = json.loads(output)
+            if 'name' in data.keys():
+                # 这里有个坑：
+                # 如果只有一个实例，返回的 JSON 结构是单个对象而不是数组
+                data = { '0': data }
             instances = []
             for index, instance_data in data.items():
                 instance = Mumu12Instance(

{ksaa-2025.5.23.0 → ksaa-2025.5.23.1}/kotonebot/kaa/main/gr.py

@@ -1,4 +1,5 @@
 import os
+import traceback
 import zipfile
 import logging
 from functools import partial
@@ -458,13 +459,18 @@ class KotoneBotUI:
             with gr.Tab("MuMu 12", interactive=has_mumu12, id="mumu12") as tab_mumu12:
                 gr.Markdown("已选中 MuMu 12 模拟器")
                 if has_mumu12:
-                    instances = Mumu12Host.list()
-                    mumu_instance = gr.Dropdown(
-                        label="选择多开实例",
-                        value=self.current_config.backend.instance_id,
-                        choices=[(i.name, i.id) for i in instances],
-                        interactive=True
-                    )
+                    try:
+                        instances = Mumu12Host.list()
+                        mumu_instance = gr.Dropdown(
+                            label="选择多开实例",
+                            value=self.current_config.backend.instance_id,
+                            choices=[(i.name, i.id) for i in instances],
+                            interactive=True
+                        )
+                    except:  # noqa: E722
+                        logger.exception('Failed to list installed MuMu12')
+                        gr.Markdown('获取 MuMu12 模拟器列表失败，请前往 QQ 群、QQ 频道或 Github 反馈 bug。')
+                        mumu_instance = gr.Dropdown(visible=False)
                 else:
                     # 为了让 return 收集组件时不报错
                     mumu_instance = gr.Dropdown(visible=False)
@@ -472,13 +478,18 @@ class KotoneBotUI:
             with gr.Tab("雷电", interactive=has_leidian, id="leidian") as tab_leidian:
                 gr.Markdown("已选中雷电模拟器")
                 if has_leidian:
-                    instances = LeidianHost.list()
-                    leidian_instance = gr.Dropdown(
-                        label="选择多开实例",
-                        value=self.current_config.backend.instance_id,
-                        choices=[(i.name, i.id) for i in instances],
-                        interactive=True
-                    )
+                    try:
+                        instances = LeidianHost.list()
+                        leidian_instance = gr.Dropdown(
+                            label="选择多开实例",
+                            value=self.current_config.backend.instance_id,
+                            choices=[(i.name, i.id) for i in instances],
+                            interactive=True
+                        )
+                    except:  # noqa: E722
+                        logger.exception('Failed to list installed Leidian')
+                        gr.Markdown('获取雷电模拟器列表失败，请前往 QQ 群、QQ 频道或 Github 反馈 bug。')
+                        leidian_instance = gr.Dropdown(visible=False)
                 else:
                     leidian_instance = gr.Dropdown(visible=False)
 

{ksaa-2025.5.23.0 → ksaa-2025.5.23.1}/kotonebot/kaa/metadata.py

@@ -1,6 +1,14 @@
 WHATS_NEW = """
 # 更新日志
 ## kaa
+### v2025.5.23.1
+界面：
+* [新增] 当检测模拟器扫描失败时避免整个程序崩溃（#3d47d3a）
+
+框架：
+* [修复] 修复 Mumu12Host 意外搜索了国际版 MuMu 导致异常的问题（#191d212）
+* [修复] 修复当只存在单个多开实例时 MuMu12Host 报错（#cfd1f96）
+
 ### v2025.5.23.0
 脚本：
 * [修复] 修复 OCR 错误导致无法开始 MASTER 培育（#b4b14fa）