HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2025-08-02 17:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat:#52 added ss and ws month fix for fetching

Browse Source
This commit is contained in:
masterElmar
2023-11-30 23:31:04 +01:00
parent 36e7cbc890
commit c9caa2aedc
4 changed files with 66 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
backend/service/fetch/v2/fetcher.go
View File

@@ -10,22 +10,55 @@ import (
"htwkalender/service/fetch"
"strconv"
"strings"
"time"
)
func ParseEventsFromRemote(c echo.Context, app *pocketbase.PocketBase) error {
url := "https://stundenplan.htwk-leipzig.de/ws/Berichte/Text-Listen;Veranstaltungsarten;name;Vp%0AVw%0AV%0ASp%0ASw%0AS%0APp%0APw%0AP%0AZV%0ATut%0ASperr%0Apf%0Awpf%0Afak%0A%0A?&template=sws_modul&weeks=1-65&combined=yes"
err, savedRecords := FetchAllEventsAndSave(app)
if err != nil {
return err
} else {
savedRecordsLength := strconv.FormatInt(int64(len(savedRecords)), 10)
return c.JSON(200, "Successfully saved "+savedRecordsLength+" events")
}
}
func FetchAllEventsAndSave(app *pocketbase.PocketBase) (error, []model.Event) {
var err error
var savedRecords []model.Event
var events []model.Event
if (time.Now().Month() >= 3) && (time.Now().Month() <= 10) {
url := "https://stundenplan.htwk-leipzig.de/ws/Berichte/Text-Listen;Veranstaltungsarten;name;Vp%0AVw%0AV%0ASp%0ASw%0AS%0APp%0APw%0AP%0AZV%0ATut%0ASperr%0Apf%0Awpf%0Afak%0A%0A?&template=sws_modul&weeks=1-65&combined=yes"
events, err = parseEventForOneSemester(url)
savedEvents, dbError := db.SaveEvents(events, app)
err = dbError
savedRecords = append(savedEvents, events...)
}
if (time.Now().Month() >= 9) || (time.Now().Month() <= 4) {
url := "https://stundenplan.htwk-leipzig.de/ws/Berichte/Text-Listen;Veranstaltungsarten;name;Vp%0AVw%0AV%0ASp%0ASw%0AS%0APp%0APw%0AP%0AZV%0ATut%0ASperr%0Apf%0Awpf%0Afak%0A%0A?&template=sws_modul&weeks=1-65&combined=yes"
events, err = parseEventForOneSemester(url)
savedEvents, dbError := db.SaveEvents(events, app)
err = dbError
savedRecords = append(savedEvents, events...)
}
return err, savedRecords
}
func parseEventForOneSemester(url string) ([]model.Event, error) {
// Fetch Webpage from URL
webpage, err := fetch.GetHTML(url)
if err != nil {
return err
return nil, err
}
// Parse HTML to Node Tree
doc, err2 := parseHTML(err, webpage)
if err2 != nil {
return err2
return nil, err2
}
// Get all event tables and all day labels
@@ -33,26 +66,24 @@ func ParseEventsFromRemote(c echo.Context, app *pocketbase.PocketBase) error {
allDayLabels := getAllDayLabels(doc)
if eventTables == nil || allDayLabels == nil {
return err
return nil, err
}
eventsWithCombinedWeeks := toEvents(eventTables, allDayLabels)
if eventsWithCombinedWeeks == nil {
return err
return nil, err
}
splitEventsByWeekVal := splitEventsByWeek(eventsWithCombinedWeeks)
events := splitEventsBySingleWeek(splitEventsByWeekVal)
if events == nil {
return err
return nil, err
}
// Search Semester String in Page Head
table := findFirstTable(doc)
semesterString := findFirstSpanWithClass(table, "header-0-2-0").FirstChild.Data
semester, year := extractSemesterAndYear(semesterString)
events = convertWeeksToDates(events, semester, year)
events = generateUUIDs(events)
@@ -64,17 +95,10 @@ func ParseEventsFromRemote(c echo.Context, app *pocketbase.PocketBase) error {
}
if seminarGroup.Events == nil && seminarGroup.University == "" {
return err
return nil, err
}
savedRecords, dbError := db.SaveEvents(events, app)
if dbError != nil {
return dbError
} else {
savedRecordsLength := strconv.FormatInt(int64(len(savedRecords)), 10)
return c.JSON(200, "Successfully saved "+savedRecordsLength+" events")
}
return events, nil
}
func parseHTML(err error, webpage string) (*html.Node, error) {