完善CSES功能

Author: lzy98276

.gitignore

@@ -192,3 +192,4 @@ cython_debug/
 /data/list
 /data/audio
 /data/TEMP
+/data/CSES

app/Language/modules/more_settings.py

@@ -35,9 +35,9 @@
         },
         "import_from_file": {"name": "从文件导入"},
         "importing": {"name": "导入中..."},
-        "view_template": {"name": "查看模板"},
+        "view_current_config": {"name": "查看当前配置"},
         "no_schedule_imported": {"name": "未导入课程表"},
-        "schedule_imported": {"name": "已导入 {} 个非上课时间段"},
+        "schedule_imported": {"name": "已导入 {} 个上课时间段"},
         "copy_to_clipboard": {"name": "复制到剪贴板"},
         "save_as_file": {"name": "保存为文件"},
         "close": {"name": "关闭"},
@@ -60,6 +60,22 @@
         "cses_content_format_error": {"name": "CSES内容格式错误"},
         "no_valid_time_periods": {"name": "未能从课程表中提取有效的时间段信息"},
         "save_settings_failed": {"name": "保存设置失败"},
+        "no_cses_folder": {"name": "未找到CSES文件夹"},
+        "no_schedule_file": {"name": "未导入课程表文件"},
+        "unknown": {"name": "未知"},
+        "unknown_course": {"name": "未知课程"},
+        "parse_failed": {"name": "解析失败"},
+        "load_config_failed": {"name": "加载配置失败: {}"},
+        "table_headers": {"name": ["星期", "课程名称", "开始时间", "结束时间", "老师"]},
+        "day_map": {
+            "1": "周一",
+            "2": "周二",
+            "3": "周三",
+            "4": "周四",
+            "5": "周五",
+            "6": "周六",
+            "7": "周日",
+        },
     },
     "EN_US": {
         "title": {
@@ -84,7 +100,7 @@
         },
         "import_from_file": {"name": "Import from File"},
         "importing": {"name": "Importing..."},
-        "view_template": {"name": "View Template"},
+        "view_current_config": {"name": "View Current Config"},
         "no_schedule_imported": {"name": "No schedule imported"},
         "schedule_imported": {"name": "Imported {} non-class time periods"},
         "copy_to_clipboard": {"name": "Copy to Clipboard"},
@@ -113,6 +129,24 @@
             "name": "Failed to extract valid time periods from the schedule"
         },
         "save_settings_failed": {"name": "Failed to save settings"},
+        "no_cses_folder": {"name": "CSES folder not found"},
+        "no_schedule_file": {"name": "No schedule file imported"},
+        "unknown": {"name": "Unknown"},
+        "unknown_course": {"name": "Unknown course"},
+        "parse_failed": {"name": "Parse failed"},
+        "load_config_failed": {"name": "Failed to load config: {}"},
+        "table_headers": {
+            "name": ["Day", "Course Name", "Start Time", "End Time", "Teacher"]
+        },
+        "day_map": {
+            "1": "Monday",
+            "2": "Tuesday",
+            "3": "Wednesday",
+            "4": "Thursday",
+            "5": "Friday",
+            "6": "Saturday",
+            "7": "Sunday",
+        },
     },
 }
 

app/Language/obtain_language.py

@@ -221,12 +221,17 @@ def get_content_name(first_level_key: str, second_level_key: str):
         second_level_key: 第二层的键
 
     Returns:
