From 3e55b77c042c8436f93347f26cdd3196c1cb7f25 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 19 May 2024 12:29:14 +0300 Subject: move SaveFile to entry --- internal/server/handler/handler.go | 14 +------------- internal/types/entry.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'internal') diff --git a/internal/server/handler/handler.go b/internal/server/handler/handler.go index bc751dd..c45f7d5 100644 --- a/internal/server/handler/handler.go +++ b/internal/server/handler/handler.go @@ -9,7 +9,6 @@ import ( "regexp" "time" - "codeberg.org/snonux/gos/internal" "codeberg.org/snonux/gos/internal/config/server" "codeberg.org/snonux/gos/internal/easyhttp" "codeberg.org/snonux/gos/internal/server/repository" @@ -43,18 +42,7 @@ func (h Handler) Submit(w http.ResponseWriter, r *http.Request) error { if err != nil { return err } - filePath := fmt.Sprintf("%s/%s/%s.json", h.conf.DataDir, time.Now().Format("2006"), entry.ID) - - jsonStr, err := entry.Serialize() - if err != nil { - return err - } - - if err := internal.SaveFile(filePath, jsonStr); err != nil { - return err - } - - return nil + return entry.SaveFile(fmt.Sprintf("%s/%s/%s.json", h.conf.DataDir, time.Now().Format("2006"), entry.ID)) } func (h Handler) List(w http.ResponseWriter, r *http.Request) error { diff --git a/internal/types/entry.go b/internal/types/entry.go index 90b5e6f..b3358b0 100644 --- a/internal/types/entry.go +++ b/internal/types/entry.go @@ -7,6 +7,8 @@ import ( "os" "strings" "sync" + + "codeberg.org/snonux/gos/internal" ) // Tells me whether the entry was shared to the sm platform named Name @@ -70,6 +72,15 @@ func (e Entry) Serialize() ([]byte, error) { return json.Marshal(e) } +func (e Entry) SaveFile(filePath string) error { + jsonStr, err := e.Serialize() + if err != nil { + return err + } + + return internal.SaveFile(filePath, jsonStr) +} + func (e Entry) String() string { var sb strings.Builder -- cgit v1.2.3