OwlBoard/timetable-mgr
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

timetable-extension #1

Open
fred.boniface wants to merge 160 commits from timetable-extension into main
pull from: timetable-extension
merge into: OwlBoard:main
Conversation 0 Commits 160 Files Changed 67 +7 -6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 488551e914 - Show all commits

2
helpers/config.go
View File

@ -5,7 +5,7 @@ import (
) )
// Version Constants // Version Constants
const versionNum string = "2024.11.3" const versionNum string = "2024.11.4"
const versionSuffix string = "" const versionSuffix string = ""
const Version string = versionNum + versionSuffix const Version string = versionNum + versionSuffix

5
pis/data.go
View File

@ -25,12 +25,13 @@ func processYaml(yamlStr string) (*[]database.PIS, error) {
return nil, fmt.Errorf("failed to unmarshal YAML: %v", err) return nil, fmt.Errorf("failed to unmarshal YAML: %v", err)
} }
/* DISABLE DEDUPLICATION - Add 'dupe' flag and have backend handle duplicates?
// Perform deduplication on the entire pis slice // Perform deduplication on the entire pis slice
err = deduplicateCodes(&pisData.Pis) err = deduplicateCodes(&pisData.Pis)
if err != nil { if err != nil {
return nil, err return nil, err
} }
*/
documents, err := convertPisForDatabase(&pisData.Pis) documents, err := convertPisForDatabase(&pisData.Pis)
if err != nil { if err != nil {
return nil, err return nil, err
@ -71,7 +72,7 @@ func convertPisForDatabase(in *[]PisData) (*[]database.PIS, error) {
for _, code := range *in { for _, code := range *in {
var document database.PIS var document database.PIS
document.Code = code.Code document.Code = code.Code
document.Operator = code.Operator document.Operator = code.Toc
document.Stops = code.Stops document.Stops = code.Stops
document.Tiplocs = GetTiplocsFromCrs(code.Stops) document.Tiplocs = GetTiplocsFromCrs(code.Stops)

6
pis/types.go
View File

@ -9,7 +9,7 @@ type GiteaReleaseData struct {
} }
type PisData struct { type PisData struct {
Code string `json:"code"` Code string `json:"code"`
Stops []string `json:"stops"` Stops []string `json:"stops"`
Operator string `json:"operator"` Toc string `json:"toc"`
} }