-        内容文本项的名称，如果不存在则返回None
+        内容文本项的名称，如果不存在则返回该内容本身或None
     """
     if first_level_key in Language:
         if second_level_key in Language[first_level_key]:
             # logger.debug(f"获取内容文本项: {first_level_key}.{second_level_key}")
-            return Language[first_level_key][second_level_key]["name"]
+            content = Language[first_level_key][second_level_key]
+            # 如果是字典类型，尝试获取name属性
+            if isinstance(content, dict):
+                return content.get("name") or content
+            # 否则直接返回内容
+            return content
     return None
 
 

app/common/extraction/cses_parser.py

@@ -57,21 +57,21 @@ def _validate_schedule(self) -> bool:
             return False
 
         # 基本结构验证
-        if "schedule" not in self.schedule_data:
+        schedule = self.schedule_data.get("schedule")
+        if not schedule:
             logger.error("缺少'schedule'字段")
             return False
 
-        schedule = self.schedule_data["schedule"]
         if not isinstance(schedule, dict):
             logger.error("'schedule'字段必须是字典类型")
             return False
 
         # 验证时间段配置
-        if "timeslots" not in schedule:
+        timeslots = schedule.get("timeslots")
+        if timeslots is None:
             logger.error("缺少'timeslots'字段")
             return False
 
-        timeslots = schedule["timeslots"]
         if not isinstance(timeslots, list):
             logger.error("'timeslots'字段必须是列表类型")
             return False
@@ -93,6 +93,11 @@ def _validate_timeslot(self, timeslot: dict, index: int) -> bool:
         Returns:
             bool: 有效返回True，否则返回False
         """
+        # 检查timeslot是否为字典类型
+        if not isinstance(timeslot, dict):
+            logger.error(f"时间段{index}必须是字典类型")
+            return False
+
         required_fields = ["name", "start_time", "end_time"]
         for field in required_fields:
             if field not in timeslot:
@@ -150,17 +155,26 @@ def get_non_class_times(self) -> Dict[str, str]:
             return {}
 
         non_class_times = {}
-        schedule = self.schedule_data["schedule"]
-        timeslots = schedule["timeslots"]
+        schedule = self.schedule_data.get("schedule", {})
+        timeslots = schedule.get("timeslots", [])
 
-        # 按开始时间排序
-        sorted_timeslots = sorted(timeslots, key=lambda x: x["start_time"])
+        # 过滤并排序有效的时间段
+        valid_timeslots = [
+            slot
+            for slot in timeslots
+            if isinstance(slot, dict)
+            and slot.get("start_time")
+            and slot.get("end_time")
+        ]
+        sorted_timeslots = sorted(
+            valid_timeslots, key=lambda x: x.get("start_time", "")
+        )
 
         # 构建上课时间段列表
         class_periods = []
         for timeslot in sorted_timeslots:
-            start_time = self._format_time_for_secrandom(timeslot["start_time"])
-            end_time = self._format_time_for_secrandom(timeslot["end_time"])
+            start_time = self._format_time_for_secrandom(timeslot.get("start_time", ""))
+            end_time = self._format_time_for_secrandom(timeslot.get("end_time", ""))
             class_periods.append((start_time, end_time))
 
         # 生成非上课时间段
@@ -209,20 +223,21 @@ def get_class_info(self) -> List[Dict]:
         if not self.schedule_data:
             return []
 
-        schedule = self.schedule_data["schedule"]
+        schedule = self.schedule_data.get("schedule", {})
         timeslots = schedule.get("timeslots", [])
 
         class_info = []
         for timeslot in timeslots:
-            info = {
-                "name": timeslot.get("name", ""),
-                "start_time": timeslot.get("start_time", ""),
-                "end_time": timeslot.get("end_time", ""),
-                "teacher": timeslot.get("teacher", ""),
-                "location": timeslot.get("location", ""),
-                "day_of_week": timeslot.get("day_of_week", ""),
-            }
-            class_info.append(info)
+            if isinstance(timeslot, dict):
+                info = {
+                    "name": timeslot.get("name", ""),
+                    "start_time": timeslot.get("start_time", ""),
+                    "end_time": timeslot.get("end_time", ""),
+                    "teacher": timeslot.get("teacher", ""),
+                    "location": timeslot.get("location", ""),
+                    "day_of_week": timeslot.get("day_of_week", ""),
+                }
+                class_info.append(info)
 
         return class_info
 
@@ -235,15 +250,26 @@ def get_summary(self) -> str:
         if not self.schedule_data:
             return "未加载课程表"
 
-        schedule = self.schedule_data["schedule"]
+        schedule = self.schedule_data.get("schedule", {})
         timeslots = schedule.get("timeslots", [])
 
         if not timeslots:
             return "课程表为空"
 
         # 获取最早和最晚时间
