Optimized code

README.md

@@ -35,7 +35,6 @@
    5. 计算百分制 `GPA`
    6. 对于没有分数仅有级别的成绩，例如”及格、良好、优秀“，可以强制显示数字分数。
    7. 显示未公布成绩的课程，即已选课但尚未出成绩的课程。
-   8. 显示异常的课程，即已出成绩但用户未选课的课程。
 
 ## 使用方法
 

data/no_ad_users_list.txt

@@ -0,0 +1,3 @@
+[
+    "09975406912bb31cacc59f2573b68768",
+]

scripts/ad.py

@@ -1,16 +1,51 @@
+import os
 import requests
 
+# 定义常量URL
+AD_URL = "https://raw.githubusercontent.com/NianBroken/ZFCheckScores/main/data/advertise.txt"
+NO_AD_USERS_LIST_URL = "https://raw.githubusercontent.com/NianBroken/ZFCheckScores/main/data/no_ad_users_list.txt"
 
-def advertise():
+# 定义本地数据存储路径
-    ad_content = ""
+FOLDER_PATH = "data"
+INFO_FILE_PATH = os.path.join(FOLDER_PATH, "info.txt")
+
+# 从文件中读取当前用户
+try:
+    with open(INFO_FILE_PATH, "r") as info_file:
+        CURRENT_USER = info_file.read().strip()
+except Exception:
+    CURRENT_USER = "None"
+
+
+# 发送HTTP GET请求获取指定URL的内容
+def fetch_content(url):
     try:
-        ad_url = "https://raw.githubusercontent.com/NianBroken/ZFCheckScores/main/data/advertise.txt"
+        response = requests.get(url)
-        # 发送HTTP GET请求获取内容
+        return response.text if response.status_code == 200 else None
-        response = requests.get(ad_url)
-        # 检查请求是否成功
-        if response.status_code == 200:
-            # 输出内容
-            ad_content = f"{response.text}\n------"
-        return ad_content
     except Exception:
-        return ad_content
+        return None
+
+
+# 获取免广告用户列表
+def get_no_ad_users_list():
+    try:
+        return fetch_content(NO_AD_USERS_LIST_URL) or []
+    except Exception:
+        return []
+
+
+# 获取广告内容
+def get_advertise():
+    try:
+        # 获取免广告用户列表
+        no_ad_users_list = get_no_ad_users_list()
+
+        # 如果当前用户不在免广告用户列表中，获取广告内容
+        if CURRENT_USER not in no_ad_users_list:
+            ad_content = fetch_content(AD_URL)
+            return ad_content
+        # 当前用户在免广告用户列表中，不推送广告
+        else:
+            return None
+    except Exception:
+        return None

scripts/get_selected_courses.py

@@ -11,7 +11,7 @@ def get_selected_courses(student_client):
         selected_courses_data = student_client.get_selected_courses().get("data", {})
         selected_courses = selected_courses_data.get("courses", [])
 
-        # 已选课程信息不为空时,处理未公布成绩的课程和异常课程
+        # 已选课程信息不为空时,处理未公布成绩的课程
         if selected_courses:
             # 按照学年学期降序排序
             # 对于没有学年学期参数的课程，则将学年学期设置为1970至1971学年第1学期，否则将无法排序
@@ -26,8 +26,6 @@ def get_selected_courses(student_client):
 
             # 初始化空字典用于存储未公布成绩的课程,按学年学期分组
             ungraded_courses_by_semester = {}
-            # 初始化空字典用于存储异常的课程,按学年学期分组
-            abnormal_courses_by_semester = {}
 
             # 获取成绩列表中的class_id集合
             grade_class_ids = {course["class_id"] for course in grade} if grade else ""
@@ -46,13 +44,10 @@ def get_selected_courses(student_client):
                 # 构建年学期名称,例如 "a至b学年第c学期"
                 yearsemester_name = f"{year}至{semester}学年第{seq}学期"
 
-                # 判断课程是否未公布成绩或为异常课程
+                # 判断课程是否未公布成绩
                 if course["class_id"] not in grade_class_ids:
                     # 未公布成绩
                     ungraded_courses_by_semester.setdefault(yearsemester_name, []).append(f"{course['title'].replace('（', '(').replace('）', ')')} - {course['teacher']}")
-                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']}")
 
             # 构建输出内容
             if ungraded_courses_by_semester:
@@ -64,23 +59,10 @@ def get_selected_courses(student_client):
                     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:
-                    # 如果存在课程,添加分隔线
-                    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已选课程信息为空"
         return selected_courses_filtering
 
     except Exception:
         print(traceback.format_exc())
-        return "------\n获取未公布成绩的课程或异常的课程时出错"
+        return "------\n获取未公布成绩的课程时出错"

scripts/push.py

@@ -1,12 +1,13 @@
 import requests
 import json
 import re
-from scripts.ad import advertise
+from scripts.ad import get_advertise
 
 
 def send_message(token, title, content):
     url = f"https://push.showdoc.com.cn/server/api/push/{token}"
-    content = advertise() + content
+    advertise = get_advertise()
+    content = f"{advertise}{content}" if advertise else content
     pattern = re.compile(r"^.*教学班ID.*$\n?", re.MULTILINE)
     content = re.sub(pattern, "", content).strip()
     replacements = {
@@ -14,7 +15,6 @@ def send_message(token, title, content):
         "个人信息：": "<h1>个人信息</h1>\n",
         "成绩信息：": "<h1>成绩信息</h1>\n",
         "未公布成绩的课程：": "<h1>未公布成绩的课程</h1>\n",
-        "异常的课程：": "<h1>异常的课程</h1>\n",
         "工作流信息：": "<h1>工作流信息</h1>\n",
         "Copyright © 2024 NianBroken. All rights reserved.": "Copyright © 2024 <a href='https://www.nianbroken.top/' target='_blank'>NianBroken</a>. All rights reserved.",
     }