From 16491e58aa0985c8ae1a2cc091c006b2b67e9250 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sat, 3 Feb 2024 20:44:56 +0600 Subject: [PATCH] :art: Format home module due recent changes --- internal/cmd/home/home.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/cmd/home/home.go b/internal/cmd/home/home.go index 423bca8..a4bec81 100644 --- a/internal/cmd/home/home.go +++ b/internal/cmd/home/home.go @@ -18,10 +18,10 @@ import ( "source.toby3d.me/toby3d/home/internal/common" "source.toby3d.me/toby3d/home/internal/domain" + "source.toby3d.me/toby3d/home/internal/entry" + pagefsrepo "source.toby3d.me/toby3d/home/internal/entry/repository/fs" + pageucase "source.toby3d.me/toby3d/home/internal/entry/usecase" "source.toby3d.me/toby3d/home/internal/middleware" - "source.toby3d.me/toby3d/home/internal/page" - pagefsrepo "source.toby3d.me/toby3d/home/internal/page/repository/fs" - pageucase "source.toby3d.me/toby3d/home/internal/page/usecase" resourcefsrepo "source.toby3d.me/toby3d/home/internal/resource/repository/fs" resourceucase "source.toby3d.me/toby3d/home/internal/resource/usecase" servercase "source.toby3d.me/toby3d/home/internal/server/usecase" @@ -40,11 +40,11 @@ type App struct { func NewApp(logger *log.Logger, config *domain.Config) (*App, error) { themeDir := os.DirFS(config.ThemeDir) - partialsDir, err := fs.Sub(themeDir, "partials") if err != nil { return nil, fmt.Errorf("cannot substitute into partials subdirectory: %w", err) } + contentDir := os.DirFS(config.ContentDir) resources := resourcefsrepo.NewFileServerResourceRepository(contentDir) sites := sitefsrepo.NewFileSystemSiteRepository(contentDir) @@ -55,8 +55,8 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) { resourcer := resourceucase.NewResourceUseCase(resources) themes := themefsrepo.NewFileSystemThemeRepository(themeDir) themer := themeucase.NewThemeUseCase(partialsDir, themes) - pages := pagefsrepo.NewFileSystemPageRepository(contentDir) - pager := pageucase.NewPageUseCase(pages, resources) + entries := pagefsrepo.NewFileSystemPageRepository(contentDir) + entrier := pageucase.NewEntryUseCase(entries, resources) serverer := servercase.NewServerUseCase(sites) handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { // INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it @@ -115,9 +115,9 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) { return } - p, err := pager.Do(r.Context(), lang, r.URL.Path) + e, err := entrier.Do(r.Context(), lang, r.URL.Path) if err != nil { - if !errors.Is(err, page.ErrNotExist) { + if !errors.Is(err, entry.ErrNotExist) { http.Error(w, err.Error(), http.StatusInternalServerError) return @@ -158,14 +158,14 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) { return } - contentLanguage := make([]string, len(p.Translations)) - for i := range p.Translations { - contentLanguage[i] = p.Translations[i].Language.Code() + contentLanguage := make([]string, len(e.Translations)) + for i := range e.Translations { + contentLanguage[i] = e.Translations[i].Language.Code() } w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", ")) - template, err := themer.Do(r.Context(), s, p) + template, err := themer.Do(r.Context(), s, e) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError)