From 72b079cc2ef200e6da27063aff00c485d0ef1286 Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Sat, 7 Sep 2024 22:58:59 +0300 Subject: [PATCH] Migrate shroom --- internal/shroom/log.go | 25 ++++++++++++++++++++----- internal/shroom/upload.go | 4 ++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/internal/shroom/log.go b/internal/shroom/log.go index 14a2f07..535dcaf 100644 --- a/internal/shroom/log.go +++ b/internal/shroom/log.go @@ -1,21 +1,36 @@ package shroom import ( - "log" + "log/slog" "github.com/bouncepaw/mycorrhiza/internal/hyphae" "github.com/bouncepaw/mycorrhiza/internal/user" ) func rejectRenameLog(h hyphae.Hypha, u *user.User, errmsg string) { - log.Printf("Reject rename ‘%s’ by @%s: %s\n", h.CanonicalName(), u.Name, errmsg) + slog.Info("Reject rename", + "hyphaName", h.CanonicalName(), + "username", u.Name, + "errmsg", errmsg) } + func rejectRemoveMediaLog(h hyphae.Hypha, u *user.User, errmsg string) { - log.Printf("Reject remove media ‘%s’ by @%s: %s\n", h.CanonicalName(), u.Name, errmsg) + slog.Info("Reject remove media", + "hyphaName", h.CanonicalName(), + "username", u.Name, + "errmsg", errmsg) } + func rejectEditLog(h hyphae.Hypha, u *user.User, errmsg string) { - log.Printf("Reject edit ‘%s’ by @%s: %s\n", h.CanonicalName(), u.Name, errmsg) + slog.Info("Reject edit", + "hyphaName", h.CanonicalName(), + "username", u.Name, + "errmsg", errmsg) } + func rejectUploadMediaLog(h hyphae.Hypha, u *user.User, errmsg string) { - log.Printf("Reject upload media ‘%s’ by @%s: %s\n", h.CanonicalName(), u.Name, errmsg) + slog.Info("Reject upload media", + "hyphaName", h.CanonicalName(), + "username", u.Name, + "errmsg", errmsg) } diff --git a/internal/shroom/upload.go b/internal/shroom/upload.go index a63c1ec..ff438a6 100644 --- a/internal/shroom/upload.go +++ b/internal/shroom/upload.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "io" - "log" + "log/slog" "mime/multipart" "os" "path/filepath" @@ -201,7 +201,7 @@ func UploadBinary(h hyphae.Hypha, mime string, file multipart.File, u *user.User if err := history.Rename(prevFilePath, uploadedFilePath); err != nil { return err } - log.Printf("Move ‘%s’ to ‘%s’\n", prevFilePath, uploadedFilePath) + slog.Info("Move file", "from", prevFilePath, "to", uploadedFilePath) h.SetMediaFilePath(uploadedFilePath) } }