From 36ca0f35aa1eab512e0ae5be10ac32eb9b8c167f Mon Sep 17 00:00:00 2001 From: liushun-ing <1743760069@qq.com> Date: Tue, 3 Dec 2024 14:35:05 +0800 Subject: [PATCH] refactor(template): simplify codes in template.go --- embeded/template.go | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/embeded/template.go b/embeded/template.go index 9af7fde0..8af613be 100644 --- a/embeded/template.go +++ b/embeded/template.go @@ -14,47 +14,32 @@ var ( ) func ReadTemplateFile(filename string) []byte { + if Home != "" { + file, err := os.ReadFile(filepath.Join(Home, filename)) + if err == nil { + return file + } + } path := filepath.ToSlash(filepath.Join(".template", filename)) data, err := Template.ReadFile(path) if err != nil { - if Home != "" { - file, err := os.ReadFile(filepath.Join(Home, filename)) - if err == nil { - return file - } - } return nil } - if Home != "" { - file, err := os.ReadFile(filepath.Join(Home, filename)) - if err != nil { - return data - } - return file - } return data } func ReadTemplateDir(dirname string) []os.DirEntry { + if Home != "" { + file, err := os.ReadDir(filepath.Join(Home, dirname)) + if err == nil { + return file + } + } path := filepath.ToSlash(filepath.Join(".template", dirname)) data, err := Template.ReadDir(path) if err != nil { - if Home != "" { - file, err := os.ReadDir(filepath.Join(Home, dirname)) - if err != nil { - return nil - } - return file - } return nil } - if Home != "" { - file, err := os.ReadDir(filepath.Join(Home, dirname)) - if err != nil { - return data - } - data = file - } return data }