Skip to content

Commit 2ec1b04

Browse files
authored
refactor(template): simplify codes in template.go (#130)
1 parent af709b6 commit 2ec1b04

File tree

1 file changed

+12
-27
lines changed

1 file changed

+12
-27
lines changed

embeded/template.go

+12-27
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,32 @@ var (
1414
)
1515

1616
func ReadTemplateFile(filename string) []byte {
17+
if Home != "" {
18+
file, err := os.ReadFile(filepath.Join(Home, filename))
19+
if err == nil {
20+
return file
21+
}
22+
}
1723
path := filepath.ToSlash(filepath.Join(".template", filename))
1824
data, err := Template.ReadFile(path)
1925
if err != nil {
20-
if Home != "" {
21-
file, err := os.ReadFile(filepath.Join(Home, filename))
22-
if err == nil {
23-
return file
24-
}
25-
}
2626
return nil
2727
}
28-
if Home != "" {
29-
file, err := os.ReadFile(filepath.Join(Home, filename))
30-
if err != nil {
31-
return data
32-
}
33-
return file
34-
}
3528
return data
3629
}
3730

3831
func ReadTemplateDir(dirname string) []os.DirEntry {
32+
if Home != "" {
33+
file, err := os.ReadDir(filepath.Join(Home, dirname))
34+
if err == nil {
35+
return file
36+
}
37+
}
3938
path := filepath.ToSlash(filepath.Join(".template", dirname))
4039
data, err := Template.ReadDir(path)
4140
if err != nil {
42-
if Home != "" {
43-
file, err := os.ReadDir(filepath.Join(Home, dirname))
44-
if err != nil {
45-
return nil
46-
}
47-
return file
48-
}
4941
return nil
5042
}
51-
if Home != "" {
52-
file, err := os.ReadDir(filepath.Join(Home, dirname))
53-
if err != nil {
54-
return data
55-
}
56-
data = file
57-
}
5843
return data
5944
}
6045

0 commit comments

Comments
 (0)