From 53e8790bb863e88ca174303de915a2641212ec3f Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 14 Dec 2023 17:36:54 +0100 Subject: [PATCH] fixed packages with no peak mem available --- api.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/api.go b/api.go index 9f29426..1ea1272 100644 --- a/api.go +++ b/api.go @@ -11,6 +11,7 @@ import ( "somegit.dev/ALHP/ALHP.GO/ent/dbpackage" "somegit.dev/ALHP/ALHP.GO/ent/predicate" "strconv" + "time" ) type StatsResponse struct { @@ -34,8 +35,8 @@ type ThinPackage struct { DebugSymbols dbpackage.DebugSymbols `json:"debug_symbols"` ArchVersion string `json:"arch_version"` RepoVersion string `json:"repo_version"` - BuildDate int64 `json:"build_date"` - PeakMem string `json:"peak_mem"` + BuildDate string `json:"build_date"` + PeakMem *string `json:"peak_mem"` } type PackageResponse struct { @@ -142,7 +143,7 @@ func GetPackages(w http.ResponseWriter, r *http.Request) { resp := new(PackageResponse) for _, mPkg := range rPackages { - resp.Packages = append(resp.Packages, &ThinPackage{ + nPkg := &ThinPackage{ Pkgbase: mPkg.Pkgbase, SplitPackages: mPkg.Packages, Status: mPkg.Status, @@ -151,9 +152,18 @@ func GetPackages(w http.ResponseWriter, r *http.Request) { DebugSymbols: mPkg.DebugSymbols, ArchVersion: mPkg.Version, RepoVersion: mPkg.RepoVersion, - BuildDate: mPkg.BuildTimeStart.Unix(), - PeakMem: (datasize.ByteSize(*mPkg.MaxRss) * datasize.KB).HumanReadable(), - }) + } + + if !mPkg.BuildTimeStart.IsZero() { + nPkg.BuildDate = mPkg.BuildTimeStart.UTC().Format(time.RFC1123) + } + + if mPkg.MaxRss != nil { + hrSize := (datasize.ByteSize(*mPkg.MaxRss) * datasize.KB).HumanReadable() + nPkg.PeakMem = &hrSize + } + + resp.Packages = append(resp.Packages, nPkg) } resp.Page = page resp.Limit = limit