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 +9 -1
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc5bb2534a - Show all commits

2
helpers/config.go
View File

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

1
pis/check.go
View File

@ -14,6 +14,7 @@ import (
// Checks the Gitea API for the latest release and compares to metadata in the database // Checks the Gitea API for the latest release and compares to metadata in the database
// to determine if a PIS update is required. // to determine if a PIS update is required.
func Check() { func Check() {
log.Info("PIS Update Check started")
repoName := "data" repoName := "data"
repoOwner := "owlboard" repoOwner := "owlboard"
baseUrl := "https://git.fjla.uk" baseUrl := "https://git.fjla.uk"

7
pis/update.go
View File

@ -21,6 +21,7 @@ const (
// Downloads the release tarball, extracts then applies to database // Downloads the release tarball, extracts then applies to database
func runUpdate(tarballUrl string) error { func runUpdate(tarballUrl string) error {
log.Info("PIS Update Process started")
err := downloadFile(tarballUrl, destPath) err := downloadFile(tarballUrl, destPath)
if err != nil { if err != nil {
return err return err
@ -31,11 +32,13 @@ func runUpdate(tarballUrl string) error {
if err != nil { if err != nil {
return err return err
} }
log.Info("Saved PIS Release to disk")
defer file.Close() defer file.Close()
if err := extractFiles(file, extractPath); err != nil { if err := extractFiles(file, extractPath); err != nil {
return err return err
} }
log.Info("Extracted PIS Release")
// Load YAML to string // Load YAML to string
pisData, err := extractYamlData(extractPath) pisData, err := extractYamlData(extractPath)
@ -47,6 +50,7 @@ func runUpdate(tarballUrl string) error {
if err != nil { if err != nil {
return err return err
} }
log.Info("Loaded PIS Files to Slice")
fmt.Println(&pisSlice) fmt.Println(&pisSlice)
/* /*
@ -78,6 +82,7 @@ func downloadFile(url, filepath string) error {
if err != nil { if err != nil {
return err return err
} }
log.Info("PIS Release downloaded")
defer resp.Body.Close() defer resp.Body.Close()
@ -99,6 +104,7 @@ func extractFiles(gzipStream io.Reader, dest string) error {
return err return err
} }
defer uncompressedStream.Close() defer uncompressedStream.Close()
log.Info("Extracting PIS File")
tarReader := tar.NewReader(uncompressedStream) tarReader := tar.NewReader(uncompressedStream)
@ -189,4 +195,5 @@ func cleanupFiles(paths ...string) {
log.Warn("Error removing file", zap.String("path", path), zap.Error(err)) log.Warn("Error removing file", zap.String("path", path), zap.Error(err))
} }
} }
log.Info("Removed PIS Release files")
} }