clean code

lunny · lunny · commit 3c4d22140ac5 · 2021-05-29T19:53:13.000+08:00
diff --git a/modules/public/public.go b/modules/public/public.go
@@ -29,15 +29,11 @@ func AssetsHandler(opts *Options) func(next http.Handler) http.Handler {
 	if !filepath.IsAbs(custPath) {
 		custPath = filepath.Join(setting.AppWorkPath, custPath)
 	}
-
 	if !filepath.IsAbs(opts.Directory) {
 		opts.Directory = filepath.Join(setting.AppWorkPath, opts.Directory)
 	}
-	if opts.Prefix == "" {
-		opts.Prefix = "/"
-	}
-	if opts.Prefix != "/" {
-		opts.Prefix = opts.Prefix + "/"
+	if !strings.HasSuffix(opts.Prefix, "/") {
+		opts.Prefix += "/"
 	}
 
 	return func(next http.Handler) http.Handler {

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,11 @@ func AssetsHandler(opts *Options) func(next http.Handler) http.Handler {`
`29`	`29`	`if !filepath.IsAbs(custPath) {`
`30`	`30`	`custPath = filepath.Join(setting.AppWorkPath, custPath)`
`31`	`31`	`}`
`32`		`-`
`33`	`32`	`if !filepath.IsAbs(opts.Directory) {`
`34`	`33`	`opts.Directory = filepath.Join(setting.AppWorkPath, opts.Directory)`
`35`	`34`	`}`
`36`		`- if opts.Prefix == "" {`
`37`		`- opts.Prefix = "/"`
`38`		`- }`
`39`		`- if opts.Prefix != "/" {`
`40`		`- opts.Prefix = opts.Prefix + "/"`
	`35`	`+ if !strings.HasSuffix(opts.Prefix, "/") {`
	`36`	`+ opts.Prefix += "/"`
`41`	`37`	`}`
`42`	`38`
`43`	`39`	`return func(next http.Handler) http.Handler {`