From 0656fc8ca4f5e75a4ae3b09fcaf6a3bb83339ae0 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sun, 19 Nov 2023 14:15:10 +0600 Subject: [PATCH] :recycle: Updates filepaths building --- internal/domain/config.go | 13 +++++++------ internal/domain/file.go | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/domain/config.go b/internal/domain/config.go index 9072a4e..a44c8ec 100644 --- a/internal/domain/config.go +++ b/internal/domain/config.go @@ -3,15 +3,16 @@ package domain import ( "net" "net/netip" + "path/filepath" "strconv" "testing" ) type Config struct { - ContentDir string `env:"CONTENT_DIR" envDefault:"content/"` + ContentDir string `env:"CONTENT_DIR" envDefault:"content"` Host string `env:"HOST" envDefault:"0.0.0.0"` - ThemeDir string `env:"THEME_DIR" envDefault:"theme/"` - StaticDir string `env:"STATIC_DIR" envDefault:"static/"` + ThemeDir string `env:"THEME_DIR" envDefault:"theme"` + StaticDir string `env:"STATIC_DIR" envDefault:"static"` Port uint16 `env:"PORT" envDefault:"3000"` } @@ -19,10 +20,10 @@ func TestConfig(tb testing.TB) *Config { tb.Helper() return &Config{ - ContentDir: "testdata/content/", + ContentDir: filepath.Join("testdata", "content"), Host: "0.0.0.0", - ThemeDir: "testdata/theme/", - StaticDir: "testdata/static/", + ThemeDir: filepath.Join("testdata", "theme"), + StaticDir: filepath.Join("testdata", "static"), Port: 3000, } } diff --git a/internal/domain/file.go b/internal/domain/file.go index 38b27fe..0b62c32 100644 --- a/internal/domain/file.go +++ b/internal/domain/file.go @@ -24,7 +24,7 @@ func NewFile(path string) File { Language: LanguageUnd, baseFileName: "", contentBaseName: "", - dir: filepath.Dir(path) + "/", + dir: filepath.Dir(path) + string(filepath.Separator), ext: strings.TrimPrefix(filepath.Ext(path), "."), filename: path, logicalName: filepath.Base(path),