From f50889d95f091f6c6167638df5f0336720b38eb3 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sun, 24 Dec 2023 07:54:04 +0600 Subject: [PATCH] :art: Format of the code --- internal/cmd/home/home.go | 3 +-- internal/common/common.go | 2 ++ internal/domain/language.go | 6 ++++-- internal/domain/language_test.go | 29 +++++++++++++++-------------- internal/domain/redirect.go | 5 +---- internal/domain/resource_type.go | 4 +++- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/internal/cmd/home/home.go b/internal/cmd/home/home.go index 5c551d2..c25e8fc 100644 --- a/internal/cmd/home/home.go +++ b/internal/cmd/home/home.go @@ -62,8 +62,7 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) { // INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it // first before deep down to any page or it's resource which might be secured by middleware or // something else. - static, err := staticer.Do(r.Context(), strings.TrimPrefix(r.URL.Path, "/")) - if err == nil { + if static, err := staticer.Do(r.Context(), strings.TrimPrefix(r.URL.Path, "/")); err == nil { http.ServeContent(w, r, static.Name(), static.ModTime(), static) return diff --git a/internal/common/common.go b/internal/common/common.go index e818105..a2a8d5c 100644 --- a/internal/common/common.go +++ b/internal/common/common.go @@ -11,4 +11,6 @@ const ( MIMETextHTMLCharsetUTF8 string = MIMETextHTML + "; " + charsetUTF8 ) +const Und string = "und" + const charsetUTF8 string = "charset=UTF-8" diff --git a/internal/domain/language.go b/internal/domain/language.go index 5ce97e7..55bf396 100644 --- a/internal/domain/language.go +++ b/internal/domain/language.go @@ -5,6 +5,8 @@ import ( "golang.org/x/text/language" "golang.org/x/text/language/display" + + "source.toby3d.me/toby3d/home/internal/common" ) type Language struct { @@ -14,7 +16,7 @@ type Language struct { dir string } -var LanguageUnd Language = Language{} +var LanguageUnd Language = Language{} // "und" func NewLanguage(raw string) Language { tag, err := language.BCP47.Parse(raw) @@ -60,7 +62,7 @@ func (l Language) String() string { return l.code } - return "und" + return common.Und } func (l Language) GoString() string { diff --git a/internal/domain/language_test.go b/internal/domain/language_test.go index fa2f4bb..a65a545 100644 --- a/internal/domain/language_test.go +++ b/internal/domain/language_test.go @@ -3,6 +3,7 @@ package domain_test import ( "testing" + "source.toby3d.me/toby3d/home/internal/common" "source.toby3d.me/toby3d/home/internal/domain" ) @@ -13,10 +14,10 @@ func TestLanguage_Lang(t *testing.T) { input string expect string }{ - "2letter": {"en", "en"}, - "3letter": {"eng", "en"}, - "region": {"en-US", "en"}, - "und": {"", ""}, + "2letter": {"en", "en"}, + "3letter": {"eng", "en"}, + "region": {"en-US", "en"}, + common.Und: {"", ""}, } { name, tc := name, tc @@ -37,10 +38,10 @@ func TestLanguage_Code(t *testing.T) { input string expect string }{ - "2letter": {"en", "en"}, - "3letter": {"eng", "en"}, - "region": {"en-US", "en-US"}, - "und": {"", ""}, + "2letter": {"en", "en"}, + "3letter": {"eng", "en"}, + "region": {"en-US", "en-US"}, + common.Und: {"", ""}, } { name, tc := name, tc @@ -61,11 +62,11 @@ func TestLanguage_Dir(t *testing.T) { input string expect string }{ - "2letter": {"en", "ltr"}, - "rtl": {"ur", "rtl"}, - "3letter": {"eng", "ltr"}, - "region": {"en-US", "ltr"}, - "und": {"", ""}, + "2letter": {"en", "ltr"}, + "rtl": {"ur", "rtl"}, + "3letter": {"eng", "ltr"}, + "region": {"en-US", "ltr"}, + common.Und: {"", ""}, } { name, tc := name, tc @@ -90,7 +91,7 @@ func TestLanguage_Name(t *testing.T) { "2letter": {"en", "english"}, "3letter": {"eng", "english"}, "region": {"en-US", "american english"}, - "und": {"", ""}, + common.Und: {"", ""}, } { name, tc := name, tc diff --git a/internal/domain/redirect.go b/internal/domain/redirect.go index d24e562..2733148 100644 --- a/internal/domain/redirect.go +++ b/internal/domain/redirect.go @@ -10,10 +10,7 @@ type Redirect struct { } func (r Redirect) IsMatch(p string) bool { - matched, err := path.Match(r.From, p) - if err != nil { - return false - } + matched, _ := path.Match(r.From, p) return matched } diff --git a/internal/domain/resource_type.go b/internal/domain/resource_type.go index c71b798..b79b9c7 100644 --- a/internal/domain/resource_type.go +++ b/internal/domain/resource_type.go @@ -2,6 +2,8 @@ package domain import ( "errors" + + "source.toby3d.me/toby3d/home/internal/common" ) type ResourceType string @@ -22,7 +24,7 @@ func (rt ResourceType) String() string { return string(rt) } - return "und" + return common.Und } func (rt ResourceType) GoString() string {