From c55143d8c995fcd604edcdd448c50669e8682e33 Mon Sep 17 00:00:00 2001 From: Elias Schneider Date: Fri, 19 Sep 2025 13:43:49 +0200 Subject: [PATCH] fix: embedded paths not found on windows --- .../internal/bootstrap/application_images_bootstrap.go | 8 ++++---- backend/internal/utils/email/email_service_templates.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/internal/bootstrap/application_images_bootstrap.go b/backend/internal/bootstrap/application_images_bootstrap.go index cac8c9eb..19c9a46c 100644 --- a/backend/internal/bootstrap/application_images_bootstrap.go +++ b/backend/internal/bootstrap/application_images_bootstrap.go @@ -7,7 +7,7 @@ import ( "io/fs" "log/slog" "os" - "path/filepath" + "path" "strings" "github.com/pocket-id/pocket-id/backend/internal/common" @@ -40,7 +40,7 @@ func initApplicationImages() error { destinationFilesMap := make(map[string]bool, len(destinationFiles)) for _, f := range destinationFiles { name := f.Name() - destFilePath := filepath.Join(dirPath, name) + destFilePath := path.Join(dirPath, name) h, err := utils.CreateSha256FileHash(destFilePath) if err != nil { @@ -69,8 +69,8 @@ func initApplicationImages() error { } name := sourceFile.Name() - srcFilePath := filepath.Join("images", name) - destFilePath := filepath.Join(dirPath, name) + srcFilePath := path.Join("images", name) + destFilePath := path.Join(dirPath, name) // Skip if there's already an image at the path // We do not check the extension because users could have uploaded a different one diff --git a/backend/internal/utils/email/email_service_templates.go b/backend/internal/utils/email/email_service_templates.go index 6b7e8de3..dbae900f 100644 --- a/backend/internal/utils/email/email_service_templates.go +++ b/backend/internal/utils/email/email_service_templates.go @@ -3,7 +3,7 @@ package email import ( "fmt" htemplate "html/template" - "path/filepath" + "path" ttemplate "text/template" "github.com/pocket-id/pocket-id/backend/resources" @@ -30,7 +30,7 @@ func PrepareTextTemplates(templates []string) (map[string]*ttemplate.Template, e textTemplates := make(map[string]*ttemplate.Template, len(templates)) for _, tmpl := range templates { filename := tmpl + "_text.tmpl" - templatePath := filepath.Join("email-templates", filename) + templatePath := path.Join("email-templates", filename) parsedTemplate, err := ttemplate.ParseFS(resources.FS, templatePath) if err != nil { @@ -47,7 +47,7 @@ func PrepareHTMLTemplates(templates []string) (map[string]*htemplate.Template, e htmlTemplates := make(map[string]*htemplate.Template, len(templates)) for _, tmpl := range templates { filename := tmpl + "_html.tmpl" - templatePath := filepath.Join("email-templates", filename) + templatePath := path.Join("email-templates", filename) parsedTemplate, err := htemplate.ParseFS(resources.FS, templatePath) if err != nil {