Skip to content

Commit 7db6788

Browse files
committed
feat(serverHandler/vhostHandler): set default value for input nil params
1 parent 6e98dbf commit 7db6788

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

src/app/main.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"mjpclab.dev/ghfs/src/serverHandler"
88
"mjpclab.dev/ghfs/src/serverLog"
99
"mjpclab.dev/ghfs/src/setting"
10-
"mjpclab.dev/ghfs/src/tpl/defaultTheme"
1110
"mjpclab.dev/ghfs/src/tpl/theme"
1211
"net/http"
1312
"time"
@@ -77,14 +76,12 @@ func NewApp(params param.Params, settings *setting.Setting) (*App, []error) {
7776
var themeInst theme.Theme
7877
if len(p.ThemeDir) > 0 {
7978
themeInst = theme.DirTheme(p.ThemeDir)
80-
} else if len(p.Theme) == 0 {
81-
themeInst = defaultTheme.DefaultTheme
82-
} else {
79+
} else if len(p.Theme) > 0 {
8380
themeInst, errs = loadTheme(p.Theme, themePool)
84-
}
85-
if len(errs) > 0 {
86-
logger.LogErrors(errs...)
87-
return nil, errs
81+
if len(errs) > 0 {
82+
logger.LogErrors(errs...)
83+
return nil, errs
84+
}
8885
}
8986

9087
// vHost Handler

src/serverHandler/vhostHandler.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"mjpclab.dev/ghfs/src/param"
55
"mjpclab.dev/ghfs/src/serverError"
66
"mjpclab.dev/ghfs/src/serverLog"
7+
"mjpclab.dev/ghfs/src/tpl/defaultTheme"
78
"mjpclab.dev/ghfs/src/tpl/theme"
89
"mjpclab.dev/ghfs/src/user"
910
"net/http"
@@ -86,10 +87,18 @@ func NewVhostHandler(
8687
return nil, errs
8788
}
8889

90+
if logger == nil {
91+
logger = &serverLog.Logger{}
92+
}
93+
94+
if theme == nil {
95+
theme = defaultTheme.DefaultTheme
96+
}
97+
8998
// alias param
9099
vhostCtx := &vhostContext{
91-
theme: theme,
92100
logger: logger,
101+
theme: theme,
93102

94103
users: users,
95104
authUrlsUsers: pathUsernamesToPathUids(users, p.AuthUrlsUsers),

0 commit comments

Comments
 (0)