From 6ceda23af460ddd4f79b476248a4244e60932926 Mon Sep 17 00:00:00 2001 From: Steven Le Rouzic Date: Mon, 15 Apr 2024 22:13:07 +0200 Subject: Format --- model/time.go | 83 +++++++++++++++++++++++++++++----------------------------- model/timer.go | 24 ++++++++--------- 2 files changed, 53 insertions(+), 54 deletions(-) diff --git a/model/time.go b/model/time.go index e0c399c..38b9349 100644 --- a/model/time.go +++ b/model/time.go @@ -1,42 +1,41 @@ -package model - -import ( - sqldriver "database/sql/driver" - "errors" - "time" -) - -type Time time.Time - -func MakeTimeNow() Time { - return Time(time.Now().UTC()) -} - -func (self Time) AsUTCString() string { - return time.Time(self).Format(time.RFC3339) -} - -func (self Time) Value() (sqldriver.Value, error) { - return self.AsUTCString(), nil -} - -func (self *Time) Scan(value any) error { - if valueStr, ok := value.(string); ok { - parsedTime, err := time.Parse(time.RFC3339, valueStr) - if err == nil { - *self = Time(parsedTime.UTC()) - } - return err - } else { - return errors.New("Expected a string") - } -} - -func (from Time) Compare(to Time) int { - return time.Time(from).Compare(time.Time(to)) -} - -func (self *Time) Add(duration time.Duration) { - *self = Time(time.Time(*self).Add(duration)) -} - +package model + +import ( + sqldriver "database/sql/driver" + "errors" + "time" +) + +type Time time.Time + +func MakeTimeNow() Time { + return Time(time.Now().UTC()) +} + +func (self Time) AsUTCString() string { + return time.Time(self).Format(time.RFC3339) +} + +func (self Time) Value() (sqldriver.Value, error) { + return self.AsUTCString(), nil +} + +func (self *Time) Scan(value any) error { + if valueStr, ok := value.(string); ok { + parsedTime, err := time.Parse(time.RFC3339, valueStr) + if err == nil { + *self = Time(parsedTime.UTC()) + } + return err + } else { + return errors.New("Expected a string") + } +} + +func (from Time) Compare(to Time) int { + return time.Time(from).Compare(time.Time(to)) +} + +func (self *Time) Add(duration time.Duration) { + *self = Time(time.Time(*self).Add(duration)) +} diff --git a/model/timer.go b/model/timer.go index a47369d..2b58f11 100644 --- a/model/timer.go +++ b/model/timer.go @@ -1,12 +1,12 @@ -package model - -type Timer struct { - Id UUID - Name string - StartTime Time - EndTime Time -} - -func (self Timer) IsFinished() bool { - return MakeTimeNow().Compare(self.EndTime) >= 0 -} +package model + +type Timer struct { + Id UUID + Name string + StartTime Time + EndTime Time +} + +func (self Timer) IsFinished() bool { + return MakeTimeNow().Compare(self.EndTime) >= 0 +} -- cgit