修复

- 修复 学生名单导出，修复导出失败时**AttributeError**报错
- 修复 TTS语音引擎，优化初始化失败的**异常处理**逻辑
- 修复 音乐播放功能，修复非随机播放时**UnboundLocalError**报错
- 修复 语音播放队列，优化队列已满时的**日志级别**
- 修复 语音生成功能，优化网络错误重试时的**日志级别**
- 修复 设置文件读取，修复空文件**JSON解析**错误
- 修复 图标加载功能，修复空文件**图标映射**错误

Author: lzy98276

CHANGELOG/v2.2.1/CHANGELOG.md

@@ -7,11 +7,17 @@ v2.0 - Koharu（小鸟游星野） release 4
 
 ## 💡 功能优化
 
-- 无
+- 优化 Sentry错误上报，过滤**第三方库**无效错误
 
 ## 🐛 修复问题
 
-- 修复 **日志等级** 问题，防止 Sentry 爆炸。
+- 修复 学生名单导出，修复导出失败时**AttributeError**报错
+- 修复 TTS语音引擎，优化初始化失败的**异常处理**逻辑
+- 修复 音乐播放功能，修复非随机播放时**UnboundLocalError**报错
+- 修复 语音播放队列，优化队列已满时的**日志级别**
+- 修复 语音生成功能，优化网络错误重试时的**日志级别**
+- 修复 设置文件读取，修复空文件**JSON解析**错误
+- 修复 图标加载功能，修复空文件**图标映射**错误
 
 ## 🔧 其它变更
 

app/common/display/result_display.py