-        start_times = [slot["start_time"] for slot in timeslots]
-        end_times = [slot["end_time"] for slot in timeslots]
+        start_times = [
+            slot.get("start_time", "")
+            for slot in timeslots
+            if isinstance(slot, dict) and slot.get("start_time")
+        ]
+        end_times = [
+            slot.get("end_time", "")
+            for slot in timeslots
+            if isinstance(slot, dict) and slot.get("end_time")
+        ]
+
+        if not start_times or not end_times:
+            return f"课程表包含{len(timeslots)}个时间段"
 
         summary = f"课程表包含{len(timeslots)}个时间段，"
         summary += f"最早开始时间：{min(start_times)}，"

app/common/extraction/extract.py

@@ -10,6 +10,8 @@
 import json
 from typing import Dict
 from loguru import logger
+import shutil
+from pathlib import Path
 from PySide6.QtCore import QDateTime
 
 from app.tools.path_utils import *
@@ -199,6 +201,13 @@ def import_cses_schedule(file_path: str) -> tuple[bool, str]:
                 "time_settings", "no_valid_time_periods"
             )
 
+        # 保存原始文件到data/CSES文件夹
+        original_file_name = Path(file_path).name
+        cses_data_path = get_data_path("CSES", original_file_name)
+        ensure_dir(get_data_path("CSES"))
+        shutil.copy2(file_path, cses_data_path)
+        logger.info(f"已将CSES文件保存到: {cses_data_path}")
+
         # 保存到设置文件
         success = _save_non_class_times_to_settings(non_class_times)
         if not success:

app/page_building/another_window.py

@@ -13,7 +13,7 @@
 from app.view.another_window.prize.prize_name_setting import PrizeNameSettingWindow
 from app.view.another_window.prize.prize_weight_setting import PrizeWeightSettingWindow
 from app.view.another_window.remaining_list import RemainingListPage
-from app.view.another_window.cses_template_viewer import CsesTemplateViewerWindow
+from app.view.another_window.current_config_viewer import CurrentConfigViewerWindow
 from app.Language.obtain_language import *
 from app.tools.variable import *
 
@@ -49,38 +49,6 @@ def create_set_class_name_window():
     return
 
 
-# ==================================================
-# CSES模板查看窗口
-# ==================================================
-class cses_template_viewer_window_template(PageTemplate):
-    """CSES模板查看窗口类
-    使用PageTemplate创建CSES模板查看页面"""
-
-    def __init__(self, parent=None):
-        super().__init__(content_widget_class=CsesTemplateViewerWindow, parent=parent)
-
-
-def create_cses_template_viewer_window():
-    """
-    创建CSES模板查看窗口
-
-    Returns:
-        创建的窗口实例
-    """
-    title = get_content_name_async("time_settings", "template_title")
-    window = SimpleWindowTemplate(title, width=700, height=500)
-    window.add_page_from_template(
-        "cses_template_viewer", cses_template_viewer_window_template
-    )
-    window.switch_to_page("cses_template_viewer")
-    _window_instances["cses_template_viewer"] = window
-    window.windowClosed.connect(
-        lambda: _window_instances.pop("cses_template_viewer", None)
-    )
-    window.show()
-    return
-
-
 # ==================================================
 # 导入学生名单导入窗口
 # ==================================================
@@ -508,3 +476,35 @@ def check_page():
         check_page()
 
     return window, get_page_callback
+
+
+# ==================================================
+# 当前配置查看窗口
+# ==================================================
+class current_config_viewer_window_template(PageTemplate):
+    """当前配置查看窗口类
+    使用PageTemplate创建当前配置查看页面"""
+
+    def __init__(self, parent=None):
+        super().__init__(content_widget_class=CurrentConfigViewerWindow, parent=parent)
+
+
+def create_current_config_viewer_window():
+    """
+    创建当前配置查看窗口
+
+    Returns:
+        创建的窗口实例
+    """
+    title = get_content_name_async("time_settings", "cses_import_settings", "name")
+    window = SimpleWindowTemplate(title, width=800, height=600)
+    window.add_page_from_template(
+        "current_config_viewer", current_config_viewer_window_template
+    )
+    window.switch_to_page("current_config_viewer")
+    _window_instances["current_config_viewer"] = window
+    window.windowClosed.connect(
+        lambda: _window_instances.pop("current_config_viewer", None)
+    )
+    window.show()
+    return