mirror of
https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git
synced 2025-08-03 02:09:15 +02:00
fix:#22 changed linting errors
This commit is contained in:
@@ -6,7 +6,6 @@ import (
|
||||
"htwkalender/model"
|
||||
"htwkalender/service/date"
|
||||
"htwkalender/service/functions"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -50,16 +49,3 @@ func toEvents(tables [][]*html.Node, days []string) []model.Event {
|
||||
}
|
||||
return events
|
||||
}
|
||||
|
||||
func splitEventType(events []model.Event) []model.Event {
|
||||
for i, event := range events {
|
||||
matched, _ := regexp.Match("^([VPS])([wp])$", []byte(event.EventType))
|
||||
if matched {
|
||||
eventType := event.EventType
|
||||
event.EventType = eventType[0:1]
|
||||
event.Compulsory = eventType[1:2]
|
||||
events[i] = event
|
||||
}
|
||||
}
|
||||
return events
|
||||
}
|
||||
|
@@ -8,7 +8,9 @@ import (
|
||||
"htwkalender/model"
|
||||
"htwkalender/service/db"
|
||||
"htwkalender/service/fetch"
|
||||
v1 "htwkalender/service/fetch/v1"
|
||||
localTime "htwkalender/service/functions/time"
|
||||
"log/slog"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -86,7 +88,7 @@ func parseEventForOneSemester(url string) ([]model.Event, error) {
|
||||
|
||||
// Parse HTML to Node Tree
|
||||
var doc *html.Node
|
||||
doc, err = parseHTML(webpage, err)
|
||||
doc, err = parseHTML(webpage)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -113,7 +115,11 @@ func parseEventForOneSemester(url string) ([]model.Event, error) {
|
||||
semesterString := findFirstSpanWithClass(table, "header-0-2-0").FirstChild.Data
|
||||
semester, year := extractSemesterAndYear(semesterString)
|
||||
events = convertWeeksToDates(events, semester, year)
|
||||
events = splitEventType(events)
|
||||
events, err = v1.SplitEventType(events)
|
||||
if err != nil {
|
||||
slog.Error("Error occurred while splitting event types: %s", err)
|
||||
return nil, err
|
||||
}
|
||||
events = switchNameAndNotesForExam(events)
|
||||
events = generateUUIDs(events)
|
||||
|
||||
@@ -133,7 +139,7 @@ func switchNameAndNotesForExam(events []model.Event) []model.Event {
|
||||
return events
|
||||
}
|
||||
|
||||
func parseHTML(webpage string, err error) (*html.Node, error) {
|
||||
func parseHTML(webpage string) (*html.Node, error) {
|
||||
doc, err := html.Parse(strings.NewReader(webpage))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
Reference in New Issue
Block a user