@@ -460,7 +460,9 @@ def create_student_label(
         """
         # 检查 selected_students 是否为 None，避免后续的 len() 调用和迭代操作失败
         if selected_students is None:
-            logger.warning("create_student_label: selected_students 为 None，可能是未设置默认班级或抽取名单")
+            logger.warning(
+                "create_student_label: selected_students 为 None，可能是未设置默认班级或抽取名单"
+            )
             return []
 
         student_labels = []

app/common/music/music_player.py

@@ -70,10 +70,10 @@ def play_music(
 
         # 获取音乐文件路径
         try:
+            from app.tools.path_utils import get_audio_path
+
             if is_random_play:
                 # 随机播放：从音乐文件列表中随机选择一个
-                from app.tools.path_utils import get_audio_path
-
                 audio_dir = get_audio_path("music")
                 if audio_dir.exists():
                     supported_formats = [".mp3", ".flac", ".wav", ".ogg"]

app/common/voice/voice.py

@@ -48,7 +48,7 @@ def wrapper(self, *args, **kwargs):
             # 示例：检查当前用户是否有使用TTS的权限
             has_perm = True  # 实际实现时替换为真实权限检查
             if not has_perm:
-                logger.exception(f"权限不足，无法执行 {func.__name__}")
+                logger.warning(f"权限不足，无法执行 {func.__name__}")
                 return
             return func(self, *args, **kwargs)
 
@@ -78,15 +78,15 @@ def set_volume(self, volume: float) -> None:
         """设置播放音量，范围0.0-1.0"""
         # 输入验证
         if not isinstance(volume, (int, float)):
-            logger.exception(f"无效的音量值: {volume}")
+            logger.warning(f"无效的音量值: {volume}")
             return
         self._volume = max(0.0, min(1.0, float(volume)))
 
     def set_speed(self, speed: int) -> None:
         """设置播放语速，范围0-200"""
         # 输入验证
         if not isinstance(speed, int):
-            logger.exception(f"无效的语速值: {speed}")
+            logger.warning(f"无效的语速值: {speed}")
             return
         self._speed = max(0, min(200, speed))
 
@@ -240,21 +240,21 @@ def add_task(self, task: Union[Tuple[np.ndarray, int], str]) -> bool:
             # 输入验证
             if isinstance(task, tuple):  # 内存数据
                 if len(task) != 2:
-                    logger.exception(f"无效的任务格式: {task}")
+                    logger.warning(f"无效的任务格式: {task}")
                     return False
                 data, fs = task
                 if not isinstance(data, np.ndarray) or not isinstance(fs, int):
-                    logger.exception("无效的内存数据格式")
+                    logger.warning("无效的内存数据格式")
                     return False
             else:  # 文件路径
                 if not isinstance(task, str) or not task:
-                    logger.exception("无效的文件路径")
+                    logger.warning("无效的文件路径")
                     return False
 
             self.play_queue.put_nowait(task)
             return True
         except queue.Full:
-            logger.exception("播放队列已满，丢弃新任务")
+            logger.warning("播放队列已满，丢弃新任务")
             return False
         except Exception as e:
             logger.exception(f"添加播放任务失败: {e}")
@@ -314,10 +314,10 @@ def get_voice(self, text: str, voice: str) -> Tuple[np.ndarray, int]:
         """获取语音数据（自动缓存）"""
         # 输入验证
         if not isinstance(text, str) or not text:
-            logger.exception(f"无效的文本: {text}")
+            logger.warning(f"无效的文本: {text}")
             raise ValueError("文本不能为空")
         if not isinstance(voice, str) or not voice:
-            logger.exception(f"无效的语音名称: {voice}")
+            logger.warning(f"无效的语音名称: {voice}")
             raise ValueError("语音名称不能为空")
 
         logger.debug(f"获取语音: text='{text}', voice='{voice}'")
@@ -396,28 +396,28 @@ async def _generate_voice(self, text: str, voice: str) -> Tuple[np.ndarray, int]
                 return data, fs
             except NoAudioReceived as e:
                 retry_count += 1
-                logger.exception(
+                logger.warning(
                     f"生成语音失败，未接收到音频数据，重试{retry_count}/{max_retries}: {type(e).__name__} {e}"
                 )
                 if retry_count < max_retries:
                     await asyncio.sleep(1)
             except WebSocketError as e:
                 retry_count += 1
-                logger.exception(
+                logger.warning(
                     f"生成语音失败，WebSocket通信错误，重试{retry_count}/{max_retries}: {type(e).__name__} {e}"
                 )
                 if retry_count < max_retries:
                     await asyncio.sleep(1)
             except Exception as e:
                 retry_count += 1
-                logger.exception(
+                logger.warning(
                     f"生成语音失败，重试{retry_count}/{max_retries}: {type(e).__name__} {e}"
                 )
                 if retry_count < max_retries:
                     await asyncio.sleep(1)
 
         # 最终失败时的降级处理
-        logger.exception("生成语音失败，已达到最大重试次数")
+        logger.warning("生成语音失败，已达到最大重试次数")
         raise RuntimeError("生成语音失败")
 
     def _generate_cache_key(self, text: str, voice: str) -> str:
@@ -644,23 +644,30 @@ def _init_tts_engine(self) -> None:
                     and sys.getwindowsversion().major >= 10
                     and platform.machine() != "x86"
                 ):
-                    if not hasattr(
-                        QApplication.instance(), "pumping_reward_voice_engine"
-                    ):
-                        QApplication.instance().pumping_reward_voice_engine = (
-                            pyttsx3.init()
+                    try:
+                        if not hasattr(
+                            QApplication.instance(), "pumping_reward_voice_engine"
+                        ):
+                            QApplication.instance().pumping_reward_voice_engine = (
+                                pyttsx3.init()
+                            )
+                            QApplication.instance().pumping_reward_voice_engine.startLoop(
+                                False
+                            )
+                        self.voice_engine = (
+                            QApplication.instance().pumping_reward_voice_engine
                         )
-                        QApplication.instance().pumping_reward_voice_engine.startLoop(
-                            False
+                        logger.info("Windows系统TTS引擎初始化成功")
+                    except Exception as e:
+                        logger.warning(
+                            f"Windows系统TTS引擎初始化失败: {e}，语音功能将不可用"
                         )
-                    self.voice_engine = (
-                        QApplication.instance().pumping_reward_voice_engine
-                    )
-                    logger.info("Windows系统TTS引擎初始化成功")
+                        self.voice_engine = None
                 else:
-                    logger.exception(
+                    logger.warning(
                         "Windows系统TTS引擎需要Windows 10及以上系统且非x86架构"
                     )
+                    self.voice_engine = None
 
             elif system == "Linux":
                 # Linux平台TTS引擎初始化
@@ -686,17 +693,20 @@ def _init_tts_engine(self) -> None:
                         )
                         logger.info("Linux系统TTS引擎初始化成功 (使用espeak)")
                     else:
-                        logger.exception(
+                        logger.warning(
                             "Linux系统TTS引擎需要安装espeak: sudo apt-get install espeak"
                         )
+                        self.voice_engine = None
                 except Exception as e:
-                    logger.exception(f"Linux系统TTS引擎初始化失败: {e}")
+                    logger.warning(f"Linux系统TTS引擎初始化失败: {e}，语音功能将不可用")
+                    self.voice_engine = None
 
             else:
-                logger.exception(f"不支持的操作系统: {system}，系统TTS功能不可用")
+                logger.warning(f"不支持的操作系统: {system}，系统TTS功能不可用")
+                self.voice_engine = None
 
         except Exception as e:
-            logger.exception(f"TTS引擎初始化失败: {e}")
+            logger.warning(f"TTS引擎初始化失败: {e}，语音功能将不可用")
             self.voice_engine = None
 
     @require_permission("tts.use")

app/tools/personalised.py

@@ -183,7 +183,12 @@ def _get_icon_map():
         try:
             map_path = get_data_path("assets", "FluentSystemIcons-Filled.json")
             with open(map_path, "r", encoding="utf-8") as f:
-                _icon_map_cache = json.load(f)
+                content = f.read()
+                if not content or not content.strip():
+                    logger.warning(f"图标映射表文件为空: {map_path}")
+                    _icon_map_cache = {}
+                else:
+                    _icon_map_cache = json.loads(content)
         except Exception as e:
             logger.exception(f"加载图标映射表失败: {e}")
             _icon_map_cache = {}

app/tools/settings_access.py

@@ -145,14 +145,18 @@ def readme_settings(first_level_key: str, second_level_key: str):
         settings_path = get_settings_path()
         if file_exists(settings_path):
             with open_file(settings_path, "r", encoding="utf-8") as f:
-                settings_data = json.load(f)
-                if (
-                    first_level_key in settings_data
-                    and second_level_key in settings_data[first_level_key]
-                ):
-                    value = settings_data[first_level_key][second_level_key]
-                    # logger.debug(f"从设置文件读取: {first_level_key}.{second_level_key} = {value}")
-                    return value
+                content = f.read()
+                if not content or not content.strip():
+                    logger.warning(f"设置文件为空: {settings_path}")
+                else:
+                    settings_data = json.loads(content)
+                    if (
+                        first_level_key in settings_data
+                        and second_level_key in settings_data[first_level_key]
+                    ):
+                        value = settings_data[first_level_key][second_level_key]
+                        # logger.debug(f"从设置文件读取: {first_level_key}.{second_level_key} = {value}")
+                        return value
 
         default_setting = _get_default_setting(first_level_key, second_level_key)
         if isinstance(default_setting, dict) and "default_value" in default_setting:

app/tools/variable.py

@@ -9,7 +9,7 @@
 # -------------------- 软件基本信息 --------------------
 APPLY_NAME = "SecRandom"  # 软件名称
 VERSION = "v0.0.0"  # 软件当前版本
-NEXT_VERSION = "v2.2.0"  # 软件下一个版本
+NEXT_VERSION = "v2.2.1"  # 软件下一个版本
 CODENAME = "Koharu"  # 软件代号
 SPECIAL_VERSION = VERSION if VERSION != "v0.0.0" else NEXT_VERSION
 SYSTEM = "windows" if os.name == "nt" else "linux"  # 软件系统

app/view/main/quick_draw_animation.py

@@ -172,7 +172,9 @@ def draw_random_students(self):
         class_name = readme_settings_async("quick_draw_settings", "default_class")
         if not class_name:
             # 未设置默认班级，初始化为空结果并停止动画
-            logger.warning("draw_random_students: 未设置默认抽取名单，请在设置中配置默认班级")
+            logger.warning(
+                "draw_random_students: 未设置默认抽取名单，请在设置中配置默认班级"
+            )
             self.final_selected_students = []
             self.final_class_name = None
             # 停止动画计时器

app/view/settings/list_management/list_management.py

@@ -340,13 +340,15 @@ def export_student_list(self):
                     "export",
                     "title",
                     "success",
+                    "name",
                 ),
                 content=get_any_position_value_async(
                     "notification",
                     "roll_call",
                     "export",
                     "content",
                     "success",
+                    "name",
                 ).format(path=file_path),
                 duration=3000,
             )
@@ -360,13 +362,15 @@ def export_student_list(self):
                     "export",
                     "title",
                     "failure",
+                    "name",
                 ),
                 content=get_any_position_value_async(
                     "notification",
                     "roll_call",
                     "export",
                     "content",
                     "error",
+                    "name",
                 ).format(message=message),
                 duration=3000,
             )

app/view/settings/update.py

@@ -998,8 +998,6 @@ def set_download_cancelled(self):
             Q_ARG(str, get_content_name_async("update", "update_cancelled")),
         )
 
-
-
     def _restore_from_global_status(self):
         """从全局状态管理器恢复状态"""
         try: