This commit is contained in:
100
parser/score.go
100
parser/score.go
@@ -39,29 +39,13 @@ func ParseGradesHTML(html string) ([]models.GradeEntry, error) {
|
||||
|
||||
isMidterm := len(texts) == 10
|
||||
|
||||
entry := models.GradeEntry{
|
||||
Term: safeGet(texts, 1),
|
||||
Code: safeGet(texts, 3),
|
||||
Name: safeGet(texts, 4),
|
||||
Credit: safeGet(texts, 7),
|
||||
}
|
||||
entry := parseGradeRowTexts(texts, detectRetake(row))
|
||||
|
||||
if isMidterm {
|
||||
if isMidterm && entry.Score == "" {
|
||||
entry.Score = safeGet(texts, 8)
|
||||
if len(texts) > 9 {
|
||||
entry.GradePoint = safeGet(texts, 9)
|
||||
}
|
||||
} else {
|
||||
if len(texts) >= 13 {
|
||||
entry.Nature = safeGet(texts, 3)
|
||||
entry.Category = safeGet(texts, 4)
|
||||
entry.Score = safeGet(texts, 12)
|
||||
entry.GradePoint = safeGet(texts, 9)
|
||||
entry.IsExam = safeGet(texts, 6)
|
||||
} else if len(texts) >= 10 {
|
||||
entry.Score = safeGet(texts, 8)
|
||||
entry.GradePoint = safeGet(texts, 9)
|
||||
}
|
||||
}
|
||||
|
||||
if entry.Name != "" && len(entry.Name) >= 2 {
|
||||
@@ -123,17 +107,7 @@ func ParseGPAHTML(html string) (*models.GPASummary, []models.GradeEntry, error)
|
||||
|
||||
texts := getCellTexts(cells)
|
||||
|
||||
entry := models.GradeEntry{
|
||||
Term: safeGet(texts, 0),
|
||||
Code: safeGet(texts, 1),
|
||||
Name: safeGet(texts, 2),
|
||||
Nature: safeGet(texts, 3),
|
||||
Category: safeGet(texts, 4),
|
||||
IsExam: safeGet(texts, 6),
|
||||
Credit: safeGet(texts, 7),
|
||||
Score: safeGet(texts, 8),
|
||||
GradePoint: safeGet(texts, 9),
|
||||
}
|
||||
entry := parseGradeRowTexts(texts, detectRetake(row))
|
||||
|
||||
if entry.Name != "" && len(entry.Name) >= 2 {
|
||||
grades = append(grades, entry)
|
||||
@@ -144,6 +118,74 @@ func ParseGPAHTML(html string) (*models.GPASummary, []models.GradeEntry, error)
|
||||
return summary, grades, nil
|
||||
}
|
||||
|
||||
func parseGradeRowTexts(texts []string, isRetake bool) models.GradeEntry {
|
||||
entry := models.GradeEntry{IsRetake: isRetake}
|
||||
|
||||
// 详细成绩/GPA 页面格式:
|
||||
// 序号、学期、学院、课程代码、课程名称、课程性质、课程类别、学分、是否考试课、是否学位课、成绩标记、成绩、最终成绩、绩点1、绩点、录入时间、备注。
|
||||
if len(texts) >= 15 && looksLikeDetailedGradeRow(texts) {
|
||||
entry.Term = safeGet(texts, 1)
|
||||
entry.Code = safeGet(texts, 3)
|
||||
entry.Name = safeGet(texts, 4)
|
||||
entry.Nature = safeGet(texts, 5)
|
||||
entry.Category = safeGet(texts, 6)
|
||||
entry.Credit = safeGet(texts, 7)
|
||||
entry.IsExam = safeGet(texts, 8)
|
||||
entry.Score = firstNonEmpty(safeGet(texts, 12), safeGet(texts, 11))
|
||||
entry.GradePoint = firstNonEmpty(safeGet(texts, 14), safeGet(texts, 13))
|
||||
return entry
|
||||
}
|
||||
|
||||
// 常规成绩页面格式:学年、学期、课程代码、课程名称、课程性质、课程类别、学分、成绩、绩点、...
|
||||
if len(texts) >= 10 {
|
||||
entry.Term = safeGet(texts, 1)
|
||||
entry.Code = safeGet(texts, 2)
|
||||
entry.Name = safeGet(texts, 3)
|
||||
entry.Nature = safeGet(texts, 4)
|
||||
entry.Category = safeGet(texts, 5)
|
||||
entry.Credit = safeGet(texts, 6)
|
||||
entry.Score = safeGet(texts, 7)
|
||||
entry.GradePoint = safeGet(texts, 8)
|
||||
return entry
|
||||
}
|
||||
|
||||
entry.Term = safeGet(texts, 1)
|
||||
entry.Code = safeGet(texts, 3)
|
||||
entry.Name = safeGet(texts, 4)
|
||||
entry.Credit = safeGet(texts, 7)
|
||||
entry.Score = safeGet(texts, 8)
|
||||
if len(texts) > 9 {
|
||||
entry.GradePoint = safeGet(texts, 9)
|
||||
}
|
||||
return entry
|
||||
}
|
||||
|
||||
func looksLikeDetailedGradeRow(texts []string) bool {
|
||||
return safeGet(texts, 3) != "" && safeGet(texts, 4) != "" && safeGet(texts, 7) != "" && (safeGet(texts, 8) == "是" || safeGet(texts, 8) == "否")
|
||||
}
|
||||
|
||||
func firstNonEmpty(values ...string) string {
|
||||
for _, value := range values {
|
||||
if strings.TrimSpace(value) != "" {
|
||||
return value
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// detectRetake 检测成绩行是否包含补考标记。
|
||||
// 教务系统在成绩单元格内以 <font color="#0066ff">补考</font> 标记补考,
|
||||
// 也会在整行文本中出现"补考"字样。
|
||||
func detectRetake(row *goquery.Selection) bool {
|
||||
// 方式1:查找包含"补考"文字的 <font> 标签
|
||||
if row.Find("font:contains('补考')").Length() > 0 {
|
||||
return true
|
||||
}
|
||||
// 方式2:整行纯文本包含"补考"
|
||||
rowText := strings.TrimSpace(row.Text())
|
||||
return strings.Contains(rowText, "补考")
|
||||
}
|
||||
|
||||
func getCellTexts(cells *goquery.Selection) []string {
|
||||
var texts []string
|
||||
cells.Each(func(_ int, cell *goquery.Selection) {
|
||||
|
||||
Reference in New Issue
Block a user