Refactored the method for retrieving course academic year and semester information.
Added time sorting for selected courses. Rewrote error handling mechanism to enhance code robustness.
This commit is contained in:
5 files changed
+47
-27
No files matched your search
+11
-1
@@ -1,4 +1,8 @@
|
||||
import traceback
|
||||
|
||||
|
||||
def get_grade(student_client, output_type="none"):
|
||||
try:
|
||||
# 获取成绩信息
|
||||
grade_data = student_client.get_grade().get("data", {})
|
||||
grade = grade_data.get("courses", [])
|
||||
@@ -16,7 +20,9 @@ def get_grade(student_client, output_type="none"):
|
||||
sorted_grade = sorted(
|
||||
grade,
|
||||
key=lambda x: (
|
||||
x["submission_time"] if x["submission_time"] else "1970-01-01 00:00:00"
|
||||
x["submission_time"]
|
||||
if x["submission_time"]
|
||||
else "1970-01-01 00:00:00"
|
||||
),
|
||||
reverse=True,
|
||||
)
|
||||
@@ -68,3 +74,7 @@ def get_grade(student_client, output_type="none"):
|
||||
return integrated_grade_info
|
||||
else:
|
||||
return "获取成绩:参数缺失"
|
||||
|
||||
except Exception:
|
||||
print(traceback.format_exc())
|
||||
return "获取成绩时出错"
|
||||
+23
-7
@@ -1,3 +1,4 @@
|
||||
import traceback
|
||||
from get_grade import get_grade
|
||||
|
||||
|
||||
@@ -10,6 +11,17 @@ def get_selected_courses(student_client):
|
||||
selected_courses_data = student_client.get_selected_courses().get("data", {})
|
||||
selected_courses = selected_courses_data.get("courses", [])
|
||||
|
||||
# 按照学年学期降序排序
|
||||
# 对于没有学年学期参数的课程,则将学年学期设置为1970至1971学年第1学期,否则将无法排序
|
||||
selected_courses = sorted(
|
||||
selected_courses,
|
||||
key=lambda x: (
|
||||
(x["course_year"] if x["course_year"] else "1970-1971"),
|
||||
(x["course_semester"] if x["course_semester"] else "1"),
|
||||
),
|
||||
reverse=True,
|
||||
)
|
||||
|
||||
# 已选课程信息不为空时,处理未公布成绩的课程和异常课程
|
||||
if selected_courses:
|
||||
# 初始化空字典用于存储未公布成绩的课程,按学年学期分组
|
||||
@@ -25,9 +37,13 @@ def get_selected_courses(student_client):
|
||||
|
||||
# 遍历selected_courses和grade中的每个课程
|
||||
for course in selected_courses + (grade or []):
|
||||
# 获取课程的class_id和学年学期
|
||||
yearsemester_id = course["class_name"].split("(")[1].split(")")[0]
|
||||
year, semester, seq = yearsemester_id.split("-")
|
||||
# 获取课程的学年和学期
|
||||
try:
|
||||
year, semester, seq = course["course_year"].split("-") + [
|
||||
course["course_semester"]
|
||||
]
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 构建年学期名称,例如 "a至b学年第c学期"
|
||||
yearsemester_name = f"{year}至{semester}学年第{seq}学期"
|
||||
@@ -79,8 +95,8 @@ def get_selected_courses(student_client):
|
||||
selected_courses_filtering += f"\n{course}"
|
||||
else:
|
||||
selected_courses_filtering = "------\n已选课程信息为空"
|
||||
except Exception as e:
|
||||
print(e)
|
||||
return "------\n无法获取未公布成绩的课程或异常的课程"
|
||||
|
||||
return selected_courses_filtering
|
||||
|
||||
except Exception:
|
||||
print(traceback.format_exc())
|
||||
return "------\n获取未公布成绩的课程或异常的课程时出错"
|
||||
+9
-1
@@ -1,7 +1,9 @@
|
||||
from get_grade import get_grade
|
||||
import traceback
|
||||
|
||||
|
||||
def get_user_info(student_client, output_type="none"):
|
||||
try:
|
||||
# 获取个人信息
|
||||
info = student_client.get_info()["data"]
|
||||
|
||||
@@ -19,7 +21,9 @@ def get_user_info(student_client, output_type="none"):
|
||||
gpa = get_grade(student_client, output_type="gpa")
|
||||
percentage_gpa = get_grade(student_client, output_type="percentage_gpa")
|
||||
# 整合个人信息
|
||||
gpa_info = f"\n当前GPA:{gpa}\n" f"当前百分制GPA:{percentage_gpa}\n" f"------"
|
||||
gpa_info = (
|
||||
f"\n当前GPA:{gpa}\n" f"当前百分制GPA:{percentage_gpa}\n" f"------"
|
||||
)
|
||||
integrated_info = f"{info}{gpa_info}"
|
||||
|
||||
if output_type == "info":
|
||||
@@ -30,3 +34,7 @@ def get_user_info(student_client, output_type="none"):
|
||||
return "获取个人信息:参数缺失"
|
||||
else:
|
||||
return info
|
||||
|
||||
except Exception:
|
||||
print(traceback.format_exc())
|
||||
return "获取个人信息时出错\n------"
|
||||
Loaded 3 of 5 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user