Add exception handling, fix URL splicing problem

This commit is contained in:
NianBroken
2024-05-08 23:53:30 +08:00 Unverified
parent f94304cb26
commit e75640a063
2 changed files with 72 additions and 64 deletions
+71 -63
View File
@@ -2,77 +2,85 @@ from get_grade import get_grade
def get_selected_courses(student_client): def get_selected_courses(student_client):
# 获取成绩信息 try:
grade = get_grade(student_client, output_type="grade") # 获取成绩信息
grade = get_grade(student_client, output_type="grade")
# 获取已选课程信息 # 获取已选课程信息
selected_courses_data = student_client.get_selected_courses().get("data", {}) selected_courses_data = student_client.get_selected_courses().get("data", {})
selected_courses = selected_courses_data.get("courses", []) selected_courses = selected_courses_data.get("courses", [])
# 已选课程信息不为空时,处理未公布成绩的课程和异常课程 # 已选课程信息不为空时,处理未公布成绩的课程和异常课程
if selected_courses: if selected_courses:
# 初始化空字典用于存储未公布成绩的课程,按学年学期分组 # 初始化空字典用于存储未公布成绩的课程,按学年学期分组
ungraded_courses_by_semester = {} ungraded_courses_by_semester = {}
# 初始化空字典用于存储异常的课程,按学年学期分组 # 初始化空字典用于存储异常的课程,按学年学期分组
abnormal_courses_by_semester = {} abnormal_courses_by_semester = {}
# 获取成绩列表中的class_id集合 # 获取成绩列表中的class_id集合
grade_class_ids = {course["class_id"] for course in grade} if grade else "" grade_class_ids = {course["class_id"] for course in grade} if grade else ""
# 初始化输出内容 # 初始化输出内容
selected_courses_filtering = "" selected_courses_filtering = ""
# 遍历selected_courses和grade中的每个课程 # 遍历selected_courses和grade中的每个课程
for course in selected_courses + (grade or []): for course in selected_courses + (grade or []):
# 获取课程的class_id和学年学期 # 获取课程的class_id和学年学期
yearsemester_id = course["class_name"].split("(")[1].split(")")[0] yearsemester_id = course["class_name"].split("(")[1].split(")")[0]
year, semester, seq = yearsemester_id.split("-") year, semester, seq = yearsemester_id.split("-")
# 构建年学期名称,例如 "a至b学年第c学期" # 构建年学期名称,例如 "a至b学年第c学期"
yearsemester_name = f"{year}{semester}学年第{seq}学期" yearsemester_name = f"{year}{semester}学年第{seq}学期"
# 判断课程是否未公布成绩或为异常课程 # 判断课程是否未公布成绩或为异常课程
if course["class_id"] not in grade_class_ids: if course["class_id"] not in grade_class_ids:
# 未公布成绩 # 未公布成绩
ungraded_courses_by_semester.setdefault(yearsemester_name, []).append( ungraded_courses_by_semester.setdefault(
f"{course['title'].replace('', '(').replace('', ')')} - {course['teacher']}" yearsemester_name, []
) ).append(
elif course["class_id"] not in { f"{course['title'].replace('', '(').replace('', ')')} - {course['teacher']}"
course["class_id"] for course in selected_courses )
}: elif course["class_id"] not in {
# 异常课程 course["class_id"] for course in selected_courses
abnormal_courses_by_semester.setdefault(yearsemester_name, []).append( }:
f"{course['title'].replace('', '(').replace('', ')')} - {course['teacher']}" # 异常课程
) abnormal_courses_by_semester.setdefault(
yearsemester_name, []
).append(
f"{course['title'].replace('', '(').replace('', ')')} - {course['teacher']}"
)
# 构建输出内容 # 构建输出内容
if ungraded_courses_by_semester:
# 存在未公布成绩的课程
selected_courses_filtering += "------\n未公布成绩的课程:"
for i, (semester, courses) in enumerate(
ungraded_courses_by_semester.items()
):
if i > 0:
selected_courses_filtering += "\n------"
selected_courses_filtering += f"\n{semester}"
for course in courses:
selected_courses_filtering += f"\n{course}"
if abnormal_courses_by_semester:
# 存在异常的课程
if ungraded_courses_by_semester: if ungraded_courses_by_semester:
# 如果存在课程,添加分隔线 # 存在未公布成绩的课程
selected_courses_filtering += "\n" selected_courses_filtering += "------\n未公布成绩的课程:"
selected_courses_filtering += "------\n异常的课程:" for i, (semester, courses) in enumerate(
for i, (semester, courses) in enumerate( ungraded_courses_by_semester.items()
abnormal_courses_by_semester.items() ):
): if i > 0:
if i > 0: selected_courses_filtering += "\n------"
selected_courses_filtering += "\n------" selected_courses_filtering += f"\n{semester}"
selected_courses_filtering += f"\n{semester}" for course in courses:
for course in courses: selected_courses_filtering += f"\n{course}"
selected_courses_filtering += f"\n{course}"
else: if abnormal_courses_by_semester:
selected_courses_filtering = "------\n已选课程信息为空" # 存在异常的课程
if ungraded_courses_by_semester:
# 如果存在课程,添加分隔线
selected_courses_filtering += "\n"
selected_courses_filtering += "------\n异常的课程:"
for i, (semester, courses) in enumerate(
abnormal_courses_by_semester.items()
):
if i > 0:
selected_courses_filtering += "\n------"
selected_courses_filtering += f"\n{semester}"
for course in courses:
selected_courses_filtering += f"\n{course}"
else:
selected_courses_filtering = "------\n已选课程信息为空"
except Exception as e:
print(e)
return "------\n无法获取未公布成绩的课程或异常的课程"
return selected_courses_filtering return selected_courses_filtering
+1 -1
View File
@@ -927,7 +927,7 @@ class Client:
try: try:
url = urljoin( url = urljoin(
self.base_url, self.base_url,
"/xsxxxggl/xsxxwh_cxXsxkxx.html?gnmkdm=N100801", "xsxxxggl/xsxxwh_cxXsxkxx.html?gnmkdm=N100801",
) )
temp_term = term temp_term = term
term = term**2 * 3 term = term**2 * 3